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

gns3-{gui,server}: 2.2.3 -> 2.2.5

Browse Source
This commit is contained in:
Michael Weiss 2020-01-10 17:32:45 +01:00
parent d494bfcaf3
commit b333f39de7
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
3 changed files with 19 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 }: { callPackage }:
let let
stableVersion = "2.2.3"; stableVersion = "2.2.5";
previewVersion = stableVersion; previewVersion = stableVersion;
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 = "1l40q3d3hsmhgwb4d8hj73vhgckm0dvsc6l6qzacypd202iq1v8a"; guiSrcHash = "1yxwbz93x9hn5y6dir8v7bdfsmfgppvjg4z88l8gx82hhf2476fx";
serverSrcHash = "1qcypb1rmfdl8fl3ykqf5phcapmjid6jrxd6xpncd5dhyl2hr94n"; serverSrcHash = "1d3m8qrz82g8ii6q6j015wqwp6j0415fbqbjvw43zhdx5mnn962d";
in { in {
guiStable = mkGui { guiStable = mkGui {
stable = true; stable = true;

7
pkgs/applications/networking/gns3/gui.nix
View File

@ -5,6 +5,13 @@
let let
python = python3.override { python = python3.override {
packageOverrides = self: super: { packageOverrides = self: super: {
psutil = super.psutil.overridePythonAttrs (oldAttrs: rec {
version = "5.6.3";
src = oldAttrs.src.override {
inherit version;
sha256 = "1wv31zly44qj0rp2acg58xbnc7bf6ffyadasq093l455q30qafl6";
};
});
jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec { jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec {
version = "2.6.0"; version = "2.6.0";
src = oldAttrs.src.override { src = oldAttrs.src.override {

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

@ -5,6 +5,13 @@
let let
python = python3.override { python = python3.override {
packageOverrides = self: super: { packageOverrides = self: super: {
psutil = super.psutil.overridePythonAttrs (oldAttrs: rec {
version = "5.6.3";
src = oldAttrs.src.override {
inherit version;
sha256 = "1wv31zly44qj0rp2acg58xbnc7bf6ffyadasq093l455q30qafl6";
};
});
jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec { jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec {
version = "2.6.0"; version = "2.6.0";
src = oldAttrs.src.override { src = oldAttrs.src.override {
@ -28,6 +35,8 @@ in python.pkgs.buildPythonPackage {
postPatch = '' postPatch = ''
# 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
# yarl 1.4+ only requires Python 3.6+
sed -iE "s/yarl==1.3.0//" requirements.txt
''; '';
propagatedBuildInputs = with python.pkgs; [ propagatedBuildInputs = with python.pkgs; [