Merge master into staging-next

2019-05-07 09:00:06 +02:00
parent 193b899af2 a3f8a25ab3
commit 0196d8f11c
220 changed files with 4309 additions and 2743 deletions
--- a/pkgs/development/python-modules/altair/default.nix
+++ b/pkgs/development/python-modules/altair/default.nix
@@ -5,11 +5,11 @@

 buildPythonPackage rec {
  pname = "altair";
-  version = "2.4.1";
+  version = "3.0.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1lqln4510qqqla6s8z4ca0271qrhq6yyznsijsdn3nssvxsynqpc";
+    sha256 = "0x4zm1xia6sln8dhwd803jlcii2a62fx3rlnj5vsa8g3anfc2v24";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/asana/default.nix
+++ b/pkgs/development/python-modules/asana/default.nix
@@ -1,16 +1,20 @@
-{ buildPythonPackage, pytest, requests, requests_oauthlib, six
+{ buildPythonPackage, pythonAtLeast, pytest, requests, requests_oauthlib, six
 , fetchFromGitHub, responses, stdenv
 }:

 buildPythonPackage rec {
  pname = "asana";
-  version = "0.7.1";
+  version = "0.8.2";
+
+  # upstream reportedly doesn't support 3.7 yet, blocked on
+  # https://bugs.python.org/issue34226
+  disabled = pythonAtLeast "3.7";

  src = fetchFromGitHub {
    owner = "asana";
    repo = "python-asana";
    rev = "v${version}";
-    sha256 = "0vmpy4j1n54gkkg0l8bhw0xf4yby5kqzxnsv07cjc2w38snj5vy1";
+    sha256 = "113zwnrpim1pdw8dzid2wpp5gzr2zk26jjl4wrwhgj0xk1cw94yi";
  };

  checkInputs = [ pytest responses ];
--- a/pkgs/development/python-modules/awkward/default.nix
+++ b/pkgs/development/python-modules/awkward/default.nix
@@ -11,11 +11,11 @@

 buildPythonPackage rec {
  pname = "awkward";
-  version = "0.8.15";
+  version = "0.9.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "0d1ae42babfe7fdde324eea685c71ecc638132b2015ffa22687d52d36dc1c78b";
+    sha256 = "140fdncibnlpdqr6hk8lhgkv7m2v8786rips5qp92r05agfzbhs0";
  };

  nativeBuildInputs = [ pytestrunner ];
--- a/pkgs/development/python-modules/basemap/default.nix
+++ b/pkgs/development/python-modules/basemap/default.nix
@@ -1,24 +1,29 @@
 { stdenv
 , buildPythonPackage
-, fetchurl
+, fetchFromGitHub
 , numpy
 , matplotlib
 , pillow
 , setuptools
+, pyproj
+, pyshp
+, six
 , pkgs
 }:

 buildPythonPackage rec {
  pname = "basemap";
-  version = "1.0.7";
+  version = "1.2.0";

-  src = fetchurl {
-    url = "mirror://sourceforge/project/matplotlib/matplotlib-toolkits/basemap-1.0.7/basemap-1.0.7.tar.gz";
-    sha256 = "0ca522zirj5sj10vg3fshlmgi615zy5gw2assapcj91vsvhc4zp0";
+  src = fetchFromGitHub {
+    owner = "matplotlib";
+    repo = "basemap";
+    rev = "v${version}rel";
+    sha256 = "1p3app8n65rlppkdbp1pb7fa4250kh7hi7lzdsryi2iv88np7193";
  };

-  propagatedBuildInputs = [ numpy matplotlib pillow ];
-  buildInputs = [ setuptools pkgs.geos pkgs.proj ];
+  propagatedBuildInputs = [ numpy matplotlib pillow pyproj pyshp six ];
+  buildInputs = [ setuptools pkgs.geos ];

  # Standard configurePhase from `buildPythonPackage` seems to break the setup.py script
  configurePhase = ''
--- a/pkgs/development/python-modules/django-cors-headers/default.nix
+++ b/pkgs/development/python-modules/django-cors-headers/default.nix
@@ -6,11 +6,11 @@

 buildPythonPackage rec {
  pname = "django-cors-headers";
-  version = "2.5.2";
+  version = "2.5.3";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "fb44f6b9f10de847919305c3f0d38fcfbadfe0dd5cf1c866f37df66ad0dda1bb";
+    sha256 = "0ljyfbpg34n7b8k31xc4q9c922p836km9wxh0algdxxfkam7z667";
  };

  propagatedBuildInputs = [ django ];
--- a/pkgs/development/python-modules/djangorestframework/default.nix
+++ b/pkgs/development/python-modules/djangorestframework/default.nix
@@ -1,11 +1,11 @@
 { stdenv, buildPythonPackage, fetchPypi, django }:
 buildPythonPackage rec {
-  version = "3.9.2";
+  version = "3.9.3";
  pname = "djangorestframework";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "05sam4z69mypxk8fv415zvs8mp09jqsagmslrbs1qvk51lk6d8pp";
+    sha256 = "1w1rc8cpw89sll5wsg1aj1w3klk91a1bsdz9y4zhg5xrc0qpd118";
  };

  # Test settings are missing
--- a/pkgs/development/python-modules/fastcache/default.nix
+++ b/pkgs/development/python-modules/fastcache/default.nix
@@ -2,11 +2,11 @@

 buildPythonPackage rec {
  pname = "fastcache";
-  version = "1.0.2";
+  version = "1.1.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1rl489zfbm2x67n7i6r7r4nhrhwk6yz3yc7x9y2rky8p95vhaw46";
+    sha256 = "0avqpswfmw5b08xx3ib6zchc5bis390fn1v74vg7nnrkf1pb3qbd";
  };

  checkInputs = [ pytest ];
--- a/pkgs/development/python-modules/fiona/default.nix
+++ b/pkgs/development/python-modules/fiona/default.nix
@@ -1,6 +1,6 @@
-{ stdenv, buildPythonPackage, fetchPypi, isPy3k
+{ stdenv, buildPythonPackage, fetchPypi, isPy3k, pythonOlder
 , attrs, click, cligj, click-plugins, six, munch, enum34
-, pytest, boto3
+, pytest, boto3, mock
 , gdal
 }:

@@ -35,7 +35,7 @@ buildPythonPackage rec {
  checkInputs = [
    pytest
    boto3
-  ];
+  ] ++ stdenv.lib.optional (pythonOlder "3.4") mock;

  checkPhase = ''
    rm -r fiona # prevent importing local fiona
--- a/pkgs/development/python-modules/fonttools/default.nix
+++ b/pkgs/development/python-modules/fonttools/default.nix
@@ -1,4 +1,5 @@
-{ buildPythonPackage
+{ lib
+, buildPythonPackage
 , fetchPypi
 , numpy
 , pytest
@@ -8,11 +9,11 @@

 buildPythonPackage rec {
  pname = "fonttools";
-  version = "3.39.0";
+  version = "3.41.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "0hgv83b4nhk2bl33xa41x0xvsl2b138p974ywkglzckp1123a7z2";
+    sha256 = "1f3q9sadwy6krsjicrgjsl1w2dfd97j4l645lnl1f5y3y1jkj4fh";
    extension = "zip";
  };

@@ -33,5 +34,6 @@ buildPythonPackage rec {
  meta = {
    homepage = https://github.com/fonttools/fonttools;
    description = "A library to manipulate font files from Python";
+    license = lib.licenses.mit;
  };
 }
--- a/pkgs/development/python-modules/funcy/default.nix
+++ b/pkgs/development/python-modules/funcy/default.nix
@@ -5,11 +5,11 @@

 buildPythonPackage rec {
  pname = "funcy";
-  version = "1.11";
+  version = "1.12";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "b5e399eb739afcb5a3ad38302b7817f6e7fee6f5fc79b213a5d82ea8bce0d9e6";
+    sha256 = "0vdbh0ykmjsvq4vb3hrx5327q9ccl1jhbjca59lsr0v0ghwb0grz";
  };

  # No tests
--- a/pkgs/development/python-modules/imageio-ffmpeg/default.nix
+++ b/pkgs/development/python-modules/imageio-ffmpeg/default.nix
@@ -6,10 +6,10 @@

 buildPythonPackage rec {
  pname = "imageio-ffmpeg";
-  version = "0.2.0";
+  version = "0.3.0";

  src = fetchPypi {
-    sha256 = "191k77hd69lfmd8p4w02c2ajjdsall6zijn01gyhqi11n48wpsib";
+    sha256 = "1hnn00xz9jyksnx1g0r1icv6ynbdnxq4cfnmb58ikg6ymi20al18";
    inherit pname version;
  };

--- a/pkgs/development/python-modules/imread/default.nix
+++ b/pkgs/development/python-modules/imread/default.nix
@@ -1,22 +1,28 @@
 { stdenv
 , buildPythonPackage
-, fetchurl
+, fetchPypi
 , nose
-, pkgs
+, pkgconfig
+, libjpeg
+, libpng
+, libtiff
+, libwebp
 , numpy
 }:

 buildPythonPackage rec {
  pname = "python-imread";
-  version = "0.6";
+  version = "0.7.0";

-  src = pkgs.fetchurl {
-    url = "https://github.com/luispedro/imread/archive/release-${version}.tar.gz";
-    sha256 = "0i14bc67200zhzxc41g5dfp2m0pr1zaa2gv59p2va1xw0ji2dc0f";
+  src = fetchPypi {
+    inherit version;
+    pname = "imread";
+    sha256 = "0yb0fmy6ilh5fvbk69wl2bzqgss2g0951668mx8z9yyj4jhr1z2y";
  };

-  nativeBuildInputs = [ pkgs.pkgconfig ];
-  buildInputs = [ nose pkgs.libjpeg pkgs.libpng pkgs.libtiff pkgs.libwebp ];
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ nose libjpeg libpng libtiff libwebp ];
  propagatedBuildInputs = [ numpy ];

  meta = with stdenv.lib; {
--- a/pkgs/development/python-modules/nuitka/default.nix
+++ b/pkgs/development/python-modules/nuitka/default.nix
@@ -13,13 +13,13 @@ let
  # Therefore we create a separate env for it.
  scons = pkgs.python27.withPackages(ps: [ pkgs.scons ]);
 in buildPythonPackage rec {
-  version = "0.6.2";
+  version = "0.6.3";
  pname = "Nuitka";

  # Latest version is not yet on PyPi
  src = fetchurl {
    url = "https://github.com/kayhayen/Nuitka/archive/${version}.tar.gz";
-    sha256 = "04qmk1diplpvcdmk0clbsy0mdg04pkmgjjysz31g82v477if9m54";
+    sha256 = "0nzk6r724dyai33fi7xmc6jn57pkcwqm553vlv0r11blvc92d7pp";
  };

  checkInputs = [ vmprof pyqt4 ];
--- a/pkgs/development/python-modules/pudb/default.nix
+++ b/pkgs/development/python-modules/pudb/default.nix
@@ -8,11 +8,11 @@

 buildPythonPackage rec {
  pname = "pudb";
-  version = "2018.1";
+  version = "2019.1";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "0vl7rbqyxa2vfa02dg7f5idf1j7awpfcj0dg46ks59xp8539g2wd";
+    sha256 = "19imrr17jnkd6fd2w1zzh63z0hcipg5b9v2x4svqm5c08p3cyc5c";
  };

  propagatedBuildInputs = [ pygments urwid ];
--- a/pkgs/development/python-modules/purepng/default.nix
+++ b/pkgs/development/python-modules/purepng/default.nix
@@ -1,21 +1,48 @@
 { stdenv
 , buildPythonPackage
-, fetchPypi
+, python
+, fetchFromGitHub
+, fetchpatch
+, cython ? null
+, numpy ? null
 }:

 buildPythonPackage rec {
  pname = "purepng";
  version = "0.2.0";

-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "1kcl7a6d7d59360fbz2jwfk6ha6pmqgn396962p4s62j893d2r0d";
+  src = fetchFromGitHub {
+    owner = "Scondo";
+    repo = "purepng";
+    rev = "449aa00e97a8d7b8a200eb9048056d4da600a345";
+    sha256 = "105p7sxn2f21icfnqpah69mnd74r31szj330swbpz53k7gr6nlsv";
  };

+  patches = [
+    (fetchpatch {
+      name = "fix-py37-stopiteration-in-generators.patch";
+      url = "https://github.com/Scondo/purepng/pull/28/commits/62d71dfc2be9ffdc4b3e5f642af0281a8ce8f946.patch";
+      sha256 = "1ag0pji3p012hmj8kadcd0vydv9702188c0isizsi964qcl4va6m";
+    })
+  ];
+  patchFlags = "-p1 -d code";
+
+  # cython is optional - if not supplied, the "pure python" implementation will be used
+  nativeBuildInputs = [ cython ];
+
+  # numpy is optional - if not supplied, tests simply have less coverage
+  checkInputs = [ numpy ];
+  # checkPhase begins by deleting source dir to force test execution against installed version
+  checkPhase = ''
+    rm -r code/png
+    ${python.interpreter} code/test_png.py
+  '';
+
  meta = with stdenv.lib; {
    description = "Pure Python library for PNG image encoding/decoding";
    homepage    = https://github.com/scondo/purepng;
    license     = licenses.mit;
+    maintainers = with maintainers; [ ris ];
  };

 }
--- a/pkgs/development/python-modules/pymediainfo/default.nix
+++ b/pkgs/development/python-modules/pymediainfo/default.nix
@@ -5,11 +5,11 @@

 buildPythonPackage rec {
  pname = "pymediainfo";
-  version = "3.1";
+  version = "4.0";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "00awypv2nbn44cc38q7w747gx1xhj33cygzzl56jn5jd3hdlldn7";
+    sha256 = "1yjs208c34p2xsc0r8vbi264ii5hixh546718n06b7v670glqjir";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/rfc3986/default.nix
+++ b/pkgs/development/python-modules/rfc3986/default.nix
@@ -3,11 +3,11 @@

 buildPythonPackage rec {
  pname = "rfc3986";
-  version = "1.2.0";
+  version = "1.3.1";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "1qf4dyxvjs7mxrxc0gr7gzyn4iflb2wgq01r5pzrxac8rnvy8fmw";
+    sha256 = "1jprl2zm3pw2rfbda9rhg3v5bm8q36b8c9i4k8znimlf1mv8bcic";
  };

  checkInputs = [ pytest ];
--- a/pkgs/development/python-modules/tensorflow/default.nix
+++ b/pkgs/development/python-modules/tensorflow/default.nix
@@ -8,9 +8,9 @@
 , xlaSupport ? cudaSupport
 # Default from ./configure script
 , cudaCapabilities ? [ "3.5" "5.2" ]
-, sse42Support ? false
-, avx2Support ? false
-, fmaSupport ? false
+, sse42Support ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") ["westmere" "sandybridge" "ivybridge" "haswell" "broadwell" "skylake" "skylake-avx512"]
+, avx2Support  ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [                                     "haswell" "broadwell" "skylake" "skylake-avx512"]
+, fmaSupport   ? builtins.elem (stdenv.hostPlatform.platform.gcc.arch or "default") [                                     "haswell" "broadwell" "skylake" "skylake-avx512"]
 }:

 assert cudaSupport -> nvidia_x11 != null