BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gns3-{gui,server}: 2.2.0 -> 2.2.1

Browse source
This commit is contained in:
Michael Weiss 2019-11-03 13:59:02 +01:00
parent 546c02c0e4
commit 5b2a6c9984
No known key found for this signature in database
GPG key ID: 5BE487C4D4771D83
3 changed files with 29 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,16 +1,16 @@
{ callPackage }: { callPackage }:
let let
stableVersion = "2.2.0"; stableVersion = "2.2.1";
previewVersion = "2.2.0"; previewVersion = "2.2.1";
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; };
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 = "0xghldzk126ly49y7drp241w7c0h9fb0ags9blk0rlq99i72as78"; guiSrcHash = "16v2sdz37vm8x8w07qxaq2mbx169f9hqqpxnf1lq19v9dfhb19kh";
serverSrcHash = "0iphs0w6r9s85cgd95bh6jd0224ywilrzb7a4jjwi38z7a7id4gk"; serverSrcHash = "0liv9fwi2746542qpnvwzf5wcrsxfv6x5jypwd5db1qkfd50s8xa";
in { in {
guiStable = mkGui { guiStable = mkGui {
stable = true; stable = true;

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

@ -1,11 +1,20 @@
{ stable, branch, version, sha256Hash }: { stable, branch, version, sha256Hash }:
{ stdenv, python3Packages, fetchFromGitHub }: { stdenv, python3, fetchFromGitHub }:
let let
pythonPackages = python3Packages; python = python3.override {
packageOverrides = self: super: {
in pythonPackages.buildPythonPackage rec { jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec {
version = "2.6.0";
src = oldAttrs.src.override {
inherit version;
sha256 = "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg";
};
});
};
};
in python.pkgs.buildPythonPackage rec {
name = "${pname}-${version}"; name = "${pname}-${version}";
pname = "gns3-gui"; pname = "gns3-gui";
@ -16,7 +25,7 @@ in pythonPackages.buildPythonPackage rec {
sha256 = sha256Hash; sha256 = sha256Hash;
}; };
propagatedBuildInputs = with pythonPackages; [ propagatedBuildInputs = with python.pkgs; [
raven psutil jsonschema # tox for check raven psutil jsonschema # tox for check
# Runtime dependencies # Runtime dependencies
sip (pyqt5.override { withWebSockets = true; }) distro setuptools sip (pyqt5.override { withWebSockets = true; }) distro setuptools

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

@ -3,8 +3,17 @@
{ stdenv, python3, fetchFromGitHub }: { stdenv, python3, fetchFromGitHub }:
let let
python = python3; python = python3.override {
packageOverrides = self: super: {
jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec {
version = "2.6.0";
src = oldAttrs.src.override {
inherit version;
sha256 = "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg";
};
});
};
};
in python.pkgs.buildPythonPackage { in python.pkgs.buildPythonPackage {
pname = "gns3-server"; pname = "gns3-server";
inherit version; inherit version;