Merge branch 'master' into staging

pkgs/development/python-modules/dlib/build-cores.patch

@@ -0,0 +1,27 @@
+diff --git a/setup.py b/setup.py
+index 0c8d8f16..565ef8ef 100644
+--- a/setup.py
++++ b/setup.py
+@@ -172,21 +172,7 @@ class CMakeBuild(build_ext):
+         subprocess.check_call(cmake_build, cwd=build_folder)
+ 
+ def num_available_cpu_cores(ram_per_build_process_in_gb):
+-    if 'TRAVIS' in os.environ and os.environ['TRAVIS']=='true':
+-        # When building on travis-ci, just use 2 cores since travis-ci limits
+-        # you to that regardless of what the hardware might suggest.
+-        return 2 
+-    try:
+-        mem_bytes = os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES')  
+-        mem_gib = mem_bytes/(1024.**3)
+-        num_cores = multiprocessing.cpu_count() 
+-        # make sure we have enough ram for each build process.
+-        mem_cores = int(floor(mem_gib/float(ram_per_build_process_in_gb)+0.5));
+-        # We are limited either by RAM or CPU cores.  So pick the limiting amount
+-        # and return that.
+-        return max(min(num_cores, mem_cores), 1)
+-    except ValueError:
+-        return 2 # just assume 2 if we can't get the os to tell us the right answer.
++    return os.getenv("NIX_BUILD_CORES", 1)
+ 
+ 
+ from setuptools.command.test import test as TestCommand

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

@@ -3,11 +3,11 @@
 
 buildPythonPackage rec {
   pname = "grpcio";
-  version = "1.9.1";
+  version = "1.12.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "e7c43b5619deff48cc177c1b0618c4beeb2797f910f160e3c2035d5baf790a5d";
+    sha256 = "0dsw58aimr8yyb6cgdvs7b7jc0rz2k9vhrsfglg2h7bmh83izzg1";
   };
 
   propagatedBuildInputs = [ six protobuf ]

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

@@ -1,6 +1,8 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, stdenv
+, libcxx
 }:
 
 buildPythonPackage rec {
@@ -11,7 +13,9 @@ buildPythonPackage rec {
     inherit pname version;
     sha256 = "ce3be5d520b4d2c3e5eeb4cd2ef62b9b9ab8ac6b6fedbaa0e39cdb6f50644278";
   };
-
+  
+  NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
+  
   # Does not include tests
   doCheck = false;
 
@@ -21,4 +25,4 @@ buildPythonPackage rec {
     license = lib.licenses.bsd3;
   };
 
-}
+}

pkgs/development/python-modules/pyqt/5.x.nix

@@ -1,5 +1,5 @@
-{ lib, fetchurl, pythonPackages, pkgconfig, makeWrapper, qmake, fetchpatch
-, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus_libs
+{ lib, fetchurl, fetchpatch, pythonPackages, pkgconfig, makeWrapper
+, qmake, lndir, qtbase, qtsvg, qtwebkit, qtwebengine, dbus_libs
 , withWebSockets ? false, qtwebsockets
 , withConnectivity ? false, qtconnectivity
 }:
@@ -73,6 +73,16 @@ in buildPythonPackage {
       url = https://git.archlinux.org/svntogit/packages.git/plain/repos/extra-x86_64/pyqt5-cura-crash.patch?id=6cfe64a3d1827e0ed9cc62f1683a53b582315f4f;
       sha256 = "02a0mw1z8p9hhqhl4bgjrmf1xq82xjmpivn5bg6r4yv6pidsh7ck";
     })
+    (fetchpatch {
+      name = "pyqt-qt5.11.patch";
+      url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/pyqt-qt5.11.patch?h=packages/pyqt5&id=d01240b801203d3865b2f61fa19090cc20e55a97";
+      sha256 = "0qa7w1agjg9da99lvnqwwxnm3pp7qd683h7zggq4c269y2km812h";
+    })
+    (fetchpatch {
+      name = "pyqt-support-new-qt.patch";
+      url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/pyqt-support-new-qt.patch?h=packages/pyqt5&id=d01240b801203d3865b2f61fa19090cc20e55a97";
+      sha256 = "1nkl96f4bki37zw6iwvd4vq8z8gg45q5m1cbkbaw72395i0m7p5j";
+    })
   ];
 
   postInstall = ''

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

@@ -1,21 +1,26 @@
-{ stdenv, fetchFromGitHub, ninja, meson, pkgconfig, nixUnstable, isPy3k }:
+{ stdenv, fetchFromGitHub, ninja, boost, meson, pkgconfig, nix, isPy3k }:
 
-assert isPy3k;
 
 stdenv.mkDerivation rec {
   name = "pythonix-${version}";
-  version = "0.1.0";
+  version = "0.1.4";
 
   src = fetchFromGitHub {
     owner = "Mic92";
     repo = "pythonix";
     rev = "v${version}";
-    sha256 = "1piblysypyr442a6najk4mdh87xc377i2fdbfw6fr569z60mnnnj";
+    sha256 = "1q1fagfwzvmcm1n3a0liay7m5krazmhw9l001m90rrz2x7vrsqwk";
   };
 
-  nativeBuildInputs = [ meson pkgconfig ninja ];
+  disabled = !isPy3k;
 
-  buildInputs = [ nixUnstable ];
+  nativeBuildInputs = [ meson ninja pkgconfig ];
+
+  buildInputs = [ nix boost ];
+
+  checkPhase = ''
+    ninja test
+  '';
 
   meta = with stdenv.lib; {
     description = ''
@@ -23,6 +28,5 @@ stdenv.mkDerivation rec {
     '';
     maintainers = [ maintainers.mic92 ];
     license = licenses.mit;
-    platforms = platforms.linux;
   };
 }

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

@@ -0,0 +1,23 @@
+{ lib, fetchurl, buildPythonPackage, intervaltree, pyflakes, requests, lxml }:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "xml2rfc";
+  version = "2.9.8";
+
+  src = fetchurl {
+    url = "mirror://pypi/x/${pname}/${name}.tar.gz";
+    sha256 = "1img6941wvwpk71q3vi9526bfjbh949k4lphrvdwlcf4igwy435m";
+  };
+
+  propagatedBuildInputs = [ intervaltree pyflakes requests lxml ];
+
+  meta = with lib; {
+    description = "Tool generating IETF RFCs and drafts from XML sources";
+    homepage = https://tools.ietf.org/tools/xml2rfc/trac/;
+    # Well, parts might be considered unfree, if being strict; see:
+    # http://metadata.ftp-master.debian.org/changelogs/non-free/x/xml2rfc/xml2rfc_2.9.6-1_copyright
+    license = licenses.bsd3;
+    maintainers = [ maintainers.vcunat ];
+  };
+}