Merge branch 'staging'

Comparison looks OK; I'll try some fixes on master directly.
http://hydra.nixos.org/eval/1372577?compare=1372497

pkgs/stdenv/cygwin/rebase-i686.sh

@@ -1,10 +1,10 @@
-postFixupHooks+=(_cygwinFixAutoImageBase)
+fixupOutputHooks+=(_cygwinFixAutoImageBase)
 
 _cygwinFixAutoImageBase() {
-    if [ "$dontRebase" == 1 ]; then
+    if [ "$dontRebase" == 1 ] || [ ! -d "$prefix" ]; then
         return
     fi
-    find $out -name "*.dll" | while read DLL; do
+    find "$prefix" -name "*.dll" -type f | while read DLL; do
         if [ -f /etc/rebasenix.nextbase ]; then
             NEXTBASE="$(</etc/rebasenix.nextbase)"
         fi

pkgs/stdenv/cygwin/rebase-x86_64.sh

@@ -1,10 +1,10 @@
-postFixupHooks+=(_cygwinFixAutoImageBase)
+fixupOutputHooks+=(_cygwinFixAutoImageBase)
 
 _cygwinFixAutoImageBase() {
-    if [ "$dontRebase" == 1 ]; then
+    if [ "$dontRebase" == 1 ] || [ ! -d "$prefix" ]; then
         return
     fi
-    find $out -name "*.dll" | while read DLL; do
+    find "$prefix" -name "*.dll" -type f | while read DLL; do
         if [ -f /etc/rebasenix.nextbase ]; then
             NEXTBASE="$(</etc/rebasenix.nextbase)"
         fi

pkgs/stdenv/darwin/default.nix

@@ -235,11 +235,11 @@ in rec {
       libcxxabi libcxx ncurses libffi zlib gmp pcre gnugrep
       coreutils findutils diffutils patchutils;
 
-    llvmPackages = let llvmOverride = llvmPackages.llvm.override { enableManpages = false; inherit libcxxabi; }; in
-      super.llvmPackages // {
-        llvm = llvmOverride;
-        clang-unwrapped = llvmPackages.clang-unwrapped.override { enableManpages = false; llvm = llvmOverride; };
-      };
+     llvmPackages = let llvmOverride = llvmPackages.llvm.override { inherit libcxxabi; };
+     in super.llvmPackages // {
+       llvm = llvmOverride;
+       clang-unwrapped = llvmPackages.clang-unwrapped.override { llvm = llvmOverride; };
+     };
 
     darwin = super.darwin // {
       inherit (darwin) dyld Libsystem libiconv locale;

pkgs/stdenv/native/default.nix

@@ -102,7 +102,7 @@ let
 
       fetchurlBoot = fetchurl;
 
-      inherit system shell cc overrides config;
+      inherit shell cc overrides config;
     };
 
 in