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

gns3Packages.{server,gui}{Stable,Preview}: 2.1.7 -> 2.1.9

Browse Source
This commit is contained in:
Michael Weiss 2018-08-18 14:32:48 +02:00
parent 6bc625ada9
commit b7e64c2190
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
{ callPackage, stdenv }: { callPackage, stdenv }:
let let
stableVersion = "2.1.7"; stableVersion = "2.1.9";
# Currently there is no preview version. # Currently there is no preview version.
previewVersion = stableVersion; previewVersion = stableVersion;
addVersion = args: addVersion = args:
@ -10,8 +10,8 @@ let
in args // { inherit version branch; }; in args // { inherit version branch; };
mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; mkGui = args: callPackage (import ./gui.nix (addVersion args)) { };
mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args)) { };
guiSrcHash = "10zf429zjzf7v4y9r7mmkp42kh5ppmqinhvwqzb7jmsrpv2cnxj6"; guiSrcHash = "0gpif6f7zqz2n8q3pkr8xv3fdc904hq69661w8f1fna360xvksd7";
serverSrcHash = "056swz6ygqdi37asah51v1yy0ky8q0p32vf7dxs697hd7nv78aqj"; serverSrcHash = "1y19jzyyz0sjjxkrpgr6z10irb47v7d8khdvk5nzmgnjfxv875yx";
in { in {
guiStable = mkGui { guiStable = mkGui {
stable = true; stable = true;

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

@ -4,6 +4,16 @@
let let
pythonPackages = python3Packages; pythonPackages = python3Packages;
async-timeout = (stdenv.lib.overrideDerivation pythonPackages.async-timeout
(oldAttrs:
rec {
pname = "async-timeout";
version = "2.0.1";
src = pythonPackages.fetchPypi {
inherit pname version;
sha256 = "1l3kg062m02mph6rf9rdv8r5c5n356clxa6b6mrn0i77vk9g9kq0";
};
}));
aiohttp = (stdenv.lib.overrideDerivation pythonPackages.aiohttp aiohttp = (stdenv.lib.overrideDerivation pythonPackages.aiohttp
(oldAttrs: (oldAttrs:
rec { rec {
@ -13,6 +23,9 @@ let
inherit pname version; inherit pname version;
sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964"; sha256 = "8adda6583ba438a4c70693374e10b60168663ffa6564c5c75d3c7a9055290964";
}; };
propagatedBuildInputs = [ async-timeout ]
++ (with pythonPackages; [ attrs chardet multidict yarl ])
++ stdenv.lib.optional (pythonPackages.pythonOlder "3.7") pythonPackages.idna-ssl;
})); }));
aiohttp-cors = (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors aiohttp-cors = (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors
(oldAttrs: (oldAttrs: