diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2017-09-15 12:31:13 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-09-15 12:31:13 +0200 |
commit | beaada6c2de1a3451e75031018b94c4273e87e59 (patch) | |
tree | 8b70be6ca1fdf1b711bcef707a0880f5c32eac79 /pkgs | |
parent | 140136ad9567a23b0d88ca014b2604e1820d74f2 (diff) | |
parent | 799a70d62304af44180412cf2eea4da0b06afb3f (diff) | |
download | nixlib-beaada6c2de1a3451e75031018b94c4273e87e59.tar nixlib-beaada6c2de1a3451e75031018b94c4273e87e59.tar.gz nixlib-beaada6c2de1a3451e75031018b94c4273e87e59.tar.bz2 nixlib-beaada6c2de1a3451e75031018b94c4273e87e59.tar.lz nixlib-beaada6c2de1a3451e75031018b94c4273e87e59.tar.xz nixlib-beaada6c2de1a3451e75031018b94c4273e87e59.tar.zst nixlib-beaada6c2de1a3451e75031018b94c4273e87e59.zip |
Merge pull request #29407 from disassembler/cxfreeze
cx_Freeze: 4.3.4 -> 5.3.2
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/python-modules/cx_freeze/default.nix | 28 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 24 |
2 files changed, 29 insertions, 23 deletions
diff --git a/pkgs/development/python-modules/cx_freeze/default.nix b/pkgs/development/python-modules/cx_freeze/default.nix new file mode 100644 index 000000000000..3d937debe58b --- /dev/null +++ b/pkgs/development/python-modules/cx_freeze/default.nix @@ -0,0 +1,28 @@ +{ stdenv, buildPythonPackage, fetchPypi, isPyPy, isPy35, ncurses }: + +buildPythonPackage rec { + pname = "cx_Freeze"; + version = "5.0.2"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "0zbx9j5z5l06bvwvlqvvn7h9dm7zjcjgxm7agbb625nymkq6cd15"; + }; + + propagatedBuildInputs = [ ncurses ]; + + # timestamp need to come after 1980 for zipfiles and nix store is set to epoch + prePatch = '' + substituteInPlace cx_Freeze/freezer.py --replace "os.stat(module.file).st_mtime" "time.time()" + ''; + + # fails to find Console even though it exists on python 3.x + doCheck = false; + + meta = with stdenv.lib; { + description = "A set of scripts and modules for freezing Python scripts into executables"; + homepage = "http://cx-freeze.sourceforge.net/"; + license = licenses.psfl; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d3c2b3ac5768..2921e57920a7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1706,29 +1706,7 @@ in { csvkit = callPackage ../development/python-modules/csvkit { }; - cx_Freeze = buildPythonPackage rec { - name = "cx_freeze-${version}"; - version = "4.3.4"; - - # build failures - disabled = isPyPy || isPy35; - - # timestamp need to come after 1980 for zipfiles and nix store is set to epoch - prePatch = '' - substituteInPlace cx_Freeze/freezer.py --replace "os.stat(module.file).st_mtime" "time.time()" - ''; - - src = pkgs.fetchurl { - url = "mirror://pypi/c/cx_Freeze/cx_Freeze-${version}.tar.gz"; - sha256 = "1qhv0gq3ggr06k8cvzphma29zfqdajkx2yfzbw89s4vy23xbpis0"; - }; - - meta = { - description = "A set of scripts and modules for freezing Python scripts into executables"; - homepage = "http://cx-freeze.sourceforge.net/"; - license = licenses.psfl; - }; - }; + cx_Freeze = callPackage ../development/python-modules/cx_freeze {}; cvxopt = buildPythonPackage rec { name = "${pname}-${version}"; |