diff options
author | Zhaofeng Li <hello@zhaofeng.li> | 2022-09-26 18:30:48 -0600 |
---|---|---|
committer | Zhaofeng Li <hello@zhaofeng.li> | 2022-09-26 18:31:12 -0600 |
commit | 50a3d218183bc2aecfd5aaee95d5b835a41f70db (patch) | |
tree | 7607e419e1a0c3d58a7b64cc045d09a0f5955dbc | |
parent | f2c5fec8d3cc2ed9a1509e8d7e9a2ceb09a0e7f5 (diff) | |
download | nixpkgs-50a3d218183bc2aecfd5aaee95d5b835a41f70db.tar nixpkgs-50a3d218183bc2aecfd5aaee95d5b835a41f70db.tar.gz nixpkgs-50a3d218183bc2aecfd5aaee95d5b835a41f70db.tar.bz2 nixpkgs-50a3d218183bc2aecfd5aaee95d5b835a41f70db.tar.lz nixpkgs-50a3d218183bc2aecfd5aaee95d5b835a41f70db.tar.xz nixpkgs-50a3d218183bc2aecfd5aaee95d5b835a41f70db.tar.zst nixpkgs-50a3d218183bc2aecfd5aaee95d5b835a41f70db.zip |
gns3-{server-gui}: Fix build
Removed duplicate overrides and made the override interface consistent. The previous method of pinning caused frequent breakages.
-rw-r--r-- | pkgs/applications/networking/gns3/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/networking/gns3/gui.nix | 17 | ||||
-rw-r--r-- | pkgs/applications/networking/gns3/server.nix | 16 |
3 files changed, 5 insertions, 32 deletions
diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 7f6ff3be034..27ec34e1596 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -20,7 +20,9 @@ let }); }; commonOverrides = [ - (mkOverride "jsonschema" "3.2.0" "0ykr61yiiizgvm3bzipa3l73rvj49wmrybbfwhvpgk3pscl5pa68") + (self: super: { + jsonschema = super.jsonschema_3; + }) ]; }; mkGui = args: libsForQt5.callPackage (import ./gui.nix (addVersion args // extraArgs)) { }; diff --git a/pkgs/applications/networking/gns3/gui.nix b/pkgs/applications/networking/gns3/gui.nix index 8d1ab4e590c..9d0b947e3f1 100644 --- a/pkgs/applications/networking/gns3/gui.nix +++ b/pkgs/applications/networking/gns3/gui.nix @@ -10,6 +10,7 @@ , python3 , fetchFromGitHub , wrapQtAppsHook +, packageOverrides ? self: super: {} }: let @@ -17,21 +18,7 @@ let ]; python = python3.override { - packageOverrides = lib.foldr lib.composeExtensions (self: super: { - jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec { - version = "3.2.0"; - - src = super.fetchPypi { - inherit (oldAttrs) pname; - inherit version; - sha256 = "sha256-yKhbKNN3zHc35G4tnytPRO48Dh3qxr9G3e/HGH0weXo="; - }; - - SETUPTOOLS_SCM_PRETEND_VERSION = version; - - doCheck = false; - }); - }) defaultOverrides; + packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); }; in python.pkgs.buildPythonPackage rec { pname = "gns3-gui"; diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 50a2453b040..814beec7477 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -14,22 +14,6 @@ let defaultOverrides = commonOverrides ++ [ - (self: super: { - jsonschema = super.jsonschema.overridePythonAttrs (oldAttrs: rec { - version = "3.2.0"; - - src = super.fetchPypi { - inherit (oldAttrs) pname; - inherit version; - sha256 = "sha256-yKhbKNN3zHc35G4tnytPRO48Dh3qxr9G3e/HGH0weXo="; - }; - - SETUPTOOLS_SCM_PRETEND_VERSION = version; - - doCheck = false; - }); - - }) ]; python = python3.override { |