Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1506218
2019-02-22 17:51:01 +01:00
parent 821c0844d4 e2b9656205
commit 71f4ba29a3
163 changed files with 1856 additions and 870 deletions
--- a/pkgs/development/python-modules/altair/default.nix
+++ b/pkgs/development/python-modules/altair/default.nix
@@ -32,6 +32,6 @@ buildPythonPackage rec {
    homepage = https://github.com/altair-viz/altair;
    license = licenses.bsd3;
    maintainers = with maintainers; [ teh ];
-    platforms = platforms.linux;
+    platforms = platforms.unix;
  };
 }