public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gns3Packages.{server,gui}Preview: 2.1.12 -> 2.2.0a1

Browse Source
This commit is contained in:
Michael Weiss 2019-02-01 12:36:05 +01:00
parent a111a5ee09
commit 0c4786cf76
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/networking/gns3/default.nix
View File

@ -2,8 +2,7 @@
let let
stableVersion = "2.1.12"; stableVersion = "2.1.12";
# Currently there is no preview version. previewVersion = "2.2.0a1";
previewVersion = stableVersion;
addVersion = args: addVersion = args:
let version = if args.stable then stableVersion else previewVersion; let version = if args.stable then stableVersion else previewVersion;
branch = if args.stable then "stable" else "preview"; branch = if args.stable then "stable" else "preview";
@ -19,7 +18,7 @@ in {
}; };
guiPreview = mkGui { guiPreview = mkGui {
stable = false; stable = false;
sha256Hash = guiSrcHash; sha256Hash = "16jjgfbdi7b3349wrqalf40qcaqzw3d4vdjbwcy8dbqblg48hn5w";
}; };
serverStable = mkServer { serverStable = mkServer {
@ -28,6 +27,6 @@ in {
}; };
serverPreview = mkServer { serverPreview = mkServer {
stable = false; stable = false;
sha256Hash = serverSrcHash; sha256Hash = "0bcsjljy947grfn3y9xyi3dbzdw5wkljq1nr66cqfkidx9f4fzni";
}; };
} }

2
pkgs/applications/networking/gns3/gui.nix
View File

@ -20,7 +20,7 @@ in pythonPackages.buildPythonPackage rec {
raven psutil jsonschema # tox for check raven psutil jsonschema # tox for check
# Runtime dependencies # Runtime dependencies
sip (pyqt5.override { withWebSockets = true; }) sip (pyqt5.override { withWebSockets = true; })
]; ] ++ stdenv.lib.optional (!stable) pythonPackages.distro;
doCheck = false; # Failing doCheck = false; # Failing

6
pkgs/applications/networking/gns3/server.nix
View File

@ -3,7 +3,7 @@
{ stdenv, python36, fetchFromGitHub }: { stdenv, python36, fetchFromGitHub }:
let let
python = python36.override { python = if stable then python36.override {
packageOverrides = self: super: { packageOverrides = self: super: {
async-timeout = super.async-timeout.overridePythonAttrs (oldAttrs: rec { async-timeout = super.async-timeout.overridePythonAttrs (oldAttrs: rec {
version = "2.0.1"; version = "2.0.1";
@ -31,7 +31,7 @@ let
++ stdenv.lib.optional (pythonOlder "3.5") typing; ++ stdenv.lib.optional (pythonOlder "3.5") typing;
}); });
}; };
}; } else python36;
in python.pkgs.buildPythonPackage { in python.pkgs.buildPythonPackage {
pname = "gns3-server"; pname = "gns3-server";
@ -48,7 +48,7 @@ in python.pkgs.buildPythonPackage {
aiohttp-cors yarl aiohttp multidict aiohttp-cors yarl aiohttp multidict
jinja2 psutil zipstream raven jsonschema typing jinja2 psutil zipstream raven jsonschema typing
(python.pkgs.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {}) (python.pkgs.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {})
]; ] ++ stdenv.lib.optional (!stable) python.pkgs.distro;
# Requires network access # Requires network access
doCheck = false; doCheck = false;