gns3-{gui,server}: 2.2.9 -> 2.2.11

This commit is contained in:
Michael Weiss
2020-07-12 19:17:43 +02:00
parent bab982e5ec
commit 99ab9545b2
3 changed files with 20 additions and 12 deletions
@@ -1,7 +1,7 @@
{ callPackage }:
let
stableVersion = "2.2.9";
stableVersion = "2.2.11";
previewVersion = stableVersion;
addVersion = args:
let version = if args.stable then stableVersion else previewVersion;
@@ -15,18 +15,19 @@ let
src = oldAttrs.src.override {
inherit version sha256;
};
doCheck = oldAttrs.doCheck && (attrname != "psutil");
});
};
commonOverrides = [
(mkOverride "psutil" "5.6.6"
"1rs6z8bfy6bqzw88s4i5zllrx3i18hnkv4akvmw7bifngcgjh8dd")
(mkOverride "psutil" "5.7.0"
"03jykdi3dgf1cdal9bv4fq9zjvzj9l9bs99gi5ar81sdl5nc2pk8")
(mkOverride "jsonschema" "3.2.0"
"0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68")
];
};
mkGui = args: callPackage (import ./gui.nix (addVersion args // extraArgs)) { };
mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { };
guiSrcHash = "0xbkzd43zzy1xlwwz7jvjjq21iqy6b08pbs37r6g8jciwiyqrcbd";
serverSrcHash = "1jaap1sxkh4yivrp8z0izypl9n6ss4540n22xkf5fnkv91k0mr5n";
guiSrcHash = "1carwhp49l9zx2p6i3in03x6rjzn0x6ls2svwazd643rmrl4y7gn";
serverSrcHash = "0acbxay1pwq62yq9q67hid44byyi6rb6smz5wa8br3vka7z31iqf";
in {
guiStable = mkGui {
stable = true;