Merge master into staging

2018-06-25 10:58:39 +02:00
parent 1dd0109c8c 7c9d95fef5
commit df587c7f2e
177 changed files with 1405 additions and 524 deletions
--- a/pkgs/development/python-modules/pyserial/default.nix
+++ b/pkgs/development/python-modules/pyserial/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchPypi, buildPythonPackage }:
+{ lib, fetchPypi, buildPythonPackage, hostPlatform }:

 buildPythonPackage rec {
  pname = "pyserial";
@@ -10,6 +10,7 @@ buildPythonPackage rec {
  };

  checkPhase = "python -m unittest discover -s test";
+  doInstallCheck = !hostPlatform.isDarwin; # broken on darwin

  meta = with lib; {
    homepage = "https://github.com/pyserial/pyserial";