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

gns3Packages.{server,gui}Preview: 2.1.0rc3 -> 2.1.0rc4

Browse Source
This commit is contained in:
Michael Weiss 2017-11-08 14:48:31 +01:00
parent 8bc70c892a
commit c4dbbbd890
2 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,7 @@
let let
stableVersion = "2.0.3"; stableVersion = "2.0.3";
previewVersion = "2.1.0rc3"; previewVersion = "2.1.0rc4";
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";
@ -16,7 +16,7 @@ in {
}; };
guiPreview = mkGui { guiPreview = mkGui {
stable = false; stable = false;
sha256Hash = "0yc5lr01xb7lk4dsrwx79mimbr91vldpvqbrx37j3kym6p5m84cn"; sha256Hash = "10p8i45n6qsf431d0xpy5dk3g5qh6zdlnfj82jn9xdyccgxs4x3s";
}; };
serverStable = mkServer { serverStable = mkServer {
@ -25,6 +25,6 @@ in {
}; };
serverPreview = mkServer { serverPreview = mkServer {
stable = false; stable = false;
sha256Hash = "1lac88d9cmlhrwmlvxv1sk86600rwznw3lpsm440bax6qbdfcis3"; sha256Hash = "1z8a3s90k86vmi4rwsd3v74gwvml68ci6f3zgxaji3z1sm22zcyd";
}; };
} }

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

@ -4,7 +4,23 @@
let let
pythonPackages = python3Packages; pythonPackages = python3Packages;
yarl = if (!stable) then pythonPackages.yarl # TODO: Not sure if all these overwrites are really required...
# Upstream seems to have some reasons (bugs, incompatibilities) though.
multidict_3_1_3 =
(stdenv.lib.overrideDerivation pythonPackages.multidict (oldAttrs:
rec {
pname = "multidict";
version = "3.1.3";
name = "${pname}-${version}";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "04kdxh19m41c6vbshwk8jfbidsfsqn7mn0abvx09nyg78sh80pw7";
};
doInstallCheck = false;
}));
yarl = if (!stable)
then (stdenv.lib.overrideDerivation pythonPackages.yarl (oldAttrs:
{ propagatedBuildInputs = [ multidict_3_1_3 ]; }))
else (stdenv.lib.overrideDerivation pythonPackages.yarl (oldAttrs: else (stdenv.lib.overrideDerivation pythonPackages.yarl (oldAttrs:
rec { rec {
pname = "yarl"; pname = "yarl";
@ -15,7 +31,19 @@ let
sha256 = "1v2dsmr7bqp0yx51pwhbxyvzza8m2f88prsnbd926mi6ah38p0d7"; sha256 = "1v2dsmr7bqp0yx51pwhbxyvzza8m2f88prsnbd926mi6ah38p0d7";
}; };
})); }));
aiohttp = if (!stable) then pythonPackages.aiohttp aiohttp = if (!stable)
then (stdenv.lib.overrideDerivation pythonPackages.aiohttp (oldAttrs:
rec {
pname = "aiohttp";
version = "2.2.5";
name = "${pname}-${version}";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "1g6kzkf5in0briyscwxsihgps833dq2ggcq6lfh1hq95ck8zsnxg";
};
propagatedBuildInputs = [ yarl multidict_3_1_3 ]
++ (with pythonPackages; [ async-timeout chardet ]);
}))
else (stdenv.lib.overrideDerivation pythonPackages.aiohttp (oldAttrs: else (stdenv.lib.overrideDerivation pythonPackages.aiohttp (oldAttrs:
rec { rec {
pname = "aiohttp"; pname = "aiohttp";
@ -28,7 +56,9 @@ let
propagatedBuildInputs = [ yarl ] propagatedBuildInputs = [ yarl ]
++ (with pythonPackages; [ async-timeout chardet multidict ]); ++ (with pythonPackages; [ async-timeout chardet multidict ]);
})); }));
aiohttp-cors = if (!stable) then pythonPackages.aiohttp-cors aiohttp-cors = if (!stable)
then (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors (oldAttrs:
{ propagatedBuildInputs = [ aiohttp ]; }))
else (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors (oldAttrs: else (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors (oldAttrs:
rec { rec {
pname = "aiohttp-cors"; pname = "aiohttp-cors";