BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Michael Weiss 2017-12-23 11:40:43 +01:00
parent 1b555a678e
commit a02f66e87b
2 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/networking/gns3/default.nix
View file

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

11
pkgs/applications/networking/gns3/server.nix
View file

@ -24,13 +24,6 @@ let
aiohttp = (stdenv.lib.overrideDerivation pythonPackages.aiohttp aiohttp = (stdenv.lib.overrideDerivation pythonPackages.aiohttp
(oldAttrs: (oldAttrs:
rec { rec {
pname = "aiohttp";
version = "2.2.5";
name = "${pname}-${version}";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "1g6kzkf5in0briyscwxsihgps833dq2ggcq6lfh1hq95ck8zsnxg";
};
propagatedBuildInputs = [ yarl multidict_3_1_3 ] propagatedBuildInputs = [ yarl multidict_3_1_3 ]
++ (with pythonPackages; [ async-timeout chardet ]); ++ (with pythonPackages; [ async-timeout chardet ]);
})); }));
@ -57,7 +50,7 @@ in pythonPackages.buildPythonPackage rec {
sha256 = sha256Hash; sha256 = sha256Hash;
}; };
propagatedBuildInputs = [ yarl aiohttp aiohttp-cors ] propagatedBuildInputs = [ yarl aiohttp aiohttp-cors multidict_3_1_3 ]
++ (with pythonPackages; [ ++ (with pythonPackages; [
jinja2 psutil zipstream raven jsonschema typing jinja2 psutil zipstream raven jsonschema typing
prompt_toolkit prompt_toolkit
@ -71,7 +64,7 @@ in pythonPackages.buildPythonPackage rec {
doCheck = false; doCheck = false;
postInstall = '' postInstall = ''
rm $out/bin/gns3loopback # For windows only rm $out/bin/gns3loopback # For Windows only
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "Graphical Network Simulator 3 server (${branch} release)"; description = "Graphical Network Simulator 3 server (${branch} release)";