diff options
author | Anthony Roussel <anthony@roussel.dev> | 2022-11-10 23:42:31 +0100 |
---|---|---|
committer | Anthony Roussel <anthony@roussel.dev> | 2022-11-10 23:42:31 +0100 |
commit | e0b64413b0531f927c88cc0d9d36b1584c4b6304 (patch) | |
tree | 81733548aebceeed8eb20de2cb83e8fbc02e64fe /pkgs/applications/networking/gns3 | |
parent | 7d5785de2bf23f9a2d1f756e8c9ce7f51c6759e3 (diff) |
gns3-server,gns3-gui: clean
Diffstat (limited to 'pkgs/applications/networking/gns3')
-rw-r--r-- | pkgs/applications/networking/gns3/default.nix | 7 | ||||
-rw-r--r-- | pkgs/applications/networking/gns3/gui.nix | 14 | ||||
-rw-r--r-- | pkgs/applications/networking/gns3/server.nix | 14 |
3 files changed, 5 insertions, 30 deletions
diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 324403808fea0..b17986daf5882 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -12,18 +12,13 @@ let extraArgs = rec { mkOverride = attrname: version: sha256: self: super: { - ${attrname} = super.${attrname}.overridePythonAttrs (oldAttrs: { + "${attrname}" = super."${attrname}".overridePythonAttrs (oldAttrs: { inherit version; src = oldAttrs.src.override { inherit version sha256; }; }); }; - commonOverrides = [ - (self: super: { - jsonschema = super.jsonschema_3; - }) - ]; }; mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args // extraArgs)) { }; diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index b6db36339e3a4..756cbd7c8b978 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -3,25 +3,15 @@ , version , sha256Hash , mkOverride -, commonOverrides }: { lib , python3 , fetchFromGitHub , wrapQtAppsHook -, packageOverrides ? self: super: {} }: -let - defaultOverrides = commonOverrides ++ [ - ]; - - python = python3.override { - packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); - }; - -in python.pkgs.buildPythonPackage rec { +python3.pkgs.buildPythonPackage rec { pname = "gns3-gui"; inherit version; @@ -36,7 +26,7 @@ in python.pkgs.buildPythonPackage rec { wrapQtAppsHook ]; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ distro jsonschema psutil diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 94fbd403e6127..5eee199d69155 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -3,24 +3,14 @@ , version , sha256Hash , mkOverride -, commonOverrides }: { lib , python3 , fetchFromGitHub -, packageOverrides ? self: super: {} }: -let - defaultOverrides = commonOverrides ++ [ - ]; - - python = python3.override { - packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); - }; - -in python.pkgs.buildPythonApplication { +python3.pkgs.buildPythonApplication { pname = "gns3-server"; inherit version; @@ -37,7 +27,7 @@ in python.pkgs.buildPythonApplication { --replace "jsonschema>=4.17.0,<4.18" "jsonschema" ''; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ aiofiles aiohttp aiohttp-cors |