Merge master into staging-next

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

@@ -1,4 +1,5 @@
-{ lib
+{ stdenv
+, lib
 , fetchurl
 , buildPythonPackage
 , isPy3k
@@ -14,9 +15,13 @@ buildPythonPackage rec {
     sha256 = "0x22fs3pdmr42kvz6c654756wja305qv6cx1zbhwlagvxgr4xrji";
   };
 
-  checkPhase = ''
-    LANG="en_US.UTF-8" ${python.interpreter} ${if isPy3k then "test3/alltests.py" else "test/alltests.py"}
-  '';
+  # Only Darwin needs LANG, but we could set it in general.
+  # It's done here conditionally to prevent mass-rebuilds.
+  checkPhase = lib.optionalString (isPy3k && stdenv.isDarwin) ''LANG="en_US.UTF-8" '' + (if isPy3k then ''
+    ${python.interpreter} test3/alltests.py
+  '' else ''
+    ${python.interpreter} test/alltests.py
+  '');
 
   # Create symlinks lacking a ".py" suffix, many programs depend on these names
   postFixup = ''

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

@@ -8,12 +8,12 @@
 , testtools
 }:
 buildPythonPackage rec {
-  version = "0.11.0";
+  version = "0.12.0";
   pname = "effect";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1q75w4magkqd8ggabhhzzxmxakpdnn0vdg7ygj89zdc9yl7561q6";
+    sha256 = "0s8zsncq4l0ar2b4dijf8yzrk13x2swr1w2nb30s1p5jd6r24czl";
   };
   checkInputs = [
     pytest
@@ -24,10 +24,8 @@ buildPythonPackage rec {
     attrs
   ];
   checkPhase = ''
-    pytest .
+    pytest
   '';
-  # Tests fails on python3.7 https://github.com/python-effect/effect/issues/78
-  doCheck = !isPy37;
   meta = with lib; {
     description = "Pure effects for Python";
     homepage = https://github.com/python-effect/effect;

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

@@ -10,7 +10,7 @@ buildPythonPackage rec {
   pname = "mmpython";
 
   src = fetchurl {
-    url = http://sourceforge.net/projects/mmpython/files/latest/download;
+    url = https://sourceforge.net/projects/mmpython/files/latest/download;
     sha256 = "1b7qfad3shgakj37gcj1b9h78j1hxlz6wp9k7h76pb4sq4bfyihy";
     name = "${pname}-${version}.tar.gz";
   };

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

@@ -1,39 +0,0 @@
-{ stdenv
-, buildPythonPackage
-, fetchFromGitHub
-, appdirs
-, ruamel_yaml
-, requests
-, emoji
-, sleekxmpp
-, mock
-, psutil
-, python
-# , dbus-python
-}:
-
-buildPythonPackage rec {
-  version = "2.6.0";
-  pname = "ntfy";
-
-  src = fetchFromGitHub {
-    owner = "dschep";
-    repo = "ntfy";
-    rev = "v${version}";
-    sha256 = "0hnwrybbk0gw0c6kw2zpx0x1rh3jb9qyrprcphzkv0jlhzdfkrp1";
-  };
-
-  propagatedBuildInputs = [ requests ruamel_yaml appdirs mock sleekxmpp emoji psutil ];
-
-  checkPhase = ''
-    HOME=$(mktemp -d) ${python.interpreter} setup.py test
-  '';
-
-  meta = with stdenv.lib; {
-    description = "A utility for sending notifications, on demand and when commands finish";
-    homepage = http://ntfy.rtfd.org/;
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ kamilchm ];
-  };
-
-}

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

@@ -35,7 +35,7 @@ buildPythonPackage rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = http://www.gnu.org/software/libcdio/;
+    homepage = https://www.gnu.org/software/libcdio/;
     description = "Wrapper around libcdio (CD Input and Control library)";
     maintainers = with maintainers; [ rycee ];
     license = licenses.gpl3Plus;

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

@@ -9,11 +9,11 @@
 
 buildPythonPackage rec {
   pname = "ruamel.yaml";
-  version = "0.15.35";
+  version = "0.15.80";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "0xggyfaj6vprggahf7cq8kp9j79rb7hn8ndk3bxj2sxvwhhliiwd";
+    sha256 = "1rhlshff9csjwn64x11b9a7gbxccs1vd7rdiqwlhifjxax8k682g";
   };
 
   # Tests cannot load the module to test

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

@@ -1,4 +1,4 @@
-{ stdenv, buildPythonApplication, fetchPypi
+{ stdenv, buildPythonApplication, fetchPypi, fetchpatch
 , pytest, nose }:
 
 buildPythonApplication rec {
@@ -10,6 +10,13 @@ buildPythonApplication rec {
     sha256 = "41d2f1dba8fd1d8ead5e9b1220b590fab8b0d1ca01d43da08555b1fb08d4d8e8";
   };
 
+  patches = [
+    (fetchpatch {
+      url = https://github.com/cjw296/sybil/commit/6461d8156cfb68bd073ec613a5a516916e97e549.patch;
+      sha256 = "0aqny0i7l6g6d7vr025b90zz8wzszqdbmi05mp67dxw5xqjqvxj2";
+    })
+  ];
+
   checkInputs = [ pytest nose ];
 
   checkPhase = ''