ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-07 14:00:59 +03:00
Code Issues Projects Releases Wiki Activity

gns3Packages.{server,gui}Stable: 2.1.16 -> 2.1.17

Browse Source
This commit is contained in:
Michael Weiss 2019-05-17 20:31:45 +02:00
parent a468035cc0
commit 3cebc9a390
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/applications/networking/gns3/default.nix
View File

@ -1,7 +1,7 @@
{ callPackage, stdenv }: { callPackage, stdenv }:
let let
stableVersion = "2.1.16"; stableVersion = "2.1.17";
previewVersion = "2.2.0a5"; previewVersion = "2.2.0a5";
addVersion = args: addVersion = args:
let version = if args.stable then stableVersion else previewVersion; let version = if args.stable then stableVersion else previewVersion;
@ -9,8 +9,8 @@ let
in args // { inherit version branch; }; in args // { inherit version branch; };
mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; mkGui = args: callPackage (import ./gui.nix (addVersion args)) { };
mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args)) { };
guiSrcHash = "03d7yjdnks568njkrgyh7g6c3vf6v7wkifshz2bcvry79pp2h4nl"; guiSrcHash = "1caqb644nq0hhszlg3ac87730m1xmw48b17jisqiq7zmk9scsh40";
serverSrcHash = "0p331aaqxw16kk5l2074qn9a7ih6fkivm05n8da3fwydzp9hjmcp"; serverSrcHash = "0zyfh5sw8r2n41v0nazgdbr50cz6g5an2myvlgj5xx41smr9gflb";
in { in {
guiStable = mkGui { guiStable = mkGui {
stable = true; stable = true;

2
pkgs/applications/networking/gns3/server.nix
View File

@ -47,6 +47,8 @@ in python.pkgs.buildPythonPackage {
postPatch = '' postPatch = ''
# "typing" is only required for Python 3.4 and breaks Python 3.7: # "typing" is only required for Python 3.4 and breaks Python 3.7:
sed -iE "s/.*typing.*//" requirements.txt 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; [ propagatedBuildInputs = with python.pkgs; [