diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2019-05-17 20:31:45 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2019-05-17 20:33:44 +0200 |
| commit | 3cebc9a390305e33d719a967d1deeabc87e47db3 (patch) | |
| tree | 912de60831ce58d8d5957dca331c97c3ef4118db /pkgs/applications/networking/gns3 | |
| parent | a468035cc0a7ea2ea37c7da09f638690818427e6 (diff) | |
| download | nixpkgs-3cebc9a390305e33d719a967d1deeabc87e47db3.tar nixpkgs-3cebc9a390305e33d719a967d1deeabc87e47db3.tar.gz nixpkgs-3cebc9a390305e33d719a967d1deeabc87e47db3.tar.bz2 nixpkgs-3cebc9a390305e33d719a967d1deeabc87e47db3.tar.lz nixpkgs-3cebc9a390305e33d719a967d1deeabc87e47db3.tar.xz nixpkgs-3cebc9a390305e33d719a967d1deeabc87e47db3.tar.zst nixpkgs-3cebc9a390305e33d719a967d1deeabc87e47db3.zip | |
gns3Packages.{server,gui}Stable: 2.1.16 -> 2.1.17
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 | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index cda455d9e56..2f588cd304d 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.16"; + stableVersion = "2.1.17"; previewVersion = "2.2.0a5"; 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 = "03d7yjdnks568njkrgyh7g6c3vf6v7wkifshz2bcvry79pp2h4nl"; - serverSrcHash = "0p331aaqxw16kk5l2074qn9a7ih6fkivm05n8da3fwydzp9hjmcp"; + guiSrcHash = "1caqb644nq0hhszlg3ac87730m1xmw48b17jisqiq7zmk9scsh40"; + serverSrcHash = "0zyfh5sw8r2n41v0nazgdbr50cz6g5an2myvlgj5xx41smr9gflb"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 556d341231f..dcad3027e96 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -47,6 +47,8 @@ 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 ''; propagatedBuildInputs = with python.pkgs; [ |