git.iko.soy/typeable/nixpkgs
on master help sign in
gns3: 2.2.18 -> 2.2.28
commite95023d46641c8400b245cf12657db0668b6ed71 authordeltadelta <contact@libellules.eu> dateThu 6 Jan 2022, 02:51 (5 years ago) parentc8104ef
3 files changed+15−9
compare with master
unifiedsplit
pkgs/applications/networking/gns3/default.nix+5−5 pkgs/applications/networking/gns3/gui.nix+4 pkgs/applications/networking/gns3/server.nix+6−4
pkgs/applications/networking/gns3/default.nix+5−5
@@ -1,7 +1,7 @@
11{ callPackage, libsForQt5 }:
22
33let
4− stableVersion = "2.2.18";
4+ stableVersion = "2.2.28";
55 previewVersion = stableVersion;
66 addVersion = args:
77 let version = if args.stable then stableVersion else previewVersion;
@@ -18,16 +18,16 @@ let
1818 });
1919 };
2020 commonOverrides = [
21− (mkOverride "psutil" "5.6.7"
22− "1an5llivfkwpbcfaapbx78p8sfnvzyfypf60wfxihib1mjr8xbgz")
21+ (mkOverride "psutil" "5.8.0"
22+ "sha256-DJzLmat2Al8vC77PNB1GVunBNR24zIoDzNYuMYq0tcY=")
2323 (mkOverride "jsonschema" "3.2.0"
2424 "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68")
2525 ];
2626 };
2727 mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { };
2828 mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { };
29− guiSrcHash = "118z6asl6hsv0777rld4plnrwzkbkh3gb9lg9i6bqrjs93p028fw";
30− serverSrcHash = "0gd37zpvibhlvqqpflpwlrgg8g9rpbxwi9w9fsym00mfwf7sdd3b";
29+ guiSrcHash = "sha256-5GPGn0ZFlqoKkb5BOzxf2FqwPlu7hZe4ysWDGSROCj0=";
30+ serverSrcHash = "sha256-7xsgpm4KFeGFbW81/oMUGQSwXWXnBPTHzVVR0/cUe6U=";
3131in {
3232 guiStable = mkGui {
3333 stable = true;
pkgs/applications/networking/gns3/gui.nix+4
@@ -32,6 +32,10 @@ in python.pkgs.buildPythonPackage rec {
3232 postFixup = ''
3333 wrapQtApp "$out/bin/gns3"
3434 '';
35+ postPatch = ''
36+ substituteInPlace requirements.txt \
37+ --replace "sentry-sdk==1.3.1" "sentry-sdk>=1.3.1" \
38+ '';
3539
3640 meta = with lib; {
3741 description = "Graphical Network Simulator 3 GUI (${branch} release)";
pkgs/applications/networking/gns3/server.nix+6−4
@@ -8,12 +8,12 @@ let
88 (self: super: {
99 aiofiles = super.aiofiles.overridePythonAttrs (oldAttrs: rec {
1010 pname = "aiofiles";
11− version = "0.5.0";
11+ version = "0.7.0";
1212 src = fetchFromGitHub {
1313 owner = "Tinche";
1414 repo = pname;
1515 rev = "v${version}";
16− sha256 = "17bsg2x5r0q6jy74hajnbp717pvbf752w0wgih6pbb4hdvfg5lcf";
16+ sha256 = "sha256-njQ7eRYJO+dUrwO5pZwKHXn9nVSGYcEhwhs3x5BMc28=";
1717 };
1818 doCheck = false;
1919 });
@@ -36,8 +36,10 @@ in python.pkgs.buildPythonPackage {
3636
3737 postPatch = ''
3838 substituteInPlace requirements.txt \
39− --replace "aiohttp==3.6.2" "aiohttp>=3.6.2" \
40− --replace "py-cpuinfo==7.0.0" "py-cpuinfo>=8.0.0"
39+ --replace "aiohttp==3.7.4" "aiohttp>=3.7.4" \
40+ --replace "Jinja2==3.0.1" "Jinja2>=3.0.1" \
41+ --replace "sentry-sdk==1.3.1" "sentry-sdk>=1.3.1" \
42+ --replace "async-timeout==3.0.1" "async-timeout>=3.0.1" \
4143 '';
4244
4345 propagatedBuildInputs = with python.pkgs; [