diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2019-10-04 12:13:14 +0200 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2019-10-04 12:28:57 +0200 |
commit | b52fb3b0789b143e4f4c92972ce62d1880e3b1fe (patch) | |
tree | 6b12c4ec63f7b5c2979a8bdc361b8e496c3c6c7a /pkgs/applications/networking/gns3 | |
parent | 099c740aa5f90880784a6157c302147a1445ed4d (diff) |
gns3Packages.{server,gui}Stable: 2.1.21 -> 2.2.0
gns3Packages.{server,gui}Preview: 2.2.0rc5 -> 2.2.0 The new dependency on setuptools is required for pkg_resources: ImportError: No module named pkg_resources
Diffstat (limited to 'pkgs/applications/networking/gns3')
-rw-r--r-- | pkgs/applications/networking/gns3/default.nix | 12 | ||||
-rw-r--r-- | pkgs/applications/networking/gns3/gui.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/networking/gns3/server.nix | 36 |
3 files changed, 12 insertions, 40 deletions
diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 1d2756de7e696..3375bfd04d661 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,16 +1,16 @@ { callPackage }: let - stableVersion = "2.1.21"; - previewVersion = "2.2.0rc5"; + stableVersion = "2.2.0"; + previewVersion = "2.2.0"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; in args // { inherit version branch; }; mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; - guiSrcHash = "1ydmib302r1cpm2z9pzsfp4ygxrbmskwszsip397n92qx3l9a9v3"; - serverSrcHash = "1ahn1xq1f0wx46i0c8idz96dxfbakk37pqi6amy91594mdlp8yr4"; + guiSrcHash = "0xghldzk126ly49y7drp241w7c0h9fb0ags9blk0rlq99i72as78"; + serverSrcHash = "0iphs0w6r9s85cgd95bh6jd0224ywilrzb7a4jjwi38z7a7id4gk"; in { guiStable = mkGui { stable = true; @@ -18,7 +18,7 @@ in { }; guiPreview = mkGui { stable = false; - sha256Hash = "0x4sp6yjnvzpk8cxdqlf51njckmvvkijdb7rvcb4hvqq1ab6gb2x"; + sha256Hash = guiSrcHash; }; serverStable = mkServer { @@ -27,6 +27,6 @@ in { }; serverPreview = mkServer { stable = false; - sha256Hash = "0inj6fac0683s1sxaba3ljia90cfach0y42xylzgzza36wpyqpqg"; + sha256Hash = serverSrcHash; }; } diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index de624d7f6b295..9af0f1a6bc668 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -19,8 +19,8 @@ in pythonPackages.buildPythonPackage rec { propagatedBuildInputs = with pythonPackages; [ raven psutil jsonschema # tox for check # Runtime dependencies - sip (pyqt5.override { withWebSockets = true; }) - ] ++ stdenv.lib.optional (!stable) pythonPackages.distro; + sip (pyqt5.override { withWebSockets = true; }) distro setuptools + ]; doCheck = false; # Failing diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index f681f3fa63b67..71223c6f512e2 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -3,35 +3,7 @@ { stdenv, python3, fetchFromGitHub }: let - python = if stable then python3.override { - packageOverrides = self: super: { - async-timeout = super.async-timeout.overridePythonAttrs (oldAttrs: rec { - version = "2.0.1"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1l3kg062m02mph6rf9rdv8r5c5n356clxa6b6mrn0i77vk9g9kq0"; - }; - }); - aiohttp = super.aiohttp.overridePythonAttrs (oldAttrs: rec { - version = "2.3.10"; - src = oldAttrs.src.override { - inherit version; - sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964"; - }; - propagatedBuildInputs = with self; [ async-timeout attrs chardet multidict yarl idna-ssl ]; - doCheck = false; - }); - aiohttp-cors = super.aiohttp-cors.overridePythonAttrs (oldAttrs: rec { - version = "0.6.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "1r0mb4dw0dc1lpi54dk5vxqs06nyhvagp76lyrvk7rd94z5mjkd4"; - }; - propagatedBuildInputs = with self; [ aiohttp ] - ++ stdenv.lib.optional (pythonOlder "3.5") typing; - }); - }; - } else python3; + python = python3; in python.pkgs.buildPythonPackage { pname = "gns3-server"; @@ -50,10 +22,10 @@ in python.pkgs.buildPythonPackage { ''; propagatedBuildInputs = with python.pkgs; [ - aiohttp-cors yarl aiohttp multidict - jinja2 psutil zipstream raven jsonschema + aiohttp-cors yarl aiohttp multidict setuptools + jinja2 psutil zipstream raven jsonschema distro async_generator aiofiles (python.pkgs.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {}) - ] ++ stdenv.lib.optional (!stable) [ distro async_generator aiofiles ]; + ]; # Requires network access doCheck = false; |