public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gns3Packages.{server,gui}Stable: 2.1.18 -> 2.1.19

Browse Source
This commit is contained in:
Michael Weiss 2019-05-29 00:27:39 +02:00
parent 90267ba813
commit 3b38247781
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
2 changed files with 5 additions and 7 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.18"; stableVersion = "2.1.19";
previewVersion = "2.2.0b1"; previewVersion = "2.2.0b1";
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 = "00hcri32vakz17ywbqd9lycxdai490ds0g1v8znm75ddvszfbv7i"; guiSrcHash = "0bn0qry0djw17zwa16cc69273crnfzppik07f9w20hhr8kjiyvnx";
serverSrcHash = "0f28f5f4dsr8h4q592dh9i1z0gp836gdgm8clwrkb7i01df0rrlf"; serverSrcHash = "1af6pnmr24syx23pqvwchgwy74263k3ccrv7barxi71wsskjlw5a";
in { in {
guiStable = mkGui { guiStable = mkGui {
stable = true; stable = true;

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

@ -22,10 +22,10 @@ let
doCheck = false; doCheck = false;
}); });
aiohttp-cors = super.aiohttp-cors.overridePythonAttrs (oldAttrs: rec { aiohttp-cors = super.aiohttp-cors.overridePythonAttrs (oldAttrs: rec {
version = "0.5.3"; version = "0.6.0";
src = oldAttrs.src.override { src = oldAttrs.src.override {
inherit version; inherit version;
sha256 = "11b51mhr7wjfiikvj3nc5s8c7miin2zdhl3yrzcga4mbpkj892in"; sha256 = "1r0mb4dw0dc1lpi54dk5vxqs06nyhvagp76lyrvk7rd94z5mjkd4";
}; };
propagatedBuildInputs = with self; [ aiohttp ] propagatedBuildInputs = with self; [ aiohttp ]
++ stdenv.lib.optional (pythonOlder "3.5") typing; ++ stdenv.lib.optional (pythonOlder "3.5") typing;
@ -45,8 +45,6 @@ in python.pkgs.buildPythonPackage {
}; };
postPatch = '' 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: # Only 2.x is problematic:
sed -iE "s/prompt-toolkit==1.0.15/prompt-toolkit<2.0.0/" requirements.txt sed -iE "s/prompt-toolkit==1.0.15/prompt-toolkit<2.0.0/" requirements.txt
''; '';