diff options
author | Anthony Roussel <anthony@roussel.dev> | 2022-11-10 23:07:02 +0100 |
---|---|---|
committer | Anthony Roussel <anthony@roussel.dev> | 2022-11-10 23:07:02 +0100 |
commit | 7d5785de2bf23f9a2d1f756e8c9ce7f51c6759e3 (patch) | |
tree | 72e9d1c5199b12482e6855d94bf016163386520a | |
parent | 4a5943d97d0b6dc3a07fbee6298fdcf6d4b1f4fb (diff) |
gns3-server,gns3-gui: 2.2.34 -> 2.2.35.1
-rw-r--r-- | pkgs/applications/networking/gns3/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/networking/gns3/gui.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/networking/gns3/server.nix | 10 |
3 files changed, 6 insertions, 14 deletions
diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 44c9477c1c43..324403808fea 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -3,7 +3,7 @@ }: let - stableVersion = "2.2.34"; + stableVersion = "2.2.35.1"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -27,8 +27,8 @@ let }; mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "sha256-1YsVMrUYI46lJZbPjf3jnOFDr9Hp54m8DVMz9y4dvVc="; - serverSrcHash = "sha256-h4d9s+QvqN/EFV97rPRhQiyC06wkZ9C2af9gx1Z/x/8="; + guiSrcHash = "sha256-iVvADwIp01HeZoDayvH1dilYRHRkRBTBR3Fh395JBq0="; + serverSrcHash = "sha256-41dbiSjvmsDNYr9/rRkeQVOnPSVND34xx1SNknCgHfc="; in { guiStable = mkGui { diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index be08fe4f4c76..b6db36339e3a 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -55,10 +55,8 @@ in python.pkgs.buildPythonPackage rec { postPatch = '' substituteInPlace requirements.txt \ - --replace "sentry-sdk==" "sentry-sdk>=" \ --replace "psutil==" "psutil>=" \ - --replace "distro==" "distro>=" \ - --replace "setuptools==" "setuptools>=" + --replace "jsonschema>=4.17.0,<4.18" "jsonschema" ''; meta = with lib; { diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index a07409810c01..94fbd403e612 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -33,15 +33,8 @@ in python.pkgs.buildPythonApplication { postPatch = '' substituteInPlace requirements.txt \ - --replace "aiohttp==" "aiohttp>=" \ - --replace "aiofiles==" "aiofiles>=" \ - --replace "Jinja2==" "Jinja2>=" \ - --replace "sentry-sdk==" "sentry-sdk>=" \ - --replace "async-timeout==" "async-timeout>=" \ --replace "psutil==" "psutil>=" \ - --replace "distro==" "distro>=" \ - --replace "py-cpuinfo==" "py-cpuinfo>=" \ - --replace "setuptools==" "setuptools>=" + --replace "jsonschema>=4.17.0,<4.18" "jsonschema" ''; propagatedBuildInputs = with python.pkgs; [ @@ -50,6 +43,7 @@ in python.pkgs.buildPythonApplication { aiohttp-cors async_generator distro + importlib-resources jinja2 jsonschema multidict |