From e67b1c28758b3010c9ed4f115c8e12301f89e34b Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sat, 8 Aug 2020 14:27:20 +0200 Subject: [PATCH] gns3-{gui,server}: 2.2.11 -> 2.2.12 --- pkgs/applications/networking/gns3/default.nix | 10 +++++----- pkgs/applications/networking/gns3/server.nix | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index d8125e21d1b..f4d377c4c55 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage }: let - stableVersion = "2.2.11"; + stableVersion = "2.2.12"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -18,16 +18,16 @@ let }); }; commonOverrides = [ - (mkOverride "psutil" "5.7.0" - "03jykdi3dgf1cdal9bv4fq9zjvzj9l9bs99gi5ar81sdl5nc2pk8") + (mkOverride "psutil" "5.6.7" + "1an5llivfkwpbcfaapbx78p8sfnvzyfypf60wfxihib1mjr8xbgz") (mkOverride "jsonschema" "3.2.0" "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68") ]; }; mkGui = args: callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "1carwhp49l9zx2p6i3in03x6rjzn0x6ls2svwazd643rmrl4y7gn"; - serverSrcHash = "0acbxay1pwq62yq9q67hid44byyi6rb6smz5wa8br3vka7z31iqf"; + guiSrcHash = "05nnil8ljyj6h366yrniv6syznhhbnb7nzjkz5785rb9pzjizs19"; + serverSrcHash = "0gmfdnymiw4w13qbcsvd71yj3hc9640n43c305vq39hahvsn7rvc"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 1ee204b0691..bbf3f0514c4 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -8,12 +8,12 @@ let "98e6bcfd1b50f97db4980e182ddd509b7cc35909e903a8fe50d8849e02d815af") (self: super: { py-cpuinfo = super.py-cpuinfo.overridePythonAttrs (oldAttrs: rec { - version = "6.0.0"; + version = "7.0.0"; src = fetchFromGitHub { owner = "workhorsy"; repo = "py-cpuinfo"; rev = "v${version}"; - sha256 = "0595gjkd7gzmn9cfpgjw3ia2sl1y8mmw7ajyscibjx59m5mqcki5"; + sha256 = "10qfaibyb2syiwiyv74l7d97vnmlk079qirgnw3ncklqjs0s3gbi"; }; }); })