diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2017-12-23 11:40:43 +0100 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2017-12-23 11:41:03 +0100 |
commit | a02f66e87b99822e65fb64878a0b42f49d5738ee (patch) | |
tree | 937b31e97ab432f7ec60b2dd1989464aa178a921 /pkgs/applications/networking | |
parent | 1b555a678e570ad9095c4ed38c1f1406c99657a5 (diff) | |
download | nixpkgs-a02f66e87b99822e65fb64878a0b42f49d5738ee.tar nixpkgs-a02f66e87b99822e65fb64878a0b42f49d5738ee.tar.gz nixpkgs-a02f66e87b99822e65fb64878a0b42f49d5738ee.tar.bz2 nixpkgs-a02f66e87b99822e65fb64878a0b42f49d5738ee.tar.lz nixpkgs-a02f66e87b99822e65fb64878a0b42f49d5738ee.tar.xz nixpkgs-a02f66e87b99822e65fb64878a0b42f49d5738ee.tar.zst nixpkgs-a02f66e87b99822e65fb64878a0b42f49d5738ee.zip |
gns3Packages.{server,gui}{Stable,Preview}: 2.1.0 -> 2.1.1
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r-- | pkgs/applications/networking/gns3/default.nix | 12 | ||||
-rw-r--r-- | pkgs/applications/networking/gns3/server.nix | 11 |
2 files changed, 8 insertions, 15 deletions
diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 72ffbb6e6d3..1d120f09a91 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,8 +1,8 @@ { callPackage, stdenv }: let - stableVersion = "2.1.0"; - previewVersion = "2.1.0rc4"; # == 2.1.0 + stableVersion = "2.1.1"; + previewVersion = "2.1.1"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; @@ -12,19 +12,19 @@ let in { guiStable = mkGui { stable = true; - sha256Hash = "0fms8469daa8jhmsdqnadm18gc27g18q4m974wjfpz9n1rn78sjk"; + sha256Hash = "1iyp5k8z3y32rv8wq268dk92vms5vhhhijxphwvfndh743jaynyk"; }; guiPreview = mkGui { stable = false; - sha256Hash = "10p8i45n6qsf431d0xpy5dk3g5qh6zdlnfj82jn9xdyccgxs4x3s"; + sha256Hash = "1iyp5k8z3y32rv8wq268dk92vms5vhhhijxphwvfndh743jaynyk"; }; serverStable = mkServer { stable = true; - sha256Hash = "1s66qnkhd9rqak13m57i266bgrk8f1ky2wxdha1jj0q9gxdsqa39"; + sha256Hash = "0d427p1g7misbryrn3yagpgxcjwiim39g11zzisw2744l116p7pv"; }; serverPreview = mkServer { stable = false; - sha256Hash = "1z8a3s90k86vmi4rwsd3v74gwvml68ci6f3zgxaji3z1sm22zcyd"; + sha256Hash = "0d427p1g7misbryrn3yagpgxcjwiim39g11zzisw2744l116p7pv"; }; } diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index b09e23218a1..5a201dfc407 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -24,13 +24,6 @@ let aiohttp = (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 ]); })); @@ -57,7 +50,7 @@ in pythonPackages.buildPythonPackage rec { sha256 = sha256Hash; }; - propagatedBuildInputs = [ yarl aiohttp aiohttp-cors ] + propagatedBuildInputs = [ yarl aiohttp aiohttp-cors multidict_3_1_3 ] ++ (with pythonPackages; [ jinja2 psutil zipstream raven jsonschema typing prompt_toolkit @@ -71,7 +64,7 @@ in pythonPackages.buildPythonPackage rec { doCheck = false; postInstall = '' - rm $out/bin/gns3loopback # For windows only + rm $out/bin/gns3loopback # For Windows only ''; meta = with stdenv.lib; { description = "Graphical Network Simulator 3 server (${branch} release)"; |