Merge remote-tracking branch 'upstream/master' into hardened-stdenv

pkgs/shells/dash/default.nix

@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://gondor.apana.org.au/~herbert/dash/;
     description = "A POSIX-compliant implementation of /bin/sh that aims to be as small as possible";
-    hydraPlatforms = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.unix;
   };
 
   passthru = {

pkgs/shells/fish-foreign-env/default.nix

@@ -24,5 +24,6 @@ stdenv.mkDerivation rec {
     description = "A foreign environment interface for Fish shell";
     license = licenses.mit;
     maintainers = with maintainers; [ jgillich ];
+    platforms = with platforms; unix;
   };
 }

pkgs/shells/zsh-prezto/default.nix

@@ -41,5 +41,6 @@ in stdenv.mkDerivation rec {
     homepage = "https://github.com/sorin-ionescu/prezto";
     license = licenses.mit;
     maintainers = with maintainers; [ garbas ];
+    platforms = with platforms; unix;
   };
 }