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

gns3Packages.{server,gui}Stable: 2.0.3 -> 2.1.0

Browse Source
This commit is contained in:
Michael Weiss 2017-11-12 18:30:10 +01:00
parent 46bcc0d498
commit 6aed80f271
3 changed files with 14 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
{ callPackage, stdenv }: { callPackage, stdenv }:
let let
stableVersion = "2.0.3"; stableVersion = "2.1.0";
previewVersion = "2.1.0rc4"; previewVersion = "2.1.0rc4"; # == 2.1.0
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";
@ -12,7 +12,7 @@ let
in { in {
guiStable = mkGui { guiStable = mkGui {
stable = true; stable = true;
sha256Hash = "10qp6430md8d0h2wamgfaq7pai59mqmcw6sw3i1gvb20m0avvsvb"; sha256Hash = "0fms8469daa8jhmsdqnadm18gc27g18q4m974wjfpz9n1rn78sjk";
}; };
guiPreview = mkGui { guiPreview = mkGui {
stable = false; stable = false;
@ -21,7 +21,7 @@ in {
serverStable = mkServer { serverStable = mkServer {
stable = true; stable = true;
sha256Hash = "1c7mzj1r2zh90a7vs3s17jakfp9s43b8nnj29rpamqxvl3qhbdy7"; sha256Hash = "1s66qnkhd9rqak13m57i266bgrk8f1ky2wxdha1jj0q9gxdsqa39";
}; };
serverPreview = mkServer { serverPreview = mkServer {
stable = false; stable = false;

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

@ -19,7 +19,7 @@ in pythonPackages.buildPythonPackage rec {
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with pythonPackages; [
raven psutil jsonschema # tox for check raven psutil jsonschema # tox for check
# Runtime dependencies # Runtime dependencies
sip pyqt5 sip (pyqt5.override { withWebSockets = true; })
]; ];
doCheck = false; # Failing doCheck = false; # Failing

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

@ -18,21 +18,11 @@ let
}; };
doInstallCheck = false; doInstallCheck = false;
})); }));
yarl = if (!stable) yarl = (stdenv.lib.overrideDerivation pythonPackages.yarl
then (stdenv.lib.overrideDerivation pythonPackages.yarl (oldAttrs: (oldAttrs:
{ propagatedBuildInputs = [ multidict_3_1_3 ]; })) { propagatedBuildInputs = [ multidict_3_1_3 ]; }));
else (stdenv.lib.overrideDerivation pythonPackages.yarl (oldAttrs: aiohttp = (stdenv.lib.overrideDerivation pythonPackages.aiohttp
rec { (oldAttrs:
pname = "yarl";
version = "0.9.8";
name = "${pname}-${version}";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "1v2dsmr7bqp0yx51pwhbxyvzza8m2f88prsnbd926mi6ah38p0d7";
};
}));
aiohttp = if (!stable)
then (stdenv.lib.overrideDerivation pythonPackages.aiohttp (oldAttrs:
rec { rec {
pname = "aiohttp"; pname = "aiohttp";
version = "2.2.5"; version = "2.2.5";
@ -43,33 +33,10 @@ let
}; };
propagatedBuildInputs = [ yarl multidict_3_1_3 ] propagatedBuildInputs = [ yarl multidict_3_1_3 ]
++ (with pythonPackages; [ async-timeout chardet ]); ++ (with pythonPackages; [ async-timeout chardet ]);
}))
else (stdenv.lib.overrideDerivation pythonPackages.aiohttp (oldAttrs:
rec {
pname = "aiohttp";
version = "1.3.5";
name = "${pname}-${version}";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "0hpqdiaifgyfqmxkyzwypwvrnvz5rqzgzylzhihfidc5ldfs856d";
};
propagatedBuildInputs = [ yarl ]
++ (with pythonPackages; [ async-timeout chardet multidict ]);
}));
aiohttp-cors = if (!stable)
then (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors (oldAttrs:
{ propagatedBuildInputs = [ aiohttp ]; }))
else (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors (oldAttrs:
rec {
pname = "aiohttp-cors";
version = "0.5.1";
name = "${pname}-${version}";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "0szma27ri25fq4nwwvs36myddggw3jz4pyzmq63yz4xpw0jjdxck";
};
propagatedBuildInputs = [ aiohttp ];
})); }));
aiohttp-cors = (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors
(oldAttrs:
{ propagatedBuildInputs = [ aiohttp ]; }));
in pythonPackages.buildPythonPackage rec { in pythonPackages.buildPythonPackage rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "gns3-server"; pname = "gns3-server";
@ -87,7 +54,7 @@ in pythonPackages.buildPythonPackage rec {
prompt_toolkit prompt_toolkit
]); ]);
postPatch = stdenv.lib.optionalString (!stable) '' postPatch = ''
sed -i 's/yarl>=0.11,<0.12/yarl/g' requirements.txt sed -i 's/yarl>=0.11,<0.12/yarl/g' requirements.txt
''; '';