cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

gns3-{gui,server}: 2.2.5 -> 2.2.6 (#83422)

Browse source
This commit is contained in:
Michael Weiss 2020-03-26 13:45:35 +01:00 committed by GitHub
parent 9ee46bfb23
commit 8978ef3877
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/networking/gns3/default.nix
View file

@ -1,13 +1,13 @@
{ callPackage }: { callPackage }:
let let
stableVersion = "2.2.5"; stableVersion = "2.2.6";
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;
branch = if args.stable then "stable" else "preview"; branch = if args.stable then "stable" else "preview";
in args // { inherit version branch; }; in args // { inherit version branch; };
extraArgs = { extraArgs = rec {
mkOverride = attrname: version: sha256: mkOverride = attrname: version: sha256:
self: super: { self: super: {
${attrname} = super.${attrname}.overridePythonAttrs (oldAttrs: { ${attrname} = super.${attrname}.overridePythonAttrs (oldAttrs: {
@ -18,11 +18,15 @@ let
doCheck = oldAttrs.doCheck && (attrname != "psutil"); doCheck = oldAttrs.doCheck && (attrname != "psutil");
}); });
}; };
commonOverrides = [
(mkOverride "psutil" "5.6.6"
"1rs6z8bfy6bqzw88s4i5zllrx3i18hnkv4akvmw7bifngcgjh8dd")
];
}; };
mkGui = args: callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkGui = args: callPackage (import ./gui.nix (addVersion args // extraArgs)) { };
mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { };
guiSrcHash = "1yxwbz93x9hn5y6dir8v7bdfsmfgppvjg4z88l8gx82hhf2476fx"; guiSrcHash = "0inqy2zw5h9cgiyqb04kv8b5sjrdi4a637gdqs83k887axkd48aw";
serverSrcHash = "1d3m8qrz82g8ii6q6j015wqwp6j0415fbqbjvw43zhdx5mnn962d"; serverSrcHash = "04d9lny5vyk0kbi5ilv5mngaicnxb077xpcaaqlcd9b1m3kiq19n";
in { in {
guiStable = mkGui { guiStable = mkGui {
stable = true; stable = true;

9
pkgs/applications/networking/gns3/gui.nix
View file

@ -1,12 +1,10 @@
{ stable, branch, version, sha256Hash, mkOverride }: { stable, branch, version, sha256Hash, mkOverride, commonOverrides }:
{ lib, stdenv, python3, fetchFromGitHub }: { lib, stdenv, python3, fetchFromGitHub }:
let let
# TODO: This package requires qt5Full to launch # TODO: This package requires qt5Full to launch
defaultOverrides = [ defaultOverrides = commonOverrides ++ [
(mkOverride "psutil" "5.6.3"
"1wv31zly44qj0rp2acg58xbnc7bf6ffyadasq093l455q30qafl6")
(mkOverride "jsonschema" "2.6.0" (mkOverride "jsonschema" "2.6.0"
"00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg") "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg")
]; ];
@ -40,7 +38,8 @@ in python.pkgs.buildPythonPackage rec {
requires access to a local or remote GNS3 server (it's recommended to requires access to a local or remote GNS3 server (it's recommended to
download the official GNS3 VM). 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; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ primeos ]; maintainers = with maintainers; [ primeos ];

13
pkgs/applications/networking/gns3/server.nix
View file

@ -1,11 +1,9 @@
{ stable, branch, version, sha256Hash, mkOverride }: { stable, branch, version, sha256Hash, mkOverride, commonOverrides }:
{ lib, stdenv, python3, fetchFromGitHub }: { lib, stdenv, python3, fetchFromGitHub }:
let let
defaultOverrides = [ defaultOverrides = commonOverrides ++ [
(mkOverride "psutil" "5.6.3"
"1wv31zly44qj0rp2acg58xbnc7bf6ffyadasq093l455q30qafl6")
(mkOverride "jsonschema" "2.6.0" (mkOverride "jsonschema" "2.6.0"
"00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg") "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg")
]; ];
@ -25,8 +23,6 @@ in python.pkgs.buildPythonPackage {
}; };
postPatch = '' 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+ # yarl 1.4+ only requires Python 3.6+
sed -iE "s/yarl==1.3.0//" requirements.txt sed -iE "s/yarl==1.3.0//" requirements.txt
''; '';
@ -34,7 +30,7 @@ in python.pkgs.buildPythonPackage {
propagatedBuildInputs = with python.pkgs; [ propagatedBuildInputs = with python.pkgs; [
aiohttp-cors yarl aiohttp multidict setuptools aiohttp-cors yarl aiohttp multidict setuptools
jinja2 psutil zipstream raven jsonschema distro async_generator aiofiles 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 # 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 Qemu/KVM. Clients like the GNS3 GUI control the server using a HTTP REST
API. 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; license = licenses.gpl3Plus;
platforms = platforms.linux; platforms = platforms.linux;
maintainers = with maintainers; [ primeos ]; maintainers = with maintainers; [ primeos ];