Merge master into staging-next

pkgs/development/python-modules/paho-mqtt/default.nix

@@ -0,0 +1,29 @@
+{ lib, buildPythonPackage, fetchFromGitHub, isPy3k
+, pytestrunner, pytest, mock }:
+
+buildPythonPackage rec {
+  pname = "paho-mqtt";
+  version = "1.4.0";
+
+  # No tests in PyPI tarball
+  src = fetchFromGitHub {
+    owner = "eclipse";
+    repo = "paho.mqtt.python";
+    rev = "v${version}";
+    sha256 = "1xg9ppz2lqacd9prsrx93q2wfkjjyla03xlfw74aj1alz9ki5hrs";
+  };
+
+  postPatch = ''
+    substituteInPlace setup.py --replace "pylama" ""
+    substituteInPlace setup.cfg --replace "--pylama" ""
+  '';
+
+  checkInputs = [ pytestrunner pytest ] ++ lib.optional (!isPy3k) mock;
+
+  meta = with lib; {
+    homepage = https://eclipse.org/paho;
+    description = "MQTT version 3.1.1 client class";
+    license = licenses.epl10;
+    maintainers = with maintainers; [ mog dotlambda ];
+  };
+}

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

@@ -3,14 +3,14 @@
 }:
 
 buildPythonPackage rec {
-  pname = "sasmodels-unstable";
-  version = "2018-04-27";
+  pname = "sasmodels";
+  version = "0.98";
 
   src = fetchFromGitHub {
     owner = "SasView";
     repo = "sasmodels";
-    rev = "33969b656596e8b6cc8ce934cd1f8062f7b11cf2";
-    sha256 = "00rvhafg08qvx0k9mzn1ppdkc9i5yfn2gr3hidrf416srf8zgb85";
+    rev = "v${version}";
+    sha256 = "02y4lpjwaa73pr46ylk0pw0kbill4nfzqgnfv16v5m0z9smd76ir";
   };
 
   buildInputs = [ opencl-headers ];

pkgs/development/python-modules/voluptuous-serialize/default.nix

@@ -1,17 +1,14 @@
-{ stdenv, buildPythonPackage, isPy3k, fetchFromGitHub, voluptuous, pytest }:
+{ stdenv, buildPythonPackage, isPy3k, fetchPypi, voluptuous, pytest }:
 
 buildPythonPackage rec  {
   pname = "voluptuous-serialize";
-  version = "2018-03-10";
+  version = "2.0.0";
 
   disabled = !isPy3k;
 
-  # no tests in PyPI tarball
-  src = fetchFromGitHub {
-    owner = "balloob";
-    repo = pname;
-    rev = "567f0d96f928cf6c30c9f1b8bdee729e651aac82";
-    sha256 = "0b16f1bxlqyvi1hy8wmzp2k0rzqcycmdhs8zwsyx0swnvkgwnv50";
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "44be04d87aec34bd7d31ab539341fadc505205f2299031ed9be985112c21aa41";
   };
 
   propagatedBuildInputs = [
@@ -26,6 +23,9 @@ buildPythonPackage rec  {
     py.test
   '';
 
+  # no tests in PyPI tarball
+  doCheck = false;
+
   meta = with stdenv.lib; {
     homepage = https://github.com/balloob/voluptuous-serialize;
     license = licenses.asl20;