diff --git a/pkgs/development/python-modules/pur/default.nix b/pkgs/development/tools/pur/default.nix similarity index 53% rename from pkgs/development/python-modules/pur/default.nix rename to pkgs/development/tools/pur/default.nix index d2bc7d5824dc..dc37e3fa20f1 100644 --- a/pkgs/development/python-modules/pur/default.nix +++ b/pkgs/development/tools/pur/default.nix @@ -1,19 +1,27 @@ { lib -, buildPythonPackage -, click +, python3 , fetchFromGitHub -, pytestCheckHook }: -buildPythonPackage rec { +let + py = python3.override { + packageOverrides = self: super: { + # newest version doesn't support click >8.0 https://github.com/alanhamlett/pip-update-requirements/issues/38 + click = self.callPackage ../../../development/python-modules/click/7.nix { }; + }; + }; + inherit (py.pkgs) buildPythonApplication click pytestCheckHook; +in + +buildPythonApplication rec { pname = "pur"; - version = "5.4.1"; + version = "5.4.2"; src = fetchFromGitHub { owner = "alanhamlett"; repo = "pip-update-requirements"; rev = version; - sha256 = "sha256-a2wViLJW+UXgHcURxr4irFVkH8STH84AVcwQIkvH+Fg="; + sha256 = "sha256-coJO9AYm0Qx0arMf/e+pZFG/VxK6bnxxXRgw7x7V2hY="; }; propagatedBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da791f4ecad7..92672fef81a4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27369,6 +27369,8 @@ with pkgs; pika-backup = callPackage ../applications/backup/pika-backup { }; + pur = callPackage ../development/tools/pur { }; + purple-discord = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-discord { }; purple-hangouts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-hangouts { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 99874a26ece6..3b7be354942f 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -66,6 +66,7 @@ mapAliases ({ privacyidea = throw "privacyidea has been renamed to pkgs.privacyidea"; # added 2021-06-20 prometheus_client = prometheus-client; # added 2021-06-10 prompt_toolkit = prompt-toolkit; # added 2021-07-22 + pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 pysmart-smartx = pysmart; # added 2021-10-22 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 20200f9c71fb..ad0d4d0d3bb4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6039,8 +6039,6 @@ in { pulsectl = callPackage ../development/python-modules/pulsectl { }; - pur = callPackage ../development/python-modules/pur { }; - pure-cdb = callPackage ../development/python-modules/pure-cdb { }; pure-eval = callPackage ../development/python-modules/pure-eval { };