Merge branch 'master' into staging

Larger rebuilds from master.

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

@@ -1,15 +1,12 @@
-{ stdenv, buildPythonPackage, fetchFromGitHub
-, pyparsing }:
+{ stdenv, buildPythonPackage, fetchFromGitHub, pyparsing }:
 
 buildPythonPackage rec {
   pname = "asn1ate";
-  date = "20160810";
-  version = "unstable-${date}";
-  name = "${pname}-${version}";
+  version= "0.6";
 
   src = fetchFromGitHub {
-    sha256 = "04pddr1mh2v9qq8fg60czwvjny5qwh4nyxszr3qc4bipiiv2xk9w";
-    rev = "c56104e8912400135509b584d84423ee05a5af6b";
+    sha256 = "1p8hv4gsyqsdr0gafcq497n52pybiqmc22di8ai4nsj60fv0km45";
+    rev = "v${version}";
     owner = "kimgr";
     repo = pname;
   };

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

@@ -1,7 +1,6 @@
-{ stdenv, fetchPypi, buildPythonPackage }:
+{ stdenv, fetchPypi, buildPythonPackage, fetchpatch }:
 
 buildPythonPackage rec {
-  name = "${pname}-${version}";
   pname = "faulthandler";
   version = "3.0";
 
@@ -10,6 +9,17 @@ buildPythonPackage rec {
     sha256 = "acc10e10909f0f956ba1b42b6c450ea0bdaaa27b3942899f65931396cfcdd36a";
   };
 
+  patches = [
+    (fetchpatch {
+      url = https://github.com/vstinner/faulthandler/commit/67b661e.patch;
+      sha256 = "1nn8c9nq5qypja949hzz0n4yprsyr63wihf5g3gwrinm2nkjnnv7";
+    })
+    (fetchpatch {
+      url = https://github.com/vstinner/faulthandler/commit/07cbb7b.patch;
+      sha256 = "0fh6rjyjw7z1hsiy3sgdc8j9mncg1vlv3y0h4bplqyw18vq3srb3";
+    })
+  ];
+
   meta = {
     description = "Dump the Python traceback";
     license = stdenv.lib.licenses.bsd2;

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

@@ -11,14 +11,16 @@ buildPythonPackage rec {
     sha256 = "0z9i1z4hjzmp23igyhvg131gikbrr947506lwfb3fayf0agwfv8f";
   };
 
-  #set timeout to unlimited, remove deadline from tests, see https://github.com/pyca/pynacl/issues/370
+  # set timeout to unlimited, remove deadline from tests, see https://github.com/pyca/pynacl/issues/370
   patches = [ ./pynacl-no-timeout-and-deadline.patch ];
 
-  checkInputs = [ pytest coverage hypothesis ];
+  checkInputs = [ pytest hypothesis ];
   propagatedBuildInputs = [ libsodium cffi six ];
 
+  SODIUM_INSTALL = "system";
+
   checkPhase = ''
-    coverage run --source nacl --branch -m pytest
+    py.test
   '';
   
   meta = with stdenv.lib; {

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

@@ -4,7 +4,6 @@
 buildPythonPackage rec {
   pname = "pypandoc";
   version = "1.4";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
@@ -28,5 +27,7 @@ buildPythonPackage rec {
     homepage = https://github.com/bebraw/pypandoc;
     license = licenses.mit;
     maintainers = with maintainers; [ bennofs ];
+
+    broken = true; # incompatible with pandoc v2
   };
 }

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

@@ -1,22 +1,34 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, fetchpatch
 , rtl-sdr
-, pypandoc
-, pandoc
+, m2r
 }:
 
 buildPythonPackage rec {
   pname = "pyrtlsdr";
   version = "0.2.7";
-  name = "${pname}-${version}";
 
   src = fetchPypi {
     inherit pname version;
     sha256 = "7942fe2e7821d09206002ea7e820e694094b3f964885123eb6eee1167f39b8da";
   };
 
-  buildInputs = [ pypandoc pandoc ];
+  # Replace pypandoc dependency by m2r
+  # See https://github.com/roger-/pyrtlsdr/pull/78
+  patches = [
+    (fetchpatch {
+      url = "${meta.homepage}/commit/2b7df0b.patch";
+      sha256 = "04h5z80969jgdgrf98b9ps56sybms09xacvmj6rwcfrmanli8rgf";
+    })
+    (fetchpatch {
+      url = "${meta.homepage}/commit/97dc3d0.patch";
+      sha256 = "1v1j0n91jwpsiam2j34yj71z4h39cvk4gi4565zgjrzsq6xr93i0";
+    })
+  ];
+
+  nativeBuildInputs = [ m2r ];
 
   postPatch = ''
     sed "s|driver_files =.*|driver_files = ['${rtl-sdr}/lib/librtlsdr.so']|" -i rtlsdr/librtlsdr.py
@@ -31,5 +43,5 @@ buildPythonPackage rec {
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ bjornfor ];
- };
+  };
 }