diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 1e6a0fd5b7f5..71044bd0f181 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage }: let - stableVersion = "2.2.3"; + stableVersion = "2.2.5"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -9,8 +9,8 @@ let in args // { inherit version branch; }; mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; - guiSrcHash = "1l40q3d3hsmhgwb4d8hj73vhgckm0dvsc6l6qzacypd202iq1v8a"; - serverSrcHash = "1qcypb1rmfdl8fl3ykqf5phcapmjid6jrxd6xpncd5dhyl2hr94n"; + guiSrcHash = "1yxwbz93x9hn5y6dir8v7bdfsmfgppvjg4z88l8gx82hhf2476fx"; + serverSrcHash = "1d3m8qrz82g8ii6q6j015wqwp6j0415fbqbjvw43zhdx5mnn962d"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 7c155181c502..d978b060aab2 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -5,6 +5,13 @@ let python = python3.override { packageOverrides = self: super: { + psutil = super.psutil.overridePythonAttrs (oldAttrs: rec { + version = "5.6.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1wv31zly44qj0rp2acg58xbnc7bf6ffyadasq093l455q30qafl6"; + }; + }); jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec { version = "2.6.0"; src = oldAttrs.src.override { diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index db2e085c180d..d6c6b65846c9 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -5,6 +5,13 @@ let python = python3.override { packageOverrides = self: super: { + psutil = super.psutil.overridePythonAttrs (oldAttrs: rec { + version = "5.6.3"; + src = oldAttrs.src.override { + inherit version; + sha256 = "1wv31zly44qj0rp2acg58xbnc7bf6ffyadasq093l455q30qafl6"; + }; + }); jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec { version = "2.6.0"; src = oldAttrs.src.override { @@ -28,6 +35,8 @@ in python.pkgs.buildPythonPackage { postPatch = '' # Only 2.x is problematic: sed -iE "s/prompt-toolkit==1.0.15/prompt-toolkit<2.0.0/" requirements.txt + # yarl 1.4+ only requires Python 3.6+ + sed -iE "s/yarl==1.3.0//" requirements.txt ''; propagatedBuildInputs = with python.pkgs; [