diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2018-08-18 14:32:48 +0200 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2018-08-18 14:33:28 +0200 |
commit | b7e64c21906010bf8738c6fcf40c80679486abde (patch) | |
tree | fc3e5ab4673b1f91dd37da6fa4f4cfeb6d780eb3 /pkgs/applications/networking/gns3 | |
parent | 6bc625ada9a0879b417e6ecaa48254511861f868 (diff) |
gns3Packages.{server,gui}{Stable,Preview}: 2.1.7 -> 2.1.9
Diffstat (limited to 'pkgs/applications/networking/gns3')
-rw-r--r-- | pkgs/applications/networking/gns3/default.nix | 6 | ||||
-rw-r--r-- | pkgs/applications/networking/gns3/server.nix | 13 |
2 files changed, 16 insertions, 3 deletions
diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 9123477bb3edb..5c66c5a5298b4 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage, stdenv }: let - stableVersion = "2.1.7"; + stableVersion = "2.1.9"; # Currently there is no preview version. previewVersion = stableVersion; addVersion = args: @@ -10,8 +10,8 @@ let in args // { inherit version branch; }; mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; - guiSrcHash = "10zf429zjzf7v4y9r7mmkp42kh5ppmqinhvwqzb7jmsrpv2cnxj6"; - serverSrcHash = "056swz6ygqdi37asah51v1yy0ky8q0p32vf7dxs697hd7nv78aqj"; + guiSrcHash = "0gpif6f7zqz2n8q3pkr8xv3fdc904hq69661w8f1fna360xvksd7"; + serverSrcHash = "1y19jzyyz0sjjxkrpgr6z10irb47v7d8khdvk5nzmgnjfxv875yx"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 24050314c413b..7717862f6a0ac 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -4,6 +4,16 @@ let 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 (oldAttrs: rec { @@ -13,6 +23,9 @@ let inherit pname version; 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 (oldAttrs: |