diff options
| author | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
| commit | e0794be8a0d11e90461e5a9c85012a36b93ec976 (patch) | |
| tree | efd9cbc55ea3322867bf601c4d536758a3dd5fcc /nixpkgs/pkgs/applications/networking/gns3 | |
| parent | 3538874082ded7647b1ccec0343c7c1e882cfef3 (diff) | |
| parent | 1a57d96edd156958b12782e8c8b6a374142a7248 (diff) | |
| download | nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.gz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.bz2 nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.lz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.xz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.zst nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.zip | |
Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/gns3')
| -rw-r--r-- | nixpkgs/pkgs/applications/networking/gns3/default.nix | 6 | ||||
| -rw-r--r-- | nixpkgs/pkgs/applications/networking/gns3/server.nix | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/nixpkgs/pkgs/applications/networking/gns3/default.nix b/nixpkgs/pkgs/applications/networking/gns3/default.nix index 4341daba9a2d..3d22dca36d95 100644 --- a/nixpkgs/pkgs/applications/networking/gns3/default.nix +++ b/nixpkgs/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage, libsForQt5 }: let - stableVersion = "2.2.14"; + stableVersion = "2.2.17"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -26,8 +26,8 @@ let }; mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "0y0dkyky2vw8ixm8nx4qhsj5b6hk0lv2cayrj4879icmp8zc4dy3"; - serverSrcHash = "1vpsvvisw0sivlbjwawskkyiavl092qxaqxi13khkimz5fk0d3rc"; + guiSrcHash = "0dfyxr983w6lmbcvaf32bnm9cz7y7fp9jfaz8zxp1dvr6dr06cmv"; + serverSrcHash = "0m5ajd2zkafx89hvp202m351h1dygfc3jssl3m7nd7r42csyi2vj"; in { guiStable = mkGui { stable = true; diff --git a/nixpkgs/pkgs/applications/networking/gns3/server.nix b/nixpkgs/pkgs/applications/networking/gns3/server.nix index bbf3f0514c45..ad346104f969 100644 --- a/nixpkgs/pkgs/applications/networking/gns3/server.nix +++ b/nixpkgs/pkgs/applications/networking/gns3/server.nix @@ -35,7 +35,9 @@ in python.pkgs.buildPythonPackage { postPatch = '' # yarl 1.4+ only requires Python 3.6+ - sed -iE "s/yarl==1.3.0//" requirements.txt + substituteInPlace requirements.txt \ + --replace "aiohttp==3.6.2" "aiohttp>=3.6.2" \ + --replace "yarl==1.3.0" "" ''; propagatedBuildInputs = with python.pkgs; [ |