about summary refs log tree commit diff
path: root/pkgs/applications/networking/gns3/default.nix
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2020-03-26 13:45:35 +0100
committerGitHub <noreply@github.com>2020-03-26 13:45:35 +0100
commit8978ef387773d342a2ff8f78e21367c2677b02ab (patch)
tree7eb6834ca116f8a999603d7cdf1a6d0cfd832d8d /pkgs/applications/networking/gns3/default.nix
parent9ee46bfb230226118ea70c9ed364021834965d0b (diff)
gns3-{gui,server}: 2.2.5 -> 2.2.6 (#83422)
Diffstat (limited to 'pkgs/applications/networking/gns3/default.nix')
-rw-r--r--pkgs/applications/networking/gns3/default.nix12
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index 6dcfb27b7ba6d..340cfdf879a73 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -1,13 +1,13 @@
 { callPackage }:
 
 let
-  stableVersion = "2.2.5";
+  stableVersion = "2.2.6";
   previewVersion = stableVersion;
   addVersion = args:
     let version = if args.stable then stableVersion else previewVersion;
         branch = if args.stable then "stable" else "preview";
     in args // { inherit version branch; };
-  extraArgs = {
+  extraArgs = rec {
     mkOverride = attrname: version: sha256:
       self: super: {
         ${attrname} = super.${attrname}.overridePythonAttrs (oldAttrs: {
@@ -18,11 +18,15 @@ let
           doCheck = oldAttrs.doCheck && (attrname != "psutil");
         });
       };
+    commonOverrides = [
+      (mkOverride "psutil" "5.6.6"
+        "1rs6z8bfy6bqzw88s4i5zllrx3i18hnkv4akvmw7bifngcgjh8dd")
+    ];
   };
   mkGui = args: callPackage (import ./gui.nix (addVersion args // extraArgs)) { };
   mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { };
-  guiSrcHash = "1yxwbz93x9hn5y6dir8v7bdfsmfgppvjg4z88l8gx82hhf2476fx";
-  serverSrcHash = "1d3m8qrz82g8ii6q6j015wqwp6j0415fbqbjvw43zhdx5mnn962d";
+  guiSrcHash = "0inqy2zw5h9cgiyqb04kv8b5sjrdi4a637gdqs83k887axkd48aw";
+  serverSrcHash = "04d9lny5vyk0kbi5ilv5mngaicnxb077xpcaaqlcd9b1m3kiq19n";
 in {
   guiStable = mkGui {
     stable = true;