diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/gns3')
-rw-r--r-- | nixpkgs/pkgs/applications/networking/gns3/default.nix | 17 | ||||
-rw-r--r-- | nixpkgs/pkgs/applications/networking/gns3/gui.nix | 14 | ||||
-rw-r--r-- | nixpkgs/pkgs/applications/networking/gns3/server.nix | 17 |
3 files changed, 31 insertions, 17 deletions
diff --git a/nixpkgs/pkgs/applications/networking/gns3/default.nix b/nixpkgs/pkgs/applications/networking/gns3/default.nix index 6cfc5ed3a99..867a49e47b3 100644 --- a/nixpkgs/pkgs/applications/networking/gns3/default.nix +++ b/nixpkgs/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ -{ callPackage }: +{ callPackage, libsForQt5 }: let - stableVersion = "2.2.8"; + stableVersion = "2.2.13"; previewVersion = stableVersion; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -15,18 +15,19 @@ let src = oldAttrs.src.override { inherit version sha256; }; - doCheck = oldAttrs.doCheck && (attrname != "psutil"); }); }; commonOverrides = [ - (mkOverride "psutil" "5.6.6" - "1rs6z8bfy6bqzw88s4i5zllrx3i18hnkv4akvmw7bifngcgjh8dd") + (mkOverride "psutil" "5.6.7" + "1an5llivfkwpbcfaapbx78p8sfnvzyfypf60wfxihib1mjr8xbgz") + (mkOverride "jsonschema" "3.2.0" + "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68") ]; }; - mkGui = args: callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; + mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; - guiSrcHash = "1qgzad9hdbvkdalzdnlg5gnlzn2f9qlpd1aj8djmi6w1mmdkf9q7"; - serverSrcHash = "1kg38dh0xk4yvi7hz0d5dq9k0wany0sfd185l0zxs3nz78zd23an"; + guiSrcHash = "1vhch8hgbzdfmgpxlzgdasv6lxgl7rs96n5v4mn2pcccvfmbqj66"; + serverSrcHash = "1vlnhlcnjh0kd623zxjjgkvln0rn5zr43zn00vkvbzwc9cgm2jxz"; in { guiStable = mkGui { stable = true; diff --git a/nixpkgs/pkgs/applications/networking/gns3/gui.nix b/nixpkgs/pkgs/applications/networking/gns3/gui.nix index 2524731cd05..8eb688bcd56 100644 --- a/nixpkgs/pkgs/applications/networking/gns3/gui.nix +++ b/nixpkgs/pkgs/applications/networking/gns3/gui.nix @@ -1,12 +1,9 @@ { stable, branch, version, sha256Hash, mkOverride, commonOverrides }: -{ lib, stdenv, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub, wrapQtAppsHook }: let - # TODO: This package requires qt5Full to launch defaultOverrides = commonOverrides ++ [ - (mkOverride "jsonschema" "2.6.0" - "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg") ]; python = python3.override { @@ -23,15 +20,20 @@ in python.pkgs.buildPythonPackage rec { sha256 = sha256Hash; }; + nativeBuildInputs = [ wrapQtAppsHook ]; propagatedBuildInputs = with python.pkgs; [ - raven psutil jsonschema # tox for check + sentry-sdk psutil jsonschema # tox for check # Runtime dependencies sip (pyqt5.override { withWebSockets = true; }) distro setuptools ]; doCheck = false; # Failing + dontWrapQtApps = true; + postFixup = '' + wrapQtApp "$out/bin/gns3" + ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Graphical Network Simulator 3 GUI (${branch} release)"; longDescription = '' Graphical user interface for controlling the GNS3 network simulator. This diff --git a/nixpkgs/pkgs/applications/networking/gns3/server.nix b/nixpkgs/pkgs/applications/networking/gns3/server.nix index 32dc42e9f51..bbf3f0514c4 100644 --- a/nixpkgs/pkgs/applications/networking/gns3/server.nix +++ b/nixpkgs/pkgs/applications/networking/gns3/server.nix @@ -4,8 +4,19 @@ let defaultOverrides = commonOverrides ++ [ - (mkOverride "jsonschema" "2.6.0" - "00kf3zmpp9ya4sydffpifn0j0mzm342a2vzh82p6r0vh10cg7xbg") + (mkOverride "aiofiles" "0.5.0" + "98e6bcfd1b50f97db4980e182ddd509b7cc35909e903a8fe50d8849e02d815af") + (self: super: { + py-cpuinfo = super.py-cpuinfo.overridePythonAttrs (oldAttrs: rec { + version = "7.0.0"; + src = fetchFromGitHub { + owner = "workhorsy"; + repo = "py-cpuinfo"; + rev = "v${version}"; + sha256 = "10qfaibyb2syiwiyv74l7d97vnmlk079qirgnw3ncklqjs0s3gbi"; + }; + }); + }) ]; python = python3.override { @@ -29,7 +40,7 @@ in python.pkgs.buildPythonPackage { propagatedBuildInputs = with python.pkgs; [ aiohttp-cors yarl aiohttp multidict setuptools - jinja2 psutil zipstream raven jsonschema distro async_generator aiofiles + jinja2 psutil zipstream sentry-sdk jsonschema distro async_generator aiofiles prompt_toolkit py-cpuinfo ]; |