gns3Packages.{server,gui}Stable: 2.0.3 -> 2.1.0
This commit is contained in:
parent
46bcc0d498
commit
6aed80f271
|
@ -1,8 +1,8 @@
|
|||
{ callPackage, stdenv }:
|
||||
|
||||
let
|
||||
stableVersion = "2.0.3";
|
||||
previewVersion = "2.1.0rc4";
|
||||
stableVersion = "2.1.0";
|
||||
previewVersion = "2.1.0rc4"; # == 2.1.0
|
||||
addVersion = args:
|
||||
let version = if args.stable then stableVersion else previewVersion;
|
||||
branch = if args.stable then "stable" else "preview";
|
||||
|
@ -12,7 +12,7 @@ let
|
|||
in {
|
||||
guiStable = mkGui {
|
||||
stable = true;
|
||||
sha256Hash = "10qp6430md8d0h2wamgfaq7pai59mqmcw6sw3i1gvb20m0avvsvb";
|
||||
sha256Hash = "0fms8469daa8jhmsdqnadm18gc27g18q4m974wjfpz9n1rn78sjk";
|
||||
};
|
||||
guiPreview = mkGui {
|
||||
stable = false;
|
||||
|
@ -21,7 +21,7 @@ in {
|
|||
|
||||
serverStable = mkServer {
|
||||
stable = true;
|
||||
sha256Hash = "1c7mzj1r2zh90a7vs3s17jakfp9s43b8nnj29rpamqxvl3qhbdy7";
|
||||
sha256Hash = "1s66qnkhd9rqak13m57i266bgrk8f1ky2wxdha1jj0q9gxdsqa39";
|
||||
};
|
||||
serverPreview = mkServer {
|
||||
stable = false;
|
||||
|
|
|
@ -19,7 +19,7 @@ in pythonPackages.buildPythonPackage rec {
|
|||
propagatedBuildInputs = with pythonPackages; [
|
||||
raven psutil jsonschema # tox for check
|
||||
# Runtime dependencies
|
||||
sip pyqt5
|
||||
sip (pyqt5.override { withWebSockets = true; })
|
||||
];
|
||||
|
||||
doCheck = false; # Failing
|
||||
|
|
|
@ -18,21 +18,11 @@ let
|
|||
};
|
||||
doInstallCheck = false;
|
||||
}));
|
||||
yarl = if (!stable)
|
||||
then (stdenv.lib.overrideDerivation pythonPackages.yarl (oldAttrs:
|
||||
{ propagatedBuildInputs = [ multidict_3_1_3 ]; }))
|
||||
else (stdenv.lib.overrideDerivation pythonPackages.yarl (oldAttrs:
|
||||
rec {
|
||||
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:
|
||||
yarl = (stdenv.lib.overrideDerivation pythonPackages.yarl
|
||||
(oldAttrs:
|
||||
{ propagatedBuildInputs = [ multidict_3_1_3 ]; }));
|
||||
aiohttp = (stdenv.lib.overrideDerivation pythonPackages.aiohttp
|
||||
(oldAttrs:
|
||||
rec {
|
||||
pname = "aiohttp";
|
||||
version = "2.2.5";
|
||||
|
@ -43,33 +33,10 @@ let
|
|||
};
|
||||
propagatedBuildInputs = [ yarl multidict_3_1_3 ]
|
||||
++ (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 {
|
||||
name = "${pname}-${version}";
|
||||
pname = "gns3-server";
|
||||
|
@ -87,7 +54,7 @@ in pythonPackages.buildPythonPackage rec {
|
|||
prompt_toolkit
|
||||
]);
|
||||
|
||||
postPatch = stdenv.lib.optionalString (!stable) ''
|
||||
postPatch = ''
|
||||
sed -i 's/yarl>=0.11,<0.12/yarl/g' requirements.txt
|
||||
'';
|
||||
|
||||
|
|
Loading…
Reference in a new issue