From dfe6f3e4cbeb773b64bad93a10f14003e98a1481 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sat, 29 Jul 2023 10:20:52 -0700 Subject: [PATCH 1/2] python3.pkgs.cx_Freeze: switch to pyproject build --- pkgs/development/python-modules/cx_freeze/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix index 0681b727b220..b30fa8e5659f 100644 --- a/pkgs/development/python-modules/cx_freeze/default.nix +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -5,12 +5,16 @@ , ncurses , importlib-metadata , setuptools +, wheel , patchelf }: buildPythonPackage rec { pname = "cx-freeze"; version = "6.14.4"; + format = "pyproject"; + + disabled = pythonOlder "3.5"; src = fetchPypi { pname = "cx_Freeze"; @@ -18,7 +22,10 @@ buildPythonPackage rec { hash = "sha256-ydox+o4B0t/dYD+nDiY5CmWupt1iMzyU2fA4tCqgVcg="; }; - disabled = pythonOlder "3.5"; + nativeBuildInputs = [ + setuptools + wheel + ]; propagatedBuildInputs = [ importlib-metadata # upstream has this for 3.8 as well From 043c1325f657fea146becf0f7246bb4a398595f5 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Wed, 2 Aug 2023 20:50:12 -0700 Subject: [PATCH 2/2] python310Packages.cx-freeze: rename from cx_Freeze --- pkgs/applications/audio/easyabc/default.nix | 2 +- .../python-modules/{cx_freeze => cx-freeze}/default.nix | 0 pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 +- 4 files changed, 3 insertions(+), 2 deletions(-) rename pkgs/development/python-modules/{cx_freeze => cx-freeze}/default.nix (100%) diff --git a/pkgs/applications/audio/easyabc/default.nix b/pkgs/applications/audio/easyabc/default.nix index 9f45d0452413..94d8e83080b4 100644 --- a/pkgs/applications/audio/easyabc/default.nix +++ b/pkgs/applications/audio/easyabc/default.nix @@ -15,7 +15,7 @@ python39.pkgs.buildPythonApplication { nativeBuildInputs = [ wrapGAppsHook ]; propagatedBuildInputs = with python39.pkgs; [ - cx_Freeze + cx-freeze wxPython_4_2 pygame ]; diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx-freeze/default.nix similarity index 100% rename from pkgs/development/python-modules/cx_freeze/default.nix rename to pkgs/development/python-modules/cx-freeze/default.nix diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index a6ef2838bcb6..2333a255cfad 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -77,6 +77,7 @@ mapAliases ({ coronavirus = throw "coronavirus was removed, because the source is not providing the data anymore."; # added 2023-05-04 cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14 cryptography_vectors = "cryptography_vectors is no longer exposed in python*Packages because it is used for testing cryptography only."; # Added 2022-03-23 + cx_Freeze = cx-freeze; # added 2023-08-02 dask-xgboost = throw "dask-xgboost was removed because its features are available in xgboost"; # added 2022-05-24 dateutil = python-dateutil; # added 2021-07-03 demjson = throw "demjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5c498ff9519a..355ae020f1ef 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2326,7 +2326,7 @@ self: super: with self; { cwlformat = callPackage ../development/python-modules/cwlformat { }; - cx_Freeze = callPackage ../development/python-modules/cx_freeze { }; + cx-freeze = callPackage ../development/python-modules/cx-freeze { }; cx_oracle = callPackage ../development/python-modules/cx_oracle { };