about summary refs log tree commit diff
path: root/pkgs/applications
diff options
context:
space:
mode:
authorMichael Weiss <dev.primeos@gmail.com>2019-05-29 00:27:39 +0200
committerMichael Weiss <dev.primeos@gmail.com>2019-05-29 00:36:41 +0200
commit3b3824778159a232767a1328c05523d607e21841 (patch)
tree63c8b448cb1f0b11eae0e9c2a8bd5da4f5de2e41 /pkgs/applications
parent90267ba813b50b998a6598221ce958cb1beff28e (diff)
gns3Packages.{server,gui}Stable: 2.1.18 -> 2.1.19
Diffstat (limited to 'pkgs/applications')
-rw-r--r--pkgs/applications/networking/gns3/default.nix6
-rw-r--r--pkgs/applications/networking/gns3/server.nix6
2 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index 6ef4465cd92c3..6a7a4a9d8cd15 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.18";
+  stableVersion = "2.1.19";
   previewVersion = "2.2.0b1";
   addVersion = args:
     let version = if args.stable then stableVersion else previewVersion;
@@ -9,8 +9,8 @@ let
     in args // { inherit version branch; };
   mkGui = args: callPackage (import ./gui.nix (addVersion args)) { };
   mkServer = args: callPackage (import ./server.nix (addVersion args)) { };
-  guiSrcHash = "00hcri32vakz17ywbqd9lycxdai490ds0g1v8znm75ddvszfbv7i";
-  serverSrcHash = "0f28f5f4dsr8h4q592dh9i1z0gp836gdgm8clwrkb7i01df0rrlf";
+  guiSrcHash = "0bn0qry0djw17zwa16cc69273crnfzppik07f9w20hhr8kjiyvnx";
+  serverSrcHash = "1af6pnmr24syx23pqvwchgwy74263k3ccrv7barxi71wsskjlw5a";
 in {
   guiStable = mkGui {
     stable = true;
diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix
index dcad3027e96b4..0c57a52ee6b3d 100644
--- a/pkgs/applications/networking/gns3/server.nix
+++ b/pkgs/applications/networking/gns3/server.nix
@@ -22,10 +22,10 @@ let
         doCheck = false;
       });
       aiohttp-cors = super.aiohttp-cors.overridePythonAttrs (oldAttrs: rec {
-        version = "0.5.3";
+        version = "0.6.0";
         src = oldAttrs.src.override {
           inherit version;
-          sha256 = "11b51mhr7wjfiikvj3nc5s8c7miin2zdhl3yrzcga4mbpkj892in";
+          sha256 = "1r0mb4dw0dc1lpi54dk5vxqs06nyhvagp76lyrvk7rd94z5mjkd4";
         };
         propagatedBuildInputs = with self; [ aiohttp ]
           ++ stdenv.lib.optional (pythonOlder "3.5") typing;
@@ -45,8 +45,6 @@ in python.pkgs.buildPythonPackage {
   };
 
   postPatch = ''
-    # "typing" is only required for Python 3.4 and breaks Python 3.7:
-    sed -iE "s/.*typing.*//" requirements.txt
     # Only 2.x is problematic:
     sed -iE "s/prompt-toolkit==1.0.15/prompt-toolkit<2.0.0/" requirements.txt
   '';