mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2025-01-03 17:33:26 +03:00
gns3Packages.{server,gui}Stable: 2.1.16 -> 2.1.17
This commit is contained in:
parent
a468035cc0
commit
3cebc9a390
@ -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;
|
||||
|
@ -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; [
|
||||
|
Loading…
Reference in New Issue
Block a user