Merge pull request #29407 from disassembler/cxfreeze

cx_Freeze: 4.3.4 -> 5.3.2 (cherry picked from commit beaada6)
NixOS · Sep 15, 2017 · 631b96a · 631b96a
1 parent 8067485
commit 631b96a
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 23 deletions.
diff --git a/pkgs/development/python-modules/cx_freeze/default.nix 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
@@ -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}";