gns3Packages.{server,gui}Preview: 2.1.0rc3 -> 2.1.0rc4

2 files changed, 36 insertions, 6 deletions

diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix
index bee3062a5a22..6e86cfb3d023 100644
--- a/pkgs/applications/networking/gns3/default.nix
+++ b/pkgs/applications/networking/gns3/default.nix
@@ -2,7 +2,7 @@
 
 let
   stableVersion = "2.0.3";
-  previewVersion = "2.1.0rc3";
+  previewVersion = "2.1.0rc4";
   addVersion = args:
     let version = if args.stable then stableVersion else previewVersion;
         branch = if args.stable then "stable" else "preview";
@@ -16,7 +16,7 @@ in {
   };
   guiPreview = mkGui {
     stable = false;
-    sha256Hash = "0yc5lr01xb7lk4dsrwx79mimbr91vldpvqbrx37j3kym6p5m84cn";
+    sha256Hash = "10p8i45n6qsf431d0xpy5dk3g5qh6zdlnfj82jn9xdyccgxs4x3s";
   };
 
   serverStable = mkServer {
@@ -25,6 +25,6 @@ in {
   };
   serverPreview = mkServer {
     stable = false;
-    sha256Hash = "1lac88d9cmlhrwmlvxv1sk86600rwznw3lpsm440bax6qbdfcis3";
+    sha256Hash = "1z8a3s90k86vmi4rwsd3v74gwvml68ci6f3zgxaji3z1sm22zcyd";
   };
 }
diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix
index 9d7bf6f5a3ab..6e3280b99019 100644
--- a/pkgs/applications/networking/gns3/server.nix
+++ b/pkgs/applications/networking/gns3/server.nix
@@ -4,7 +4,23 @@
 
 let
   pythonPackages = python3Packages;
-  yarl = if (!stable) then pythonPackages.yarl
+  # TODO: Not sure if all these overwrites are really required...
+  # Upstream seems to have some reasons (bugs, incompatibilities) though.
+  multidict_3_1_3 =
+    (stdenv.lib.overrideDerivation pythonPackages.multidict (oldAttrs:
+      rec {
+        pname = "multidict";
+        version = "3.1.3";
+        name = "${pname}-${version}";
+        src = pythonPackages.fetchPypi {
+          inherit pname version;
+          sha256 = "04kdxh19m41c6vbshwk8jfbidsfsqn7mn0abvx09nyg78sh80pw7";
+        };
+        doInstallCheck = false;
+      }));
+  yarl = if (!stable)
+    then (stdenv.lib.overrideDerivation pythonPackages.yarl (oldAttrs:
+      { propagatedBuildInputs = [ multidict_3_1_3 ]; }))
     else (stdenv.lib.overrideDerivation pythonPackages.yarl (oldAttrs:
       rec {
         pname = "yarl";
@@ -15,7 +31,19 @@ let
           sha256 = "1v2dsmr7bqp0yx51pwhbxyvzza8m2f88prsnbd926mi6ah38p0d7";
         };
       }));
-  aiohttp = if (!stable) then pythonPackages.aiohttp
+  aiohttp = if (!stable)
+    then (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 ]);
+      }))
     else (stdenv.lib.overrideDerivation pythonPackages.aiohttp (oldAttrs:
       rec {
         pname = "aiohttp";
@@ -28,7 +56,9 @@ let
         propagatedBuildInputs = [ yarl ]
           ++ (with pythonPackages; [ async-timeout chardet multidict ]);
       }));
-  aiohttp-cors = if (!stable) then pythonPackages.aiohttp-cors
+  aiohttp-cors = if (!stable)
+    then (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors (oldAttrs:
+      { propagatedBuildInputs = [ aiohttp ]; }))
     else (stdenv.lib.overrideDerivation pythonPackages.aiohttp-cors (oldAttrs:
       rec {
         pname = "aiohttp-cors";