gns3-{server-gui}: Fix build

Removed duplicate overrides and made the override interface consistent.
The previous method of pinning caused frequent breakages.
This commit is contained in:
Zhaofeng Li
2022-09-26 18:31:12 -06:00
parent f2c5fec8d3
commit 50a3d21818
3 changed files with 5 additions and 32 deletions
@@ -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)) { };
+2 -15
View File
@@ -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";
@@ -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 {