aboutsummaryrefslogtreecommitdiff
path: root/nixpkgs/pkgs/applications/networking/gns3/default.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/gns3/default.nix')
-rw-r--r--nixpkgs/pkgs/applications/networking/gns3/default.nix17
1 files changed, 9 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/applications/networking/gns3/default.nix b/nixpkgs/pkgs/applications/networking/gns3/default.nix
index 6cfc5ed3a99..867a49e47b3 100644
--- a/nixpkgs/pkgs/applications/networking/gns3/default.nix
+++ b/nixpkgs/pkgs/applications/networking/gns3/default.nix
@@ -1,7 +1,7 @@
-{ callPackage }:
+{ callPackage, libsForQt5 }:
let
- stableVersion = "2.2.8";
+ stableVersion = "2.2.13";
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.6.7"
+ "1an5llivfkwpbcfaapbx78p8sfnvzyfypf60wfxihib1mjr8xbgz")
+ (mkOverride "jsonschema" "3.2.0"
+ "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68")
];
};
- mkGui = args: callPackage (import ./gui.nix (addVersion args // extraArgs)) { };
+ mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { };
mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { };
- guiSrcHash = "1qgzad9hdbvkdalzdnlg5gnlzn2f9qlpd1aj8djmi6w1mmdkf9q7";
- serverSrcHash = "1kg38dh0xk4yvi7hz0d5dq9k0wany0sfd185l0zxs3nz78zd23an";
+ guiSrcHash = "1vhch8hgbzdfmgpxlzgdasv6lxgl7rs96n5v4mn2pcccvfmbqj66";
+ serverSrcHash = "1vlnhlcnjh0kd623zxjjgkvln0rn5zr43zn00vkvbzwc9cgm2jxz";
in {
guiStable = mkGui {
stable = true;