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

gns3-{gui,server}: 2.2.9 -> 2.2.11

This commit is contained in:
Michael Weiss 2020-07-12 19:16:40 +02:00
parent bab982e5ec
commit 99ab9545b2
No known key found for this signature in database
GPG Key ID: 5BE487C4D4771D83
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/applications/networking/gns3/default.nix
View File

@ -1,7 +1,7 @@
{ callPackage }: { callPackage }:
let let
stableVersion = "2.2.9"; stableVersion = "2.2.11";
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;
@ -15,18 +15,19 @@ let
src = oldAttrs.src.override { src = oldAttrs.src.override {
inherit version sha256; inherit version sha256;
}; };
doCheck = oldAttrs.doCheck && (attrname != "psutil");
}); });
}; };
commonOverrides = [ commonOverrides = [
(mkOverride "psutil" "5.6.6" (mkOverride "psutil" "5.7.0"
"1rs6z8bfy6bqzw88s4i5zllrx3i18hnkv4akvmw7bifngcgjh8dd") "03jykdi3dgf1cdal9bv4fq9zjvzj9l9bs99gi5ar81sdl5nc2pk8")
(mkOverride "jsonschema" "3.2.0"
"0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68")
]; ];
}; };
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 = "0xbkzd43zzy1xlwwz7jvjjq21iqy6b08pbs37r6g8jciwiyqrcbd"; guiSrcHash = "1carwhp49l9zx2p6i3in03x6rjzn0x6ls2svwazd643rmrl4y7gn";
serverSrcHash = "1jaap1sxkh4yivrp8z0izypl9n6ss4540n22xkf5fnkv91k0mr5n"; serverSrcHash = "0acbxay1pwq62yq9q67hid44byyi6rb6smz5wa8br3vka7z31iqf";
in { in {
guiStable = mkGui { guiStable = mkGui {
stable = true; stable = true;

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

@ -4,8 +4,6 @@
let let
defaultOverrides = commonOverrides ++ [ defaultOverrides = commonOverrides ++ [
(mkOverride "jsonschema" "3.2.0"
"0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68")
]; ];
python = python3.override { python = python3.override {

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

@ -4,10 +4,19 @@
let let
defaultOverrides = commonOverrides ++ [ defaultOverrides = commonOverrides ++ [
(mkOverride "jsonschema" "3.2.0" (mkOverride "aiofiles" "0.5.0"
"0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68") "98e6bcfd1b50f97db4980e182ddd509b7cc35909e903a8fe50d8849e02d815af")
(mkOverride "aiofiles" "0.4.0" (self: super: {
"1vmvq9qja3wahv8m1adkyk00zm7j0x64pk3f2ry051ja66xa07h2") py-cpuinfo = super.py-cpuinfo.overridePythonAttrs (oldAttrs: rec {
version = "6.0.0";
src = fetchFromGitHub {
owner = "workhorsy";
repo = "py-cpuinfo";
rev = "v${version}";
sha256 = "0595gjkd7gzmn9cfpgjw3ia2sl1y8mmw7ajyscibjx59m5mqcki5";
};
});
})
]; ];
python = python3.override { python = python3.override {