Merge remote-tracking branch 'origin/master' into closure-size

pkgs/development/python-modules/irclib/default.nix

@@ -1,31 +1,22 @@
-a @ {python, ...} :
-let
-  fetchurl = a.fetchurl;
+{ buildPythonPackage, fetchurl }:
+
+buildPythonPackage rec {
+  name = "irclib-${version}";
+  version = "0.4.8";
 
-  version = a.lib.attrByPath ["version"] "0.4.8" a;
-  buildInputs = with a; [
-    python
-  ];
-in
-rec {
   src = fetchurl {
     url = "mirror://sourceforge/python-irclib/python-irclib-${version}.tar.gz";
     sha256 = "1x5456y4rbxmnw4yblhb4as5791glcw394bm36px3x6l05j3mvl1";
   };
+
   patches = [(fetchurl {
     url = "http://trac.uwc.ac.za/trac/python_tools/browser/xmpp/resources/irc-transport/irclib.py.diff?rev=387&format=raw";
     name = "irclib.py.diff";
     sha256 = "5fb8d95d6c95c93eaa400b38447c63e7a176b9502bc49b2f9b788c9905f4ec5e";
   })];
+
   patchFlags = "irclib.py";
 
-  inherit buildInputs;
-  configureFlags = [];
-
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doPatch" "installPythonPackage"];
-
-  name = "python-irclib-" + version;
   meta = {
     description = "Python IRC library";
   };

pkgs/development/python-modules/numpy-no-large-files.patch

@@ -0,0 +1,35 @@
+--- 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()

pkgs/development/python-modules/xmpppy/default.nix

@@ -1,29 +1,21 @@
-a @ {python, setuptools, ... } :
-let
-  fetchurl = a.fetchurl;
+{ buildPythonPackage, fetchurl, setuptools }:
+
+buildPythonPackage rec {
+  name = "xmpp.py-${version}";
+  version = "0.5.0rc1";
 
-  version = a.lib.attrByPath ["version"] "0.5.0rc1" a;
-  buildInputs = with a; [
-    python setuptools
-  ];
-in
-rec {
   src = fetchurl {
     url = "mirror://sourceforge/xmpppy/xmpppy-${version}.tar.gz";
     sha256 = "16hbh8kwc5n4qw2rz1mrs8q17rh1zq9cdl05b1nc404n7idh56si";
   };
 
-  inherit buildInputs;
-  configureFlags = [];
+  buildInputs = [ setuptools ];
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["mkDirs" "installPythonPackage"];
-  mkDirs = a.fullDepEntry(''
+  preInstall = ''
     mkdir -p $out/bin $out/lib $out/share $(toPythonPath $out)
     export PYTHONPATH=$PYTHONPATH:$(toPythonPath $out)
-  '') ["defEnsureDir" "addInputs"];
+  '';
 
-  name = "xmpp.py-" + version;
   meta = {
     description = "XMPP python library";
   };