Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1506218
2019-02-22 17:51:01 +01:00
parent 821c0844d4 e2b9656205
commit 71f4ba29a3
163 changed files with 1856 additions and 870 deletions
--- a/pkgs/development/python-modules/aafigure/default.nix
+++ b/pkgs/development/python-modules/aafigure/default.nix
@@ -26,6 +26,6 @@ buildPythonPackage rec {
    homepage = https://launchpad.net/aafigure/;
    license = licenses.bsd2;
    maintainers = with maintainers; [ bjornfor ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }
--- a/pkgs/development/python-modules/actdiag/default.nix
+++ b/pkgs/development/python-modules/actdiag/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
    description = "Generate activity-diagram image from spec-text file (similar to Graphviz)";
    homepage = http://blockdiag.com/;
    license = licenses.asl20;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
    maintainers = with maintainers; [ bjornfor ];
  };
 }
--- a/pkgs/development/python-modules/altair/default.nix
+++ b/pkgs/development/python-modules/altair/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
    homepage = https://github.com/altair-viz/altair;
    license = licenses.bsd3;
    maintainers = with maintainers; [ teh ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }
--- a/pkgs/development/python-modules/asn1ate/default.nix
+++ b/pkgs/development/python-modules/asn1ate/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
  meta = with stdenv.lib; {
    description = "Python library for translating ASN.1 into other forms";
    license = licenses.bsd3;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
    maintainers = with maintainers; [ leenaars ];
  };
 }
--- a/pkgs/development/python-modules/bitstring/default.nix
+++ b/pkgs/development/python-modules/bitstring/default.nix
@@ -14,7 +14,7 @@ buildPythonPackage rec {
    description = "Module for binary data manipulation";
    homepage = "https://github.com/scott-griffiths/bitstring";
    license = licenses.mit;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
    maintainers = with maintainers; [ bjornfor ];
  };
 }
--- a/pkgs/development/python-modules/filebrowser_safe/default.nix
+++ b/pkgs/development/python-modules/filebrowser_safe/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
    downloadPage = https://pypi.python.org/pypi/filebrowser_safe/;
    license = licenses.free;
    maintainers = with maintainers; [ prikhi ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };

 }
--- a/pkgs/development/python-modules/grappelli_safe/default.nix
+++ b/pkgs/development/python-modules/grappelli_safe/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
    downloadPage = http://pypi.python.org/pypi/grappelli_safe/;
    license = licenses.free;
    maintainers = with maintainers; [ prikhi ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };

 }
--- a/pkgs/development/python-modules/i3-py/default.nix
+++ b/pkgs/development/python-modules/i3-py/default.nix
@@ -19,7 +19,7 @@ buildPythonPackage rec {
    description = "Tools for i3 users and developers";
    homepage =  "https://github.com/ziberna/i3-py";
    license = licenses.gpl3;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };

 }
--- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix
+++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix
@@ -0,0 +1,28 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, isPy3k
+}:
+
+buildPythonPackage rec {
+  pname = "imageio-ffmpeg";
+  version = "0.2.0";
+
+  src = fetchPypi {
+    sha256 = "191k77hd69lfmd8p4w02c2ajjdsall6zijn01gyhqi11n48wpsib";
+    inherit pname version;
+  };
+
+  disabled = !isPy3k;
+
+  # No test infrastructure in repository.
+  doCheck = false;
+
+  meta = with lib; {
+    description = "FFMPEG wrapper for Python";
+    homepage = https://github.com/imageio/imageio-ffmpeg;
+    license = licenses.bsd2;
+    maintainers = [ maintainers.pmiddend ];
+  };
+
+}
--- a/pkgs/development/python-modules/imageio/default.nix
+++ b/pkgs/development/python-modules/imageio/default.nix
@@ -1,11 +1,14 @@
 { stdenv
 , buildPythonPackage
+, pathlib
 , fetchPypi
 , pillow
 , psutil
+, imageio-ffmpeg
 , pytest
 , numpy
 , isPy3k
+, ffmpeg
 , futures
 , enum34
 }:
@@ -15,14 +18,17 @@ buildPythonPackage rec {
  version = "2.5.0";

  src = fetchPypi {
-    sha256 = "42e65aadfc3d57a1043615c92bdf6319b67589e49a0aae2b985b82144aceacad";
+    sha256 = "1bdcrr5190jvk0msw2lswj4pbdhrcggjpj8m6q2a2mrxzjnmmrj2";
    inherit pname version;
  };

-  checkInputs = [ pytest psutil ];
+  checkInputs = [ pytest psutil ] ++ stdenv.lib.optionals isPy3k [
+    imageio-ffmpeg ffmpeg
+    ];
  propagatedBuildInputs = [ numpy pillow ] ++ stdenv.lib.optionals (!isPy3k) [
    futures
    enum34
+    pathlib
  ];

  checkPhase = ''
@@ -34,8 +40,12 @@ buildPythonPackage rec {

  # For some reason, importing imageio also imports xml on Nix, see
  # https://github.com/imageio/imageio/issues/395
+
+  # Also, there are tests that test the downloading of ffmpeg if it's not installed.
+  # "Uncomment" those by renaming.
  postPatch = ''
-    substituteInPlace tests/test_meta.py --replace '"urllib",' "\"urllib\",\"xml\""
+    substituteInPlace tests/test_meta.py --replace '"urllib",' "\"urllib\",\"xml\","
+    substituteInPlace tests/test_ffmpeg.py --replace 'test_get_exe_installed' 'get_exe_installed'
  '';

  meta = with stdenv.lib; {
--- a/pkgs/development/python-modules/imread/default.nix
+++ b/pkgs/development/python-modules/imread/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
    homepage = https://imread.readthedocs.io/en/latest/;
    maintainers = with maintainers; [ luispedro ];
    license = licenses.mit;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };

 }
--- a/pkgs/development/python-modules/koji/default.nix
+++ b/pkgs/development/python-modules/koji/default.nix
@@ -25,6 +25,6 @@ buildPythonPackage rec {

  meta = {
    maintainers = [ ];
-    platforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
  };
 }
--- a/pkgs/development/python-modules/libais/default.nix
+++ b/pkgs/development/python-modules/libais/default.nix
@@ -20,6 +20,6 @@ buildPythonPackage rec {
    homepage = https://github.com/schwehr/libais;
    description = "Library for decoding maritime Automatic Identification System messages";
    license = licenses.asl20;
-    platforms = platforms.linux;  # It currently fails to build on darwin
+    platforms = platforms.unix;
  };
 }
--- a/pkgs/development/python-modules/libsavitar/default.nix
+++ b/pkgs/development/python-modules/libsavitar/default.nix
@@ -27,7 +27,7 @@ buildPythonPackage rec {
    description = "C++ implementation of 3mf loading with SIP python bindings";
    homepage = https://github.com/Ultimaker/libSavitar;
    license = licenses.lgpl3Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
    maintainers = with maintainers; [ abbradar orivej ];
  };
 }
--- a/pkgs/development/python-modules/mahotas/default.nix
+++ b/pkgs/development/python-modules/mahotas/default.nix
@@ -28,6 +28,6 @@ buildPythonPackage rec {
    homepage = http://mahotas.readthedocs.io/;
    maintainers = with maintainers; [ luispedro ];
    license = licenses.mit;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }
--- a/pkgs/development/python-modules/mezzanine/default.nix
+++ b/pkgs/development/python-modules/mezzanine/default.nix
@@ -64,7 +64,7 @@ buildPythonPackage rec {
    downloadPage = https://github.com/stephenmcd/mezzanine/releases;
    license = licenses.free;
    maintainers = with maintainers; [ prikhi ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };

 }
--- a/pkgs/development/python-modules/moretools/default.nix
+++ b/pkgs/development/python-modules/moretools/default.nix
@@ -24,6 +24,6 @@ buildPythonPackage rec {
    '';
    homepage = https://bitbucket.org/userzimmermann/python-moretools;
    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }
--- a/pkgs/development/python-modules/mpi4py/default.nix
+++ b/pkgs/development/python-modules/mpi4py/default.nix
@@ -13,11 +13,18 @@ buildPythonPackage rec {
    inherit mpi;
  };

-  patches = [ (fetchpatch {
-    # Disable tests failing with 3.1.x and MPI_THREAD_MULTIPLE
-    url = "https://bitbucket.org/mpi4py/mpi4py/commits/c2b6b7e642a182f9b00a2b8e9db363214470548a/raw";
-    sha256 = "0n6bz3kj4vcqb6q7d0mlj5vl6apn7i2bvfc9mpg59vh3wy47119q";
+  patches = [
+    (fetchpatch {
+      # Disable tests failing with 3.1.x and MPI_THREAD_MULTIPLE (upstream patch)
+      url = "https://bitbucket.org/mpi4py/mpi4py/commits/c2b6b7e642a182f9b00a2b8e9db363214470548a/raw";
+      sha256 = "0n6bz3kj4vcqb6q7d0mlj5vl6apn7i2bvfc9mpg59vh3wy47119q";
    })
+    (fetchpatch {
+      # Open MPI: Workaround removal of MPI_{LB|UB} (upstream patch)
+      url = "https://bitbucket.org/mpi4py/mpi4py/commits/39ca784226460f9e519507269ebb29635dc8bd90/raw";
+      sha256 = "02kxikdlsrlq8yr5hca42536mxbrq4k4j8nqv7p1p2r0q21a919q";
+    })
+
  ];

  postPatch = ''
--- a/pkgs/development/python-modules/nwdiag/default.nix
+++ b/pkgs/development/python-modules/nwdiag/default.nix
@@ -23,7 +23,7 @@ buildPythonPackage rec {
    description = "Generate network-diagram image from spec-text file (similar to Graphviz)";
    homepage = http://blockdiag.com/;
    license = licenses.asl20;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
    maintainers = with maintainers; [ bjornfor ];
  };
 }
--- a/pkgs/development/python-modules/oauth2/default.nix
+++ b/pkgs/development/python-modules/oauth2/default.nix
@@ -26,7 +26,7 @@ buildPythonPackage rec {
    description = "Library for OAuth version 1.0";
    license = licenses.mit;
    maintainers = with maintainers; [ garbas ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };

 }
--- a/pkgs/development/python-modules/openant/default.nix
+++ b/pkgs/development/python-modules/openant/default.nix
@@ -32,7 +32,7 @@ buildPythonPackage rec {
    homepage = "https://github.com/Tigge/openant";
    description = "ANT and ANT-FS Python Library";
    license = licenses.mit;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };

 }
--- a/pkgs/development/python-modules/pg8000/default.nix
+++ b/pkgs/development/python-modules/pg8000/default.nix
@@ -20,7 +20,7 @@ buildPythonPackage rec {
    homepage = https://github.com/mfenniak/pg8000;
    description = "PostgreSQL interface library, for asyncio";
    maintainers = with maintainers; [ garbas domenkozar ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };

 }
--- a/pkgs/development/python-modules/plyvel/default.nix
+++ b/pkgs/development/python-modules/plyvel/default.nix
@@ -22,7 +22,7 @@ buildPythonPackage rec {

  meta = with stdenv.lib; {
    description = "Fast and feature-rich Python interface to LevelDB";
-    platforms = platforms.linux;
+    platforms = platforms.unix;
    homepage = https://github.com/wbolster/plyvel;
    license = licenses.bsd3;
  };
--- a/pkgs/development/python-modules/pychromecast/default.nix
+++ b/pkgs/development/python-modules/pychromecast/default.nix
@@ -18,6 +18,6 @@ buildPythonPackage rec {
    homepage    = https://github.com/balloob/pychromecast;
    license     = licenses.mit;
    maintainers = with maintainers; [ abbradar ];
-    platforms   = platforms.linux;
+    platforms   = platforms.unix;
  };
 }
--- a/pkgs/development/python-modules/pyicu/default.nix
+++ b/pkgs/development/python-modules/pyicu/default.nix
@@ -30,7 +30,7 @@ buildPythonPackage rec {
    homepage = https://pypi.python.org/pypi/PyICU/;
    description = "Python extension wrapping the ICU C++ API";
    license = licenses.mit;
-    platforms = platforms.linux; # Maybe other non-darwin Unix
+    platforms = platforms.unix;
    maintainers = [ maintainers.rycee ];
  };

--- a/pkgs/development/python-modules/pyinputevent/default.nix
+++ b/pkgs/development/python-modules/pyinputevent/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
    homepage = "https://github.com/ntzrmtthihu777/pyinputevent";
    description = "Python interface to the Input Subsystem's input_event and uinput";
    license = licenses.bsd3;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };

 }
--- a/pkgs/development/python-modules/pyodbc/default.nix
+++ b/pkgs/development/python-modules/pyodbc/default.nix
@@ -18,7 +18,7 @@ buildPythonPackage rec {
    description = "Python ODBC module to connect to almost any database";
    homepage = "https://github.com/mkleehammer/pyodbc";
    license = licenses.mit;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
    maintainers = with maintainers; [ bjornfor ];
  };
 }
--- a/pkgs/development/python-modules/pyroute2/default.nix
+++ b/pkgs/development/python-modules/pyroute2/default.nix
@@ -17,6 +17,6 @@ buildPythonPackage rec {
    homepage = https://github.com/svinota/pyroute2;
    license = licenses.asl20;
    maintainers = [maintainers.mic92];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }
--- a/pkgs/development/python-modules/pyrtlsdr/default.nix
+++ b/pkgs/development/python-modules/pyrtlsdr/default.nix
@@ -41,7 +41,7 @@ buildPythonPackage rec {
    description = "Python wrapper for librtlsdr (a driver for Realtek RTL2832U based SDR's)";
    homepage = https://github.com/roger-/pyrtlsdr;
    license = licenses.gpl3;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
    maintainers = with maintainers; [ bjornfor ];
  };
 }
--- a/pkgs/development/python-modules/rpy2/default.nix
+++ b/pkgs/development/python-modules/rpy2/default.nix
@@ -98,7 +98,7 @@ buildPythonPackage rec {
      homepage = http://rpy.sourceforge.net/rpy2;
      description = "Python interface to R";
      license = lib.licenses.gpl2Plus;
-      platforms = lib.platforms.linux;
+      platforms = lib.platforms.unix;
      maintainers = with lib.maintainers; [ joelmo ];
    };
  }
--- a/pkgs/development/python-modules/scapy/default.nix
+++ b/pkgs/development/python-modules/scapy/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage rec {
    description = "Powerful interactive network packet manipulation program";
    homepage = https://scapy.net/;
    license = licenses.gpl2;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
    maintainers = with maintainers; [ primeos bjornfor ];
  };
 }
--- a/pkgs/development/python-modules/seqdiag/default.nix
+++ b/pkgs/development/python-modules/seqdiag/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
    description = "Generate sequence-diagram image from spec-text file (similar to Graphviz)";
    homepage = http://blockdiag.com/;
    license = licenses.asl20;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
    maintainers = with maintainers; [ bjornfor ];
  };
 }
--- a/pkgs/development/python-modules/toposort/default.nix
+++ b/pkgs/development/python-modules/toposort/default.nix
@@ -16,7 +16,7 @@ buildPythonPackage rec {
    description = "A topological sort algorithm";
    homepage = https://pypi.python.org/pypi/toposort/1.1;
    maintainers = with maintainers; [ tstrobel ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
    license = licenses.asl20;
  };

--- a/pkgs/development/python-modules/vega/default.nix
+++ b/pkgs/development/python-modules/vega/default.nix
@@ -24,6 +24,6 @@ buildPythonPackage rec {
    homepage = https://github.com/vega/ipyvega;
    license = licenses.bsd3;
    maintainers = with maintainers; [ teh ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }
--- a/pkgs/development/python-modules/zetup/default.nix
+++ b/pkgs/development/python-modules/zetup/default.nix
@@ -24,6 +24,6 @@ buildPythonPackage rec {
    '';
    homepage = https://github.com/zimmermanncode/zetup;
    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }