diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-01-19 09:55:31 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-01-19 09:55:31 +0100 |
commit | 716aac2519a7571e7f5fd984a886d579a4a051c5 (patch) | |
tree | 53cf89cf764d787f4dc8f08474479892b9733177 /pkgs/development/python-modules | |
parent | f8472457a440de3c44f6f604142d678b6ae2a762 (diff) | |
parent | 53b389327e34de319dc0dbda2b6bcab1a69db69d (diff) |
Merge branch 'staging' into closure-size
Diffstat (limited to 'pkgs/development/python-modules')
-rw-r--r-- | pkgs/development/python-modules/4suite/default.nix | 18 | ||||
-rw-r--r-- | pkgs/development/python-modules/numpy-no-large-files.patch | 35 | ||||
-rw-r--r-- | pkgs/development/python-modules/pyqt/5.x.nix | 4 |
3 files changed, 2 insertions, 55 deletions
diff --git a/pkgs/development/python-modules/4suite/default.nix b/pkgs/development/python-modules/4suite/default.nix deleted file mode 100644 index 94eec40d51fb..000000000000 --- a/pkgs/development/python-modules/4suite/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -{stdenv, fetchurl, python}: - -stdenv.mkDerivation rec { - version = "1.0.2"; - name = "4suite-${version}"; - src = fetchurl { - url = "mirror://sourceforge/foursuite/4Suite-XML-${version}.tar.bz2"; - sha256 = "0g5cyqxhhiqnvqk457k8sb97r18pwgx6gff18q5296xd3zf4cias"; - }; - buildInputs = [python]; - buildPhase = "true"; - installPhase = "python ./setup.py install --prefix=$out"; - - # None of the tools installed to bin/ work. They all throw an exception - # similar to this: - # ImportError: No module named Ft.Xml.XPath._4xpath - meta.broken = true; -} diff --git a/pkgs/development/python-modules/numpy-no-large-files.patch b/pkgs/development/python-modules/numpy-no-large-files.patch deleted file mode 100644 index 0eb415606d3e..000000000000 --- a/pkgs/development/python-modules/numpy-no-large-files.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- numpy/lib/tests/test_format.py 2015-08-11 12:03:43.000000000 -0500 -+++ numpy/lib/tests/test_format_no_large_files.py 2015-11-03 16:03:30.328084827 -0600 -@@ -810,32 +810,5 @@ - format.write_array_header_1_0(s, d) - assert_raises(ValueError, format.read_array_header_1_0, s) - -- --def test_large_file_support(): -- from nose import SkipTest -- if (sys.platform == 'win32' or sys.platform == 'cygwin'): -- raise SkipTest("Unknown if Windows has sparse filesystems") -- # try creating a large sparse file -- tf_name = os.path.join(tempdir, 'sparse_file') -- try: -- # seek past end would work too, but linux truncate somewhat -- # increases the chances that we have a sparse filesystem and can -- # avoid actually writing 5GB -- import subprocess as sp -- sp.check_call(["truncate", "-s", "5368709120", tf_name]) -- except: -- raise SkipTest("Could not create 5GB large file") -- # write a small array to the end -- with open(tf_name, "wb") as f: -- f.seek(5368709120) -- d = np.arange(5) -- np.save(f, d) -- # read it back -- with open(tf_name, "rb") as f: -- f.seek(5368709120) -- r = np.load(f) -- assert_array_equal(r, d) -- -- - if __name__ == "__main__": - run_module_suite() diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index c2e5cb1a763e..2cc1a82ca09e 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -2,7 +2,7 @@ , lndir, makeWrapper }: let - version = "5.4.2"; + version = "5.5.1"; in stdenv.mkDerivation { name = "${python.libPrefix}-PyQt-${version}"; @@ -16,7 +16,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/pyqt/PyQt5/PyQt-${version}/PyQt-gpl-${version}.tar.gz"; - sha256 = "1402n5kwzd973b65avxk1j9js96wzfm0yw4rshjfy8l7an00bnac"; + sha256 = "11l3pm0wkwkxzw4n3022iid3yyia5ap4l0ny1m5ngkzzzfafyw0a"; }; buildInputs = [ |