diff options
-rw-r--r-- | pkgs/applications/networking/gns3/default.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/networking/gns3/gui.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/networking/gns3/server.nix | 6 |
3 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 368b3cd2ee68..fcaa1b2c1e87 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -2,8 +2,7 @@ let stableVersion = "2.1.12"; - # Currently there is no preview version. - previewVersion = stableVersion; + previewVersion = "2.2.0a1"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; @@ -19,7 +18,7 @@ in { }; guiPreview = mkGui { stable = false; - sha256Hash = guiSrcHash; + sha256Hash = "16jjgfbdi7b3349wrqalf40qcaqzw3d4vdjbwcy8dbqblg48hn5w"; }; serverStable = mkServer { @@ -28,6 +27,6 @@ in { }; serverPreview = mkServer { stable = false; - sha256Hash = serverSrcHash; + sha256Hash = "0bcsjljy947grfn3y9xyi3dbzdw5wkljq1nr66cqfkidx9f4fzni"; }; } diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index df3093504044..de624d7f6b29 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -20,7 +20,7 @@ in pythonPackages.buildPythonPackage rec { raven psutil jsonschema # tox for check # Runtime dependencies sip (pyqt5.override { withWebSockets = true; }) - ]; + ] ++ stdenv.lib.optional (!stable) pythonPackages.distro; doCheck = false; # Failing diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 4d3a8ca87e56..8daa5d166c52 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -3,7 +3,7 @@ { stdenv, python36, fetchFromGitHub }: let - python = python36.override { + python = if stable then python36.override { packageOverrides = self: super: { async-timeout = super.async-timeout.overridePythonAttrs (oldAttrs: rec { version = "2.0.1"; @@ -31,7 +31,7 @@ let ++ stdenv.lib.optional (pythonOlder "3.5") typing; }); }; - }; + } else python36; in python.pkgs.buildPythonPackage { pname = "gns3-server"; @@ -48,7 +48,7 @@ in python.pkgs.buildPythonPackage { aiohttp-cors yarl aiohttp multidict jinja2 psutil zipstream raven jsonschema typing (python.pkgs.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {}) - ]; + ] ++ stdenv.lib.optional (!stable) python.pkgs.distro; # Requires network access doCheck = false; |