Skip to content

Commit

Permalink
Merge pull request #246900 from tjni/cx-freeze
Browse files Browse the repository at this point in the history
python3.pkgs.cx-freeze: switch to pyproject and rename
  • Loading branch information
FRidh committed Aug 7, 2023
2 parents 3dfe8ff + 043c132 commit 65a8bb4
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 3 deletions.
2 changes: 1 addition & 1 deletion pkgs/applications/audio/easyabc/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ python39.pkgs.buildPythonApplication {
nativeBuildInputs = [ wrapGAppsHook ];

propagatedBuildInputs = with python39.pkgs; [
cx_Freeze
cx-freeze
wxPython_4_2
pygame
];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,27 @@
, 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";
inherit version;
hash = "sha256-ydox+o4B0t/dYD+nDiY5CmWupt1iMzyU2fA4tCqgVcg=";
};

disabled = pythonOlder "3.5";
nativeBuildInputs = [
setuptools
wheel
];

propagatedBuildInputs = [
importlib-metadata # upstream has this for 3.8 as well
Expand Down
1 change: 1 addition & 0 deletions pkgs/top-level/python-aliases.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/python-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2328,7 +2328,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 { };

Expand Down

0 comments on commit 65a8bb4

Please sign in to comment.