diff options
author | deltadelta <contact@libellules.eu> | 2022-01-06 02:51:09 +0100 |
---|---|---|
committer | deltadelta <contact@libellules.eu> | 2022-01-06 11:32:31 +0100 |
commit | e95023d46641c8400b245cf12657db0668b6ed71 (patch) | |
tree | 89d81c70ba5d3a6477f736c3c1140f9be5a5db38 /pkgs/applications/networking/gns3 | |
parent | c8104eff18d9508bf5c0de956b95098f9b37cc92 (diff) |
gns3: 2.2.18 -> 2.2.28
Diffstat (limited to 'pkgs/applications/networking/gns3')
-rw-r--r-- | pkgs/applications/networking/gns3/default.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/networking/gns3/gui.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/networking/gns3/server.nix | 10 |
3 files changed, 15 insertions, 9 deletions
diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index b3d8a5b3fead..85d966191c44 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage, libsForQt5 }: let - stableVersion = "2.2.18"; + stableVersion = "2.2.28"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -18,16 +18,16 @@ let }); }; commonOverrides = [ - (mkOverride "psutil" "5.6.7" - "1an5llivfkwpbcfaapbx78p8sfnvzyfypf60wfxihib1mjr8xbgz") + (mkOverride "psutil" "5.8.0" + "sha256-DJzLmat2Al8vC77PNB1GVunBNR24zIoDzNYuMYq0tcY=") (mkOverride "jsonschema" "3.2.0" "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68") ]; }; mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "118z6asl6hsv0777rld4plnrwzkbkh3gb9lg9i6bqrjs93p028fw"; - serverSrcHash = "0gd37zpvibhlvqqpflpwlrgg8g9rpbxwi9w9fsym00mfwf7sdd3b"; + guiSrcHash = "sha256-5GPGn0ZFlqoKkb5BOzxf2FqwPlu7hZe4ysWDGSROCj0="; + serverSrcHash = "sha256-7xsgpm4KFeGFbW81/oMUGQSwXWXnBPTHzVVR0/cUe6U="; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index a88ff36a8ca4..7aebfba1b49b 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -32,6 +32,10 @@ in python.pkgs.buildPythonPackage rec { postFixup = '' wrapQtApp "$out/bin/gns3" ''; + postPatch = '' + substituteInPlace requirements.txt \ + --replace "sentry-sdk==1.3.1" "sentry-sdk>=1.3.1" \ + ''; meta = with lib; { description = "Graphical Network Simulator 3 GUI (${branch} release)"; diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 9feceffc0346..ab3a6db587cf 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -8,12 +8,12 @@ let (self: super: { aiofiles = super.aiofiles.overridePythonAttrs (oldAttrs: rec { pname = "aiofiles"; - version = "0.5.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "Tinche"; repo = pname; rev = "v${version}"; - sha256 = "17bsg2x5r0q6jy74hajnbp717pvbf752w0wgih6pbb4hdvfg5lcf"; + sha256 = "sha256-njQ7eRYJO+dUrwO5pZwKHXn9nVSGYcEhwhs3x5BMc28="; }; doCheck = false; }); @@ -36,8 +36,10 @@ in python.pkgs.buildPythonPackage { postPatch = '' substituteInPlace requirements.txt \ - --replace "aiohttp==3.6.2" "aiohttp>=3.6.2" \ - --replace "py-cpuinfo==7.0.0" "py-cpuinfo>=8.0.0" + --replace "aiohttp==3.7.4" "aiohttp>=3.7.4" \ + --replace "Jinja2==3.0.1" "Jinja2>=3.0.1" \ + --replace "sentry-sdk==1.3.1" "sentry-sdk>=1.3.1" \ + --replace "async-timeout==3.0.1" "async-timeout>=3.0.1" \ ''; propagatedBuildInputs = with python.pkgs; [ |