From 45ca602e52bbc6db056133ba80c2e11f240d79d1 Mon Sep 17 00:00:00 2001 From: legendofmiracles Date: Mon, 8 Nov 2021 08:23:14 -0600 Subject: [PATCH] pur: switch to buildPythonApplication --- pkgs/development/{python-modules => tools}/pur/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 4 files changed, 5 insertions(+), 4 deletions(-) rename pkgs/development/{python-modules => tools}/pur/default.nix (90%) diff --git a/pkgs/development/python-modules/pur/default.nix b/pkgs/development/tools/pur/default.nix similarity index 90% rename from pkgs/development/python-modules/pur/default.nix rename to pkgs/development/tools/pur/default.nix index 36b59f823c24..dc37e3fa20f1 100644 --- a/pkgs/development/python-modules/pur/default.nix +++ b/pkgs/development/tools/pur/default.nix @@ -10,10 +10,10 @@ let click = self.callPackage ../../../development/python-modules/click/7.nix { }; }; }; - inherit (py.pkgs) buildPythonPackage click pytestCheckHook; + inherit (py.pkgs) buildPythonApplication click pytestCheckHook; in -buildPythonPackage rec { +buildPythonApplication rec { pname = "pur"; version = "5.4.2"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0ed423b6e573..d064c208e111 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27353,6 +27353,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 a6b9ac968431..929f6076208a 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -65,6 +65,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 b6d07f926e1f..06d29674955a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6041,8 +6041,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 { };