diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-03-26 17:17:48 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-03-26 17:36:07 +0000 |
commit | 70e58881128ed8170821840138ab08fc5cdd3c11 (patch) | |
tree | 1bf0d3d977878df5b58493ea02b2e6c79df3ba22 /pkgs/applications/networking/gns3 | |
parent | a9847c36e6aa003998c1ef5518e5710658ca5770 (diff) | |
parent | 90dcc3360327e250536eeeca7fe9d887c9f7a817 (diff) | |
download | nixpkgs-70e58881128ed8170821840138ab08fc5cdd3c11.tar nixpkgs-70e58881128ed8170821840138ab08fc5cdd3c11.tar.gz nixpkgs-70e58881128ed8170821840138ab08fc5cdd3c11.tar.bz2 nixpkgs-70e58881128ed8170821840138ab08fc5cdd3c11.tar.lz nixpkgs-70e58881128ed8170821840138ab08fc5cdd3c11.tar.xz nixpkgs-70e58881128ed8170821840138ab08fc5cdd3c11.tar.zst nixpkgs-70e58881128ed8170821840138ab08fc5cdd3c11.zip |
Merge remote-tracking branch 'nixpkgs/master' into master
Diffstat (limited to 'pkgs/applications/networking/gns3')
-rw-r--r-- | pkgs/applications/networking/gns3/default.nix | 13 | ||||
-rw-r--r-- | pkgs/applications/networking/gns3/gui.nix | 9 | ||||
-rw-r--r-- | pkgs/applications/networking/gns3/server.nix | 13 |
3 files changed, 18 insertions, 17 deletions
diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 2dae8377055..340cfdf879a 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,13 +1,13 @@ { callPackage }: let - stableVersion = "2.2.5"; + stableVersion = "2.2.6"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; branch = if args.stable then "stable" else "preview"; in args // { inherit version branch; }; - extraArgs = { + extraArgs = rec { mkOverride = attrname: version: sha256: self: super: { ${attrname} = super.${attrname}.overridePythonAttrs (oldAttrs: { @@ -15,13 +15,18 @@ let src = oldAttrs.src.override { inherit version sha256; }; + doCheck = oldAttrs.doCheck && (attrname != "psutil"); }); }; + commonOverrides = [ + (mkOverride "psutil" "5.6.6" + "1rs6z8bfy6bqzw88s4i5zllrx3i18hnkv4akvmw7bifngcgjh8dd") + ]; }; mkGui = args: callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "1yxwbz93x9hn5y6dir8v7bdfsmfgppvjg4z88l8gx82hhf2476fx"; - serverSrcHash = "1d3m8qrz82g8ii6q6j015wqwp6j0415fbqbjvw43zhdx5mnn962d"; + guiSrcHash = "0inqy2zw5h9cgiyqb04kv8b5sjrdi4a637gdqs83k887axkd48aw"; + serverSrcHash = "04d9lny5vyk0kbi5ilv5mngaicnxb077xpcaaqlcd9b1m3kiq19n"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 2d462d5c11d..2524731cd05 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -1,12 +1,10 @@ -{ stable, branch, version, sha256Hash, mkOverride }: +{ stable, branch, version, sha256Hash, mkOverride, commonOverrides }: { lib, stdenv, python3, fetchFromGitHub }: let # TODO: This package requires qt5Full to launch - defaultOverrides = [ - (mkOverride "psutil" "5.6.3" - "1wv31zly44qj0rp2acg58xbnc7bf6ffyadasq093l455q30qafl6") + defaultOverrides = commonOverrides ++ [ (mkOverride "jsonschema" "2.6.0" "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg") ]; @@ -40,7 +38,8 @@ in python.pkgs.buildPythonPackage rec { requires access to a local or remote GNS3 server (it's recommended to download the official GNS3 VM). ''; - homepage = https://www.gns3.com/; + homepage = "https://www.gns3.com/"; + changelog = "https://github.com/GNS3/gns3-gui/releases/tag/v${version}"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index beeac9d0293..32dc42e9f51 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -1,11 +1,9 @@ -{ stable, branch, version, sha256Hash, mkOverride }: +{ stable, branch, version, sha256Hash, mkOverride, commonOverrides }: { lib, stdenv, python3, fetchFromGitHub }: let - defaultOverrides = [ - (mkOverride "psutil" "5.6.3" - "1wv31zly44qj0rp2acg58xbnc7bf6ffyadasq093l455q30qafl6") + defaultOverrides = commonOverrides ++ [ (mkOverride "jsonschema" "2.6.0" "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg") ]; @@ -25,8 +23,6 @@ in python.pkgs.buildPythonPackage { }; postPatch = '' - # Only 2.x is problematic: - 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 ''; @@ -34,7 +30,7 @@ in python.pkgs.buildPythonPackage { propagatedBuildInputs = with python.pkgs; [ aiohttp-cors yarl aiohttp multidict setuptools jinja2 psutil zipstream raven jsonschema distro async_generator aiofiles - (python.pkgs.callPackage ../../../development/python-modules/prompt_toolkit/1.nix {}) + prompt_toolkit py-cpuinfo ]; # Requires network access @@ -51,7 +47,8 @@ in python.pkgs.buildPythonPackage { Qemu/KVM. Clients like the GNS3 GUI control the server using a HTTP REST API. ''; - homepage = https://www.gns3.com/; + homepage = "https://www.gns3.com/"; + changelog = "https://github.com/GNS3/gns3-server/releases/tag/v${version}"; license = licenses.gpl3Plus; platforms = platforms.linux; maintainers = with maintainers; [ primeos ]; |