From 698ae84da4a2248e889717a0caa6462a36428c53 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 24 Apr 2022 14:42:26 +0200 Subject: gns3-gui: 2.2.29 -> 2.2.31 --- pkgs/applications/networking/gns3/gui.nix | 36 +++++++++++++++++++++++++------ 1 file changed, 29 insertions(+), 7 deletions(-) (limited to 'pkgs/applications/networking/gns3') diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 95ec995cbfd56..8d1ab4e590c56 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -1,6 +1,16 @@ -{ stable, branch, version, sha256Hash, mkOverride, commonOverrides }: +{ stable +, branch +, version +, sha256Hash +, mkOverride +, commonOverrides +}: -{ lib, python3, fetchFromGitHub, wrapQtAppsHook }: +{ lib +, python3 +, fetchFromGitHub +, wrapQtAppsHook +}: let defaultOverrides = commonOverrides ++ [ @@ -34,21 +44,33 @@ in python.pkgs.buildPythonPackage rec { sha256 = sha256Hash; }; - nativeBuildInputs = [ wrapQtAppsHook ]; + nativeBuildInputs = [ + wrapQtAppsHook + ]; + propagatedBuildInputs = with python.pkgs; [ - sentry-sdk psutil jsonschema # tox for check - # Runtime dependencies - sip_4 (pyqt5.override { withWebSockets = true; }) distro setuptools + distro + jsonschema + psutil + sentry-sdk + setuptools + sip_4 (pyqt5.override { withWebSockets = true; }) ]; doCheck = false; # Failing + dontWrapQtApps = true; + postFixup = '' wrapQtApp "$out/bin/gns3" ''; + postPatch = '' substituteInPlace requirements.txt \ - --replace "sentry-sdk==1.3.1" "sentry-sdk>=1.3.1" \ + --replace "sentry-sdk==" "sentry-sdk>=" \ + --replace "psutil==" "psutil>=" \ + --replace "distro==" "distro>=" \ + --replace "setuptools==" "setuptools>=" ''; meta = with lib; { -- cgit 1.4.1