Merge commit 'a6f6c0e' into master.upstream

This is a partial merge of staging where we have up to date binaries for
all packages.

pkgs/development/libraries/libgcrypt/default.nix

@@ -22,6 +22,13 @@ stdenv.mkDerivation rec {
     sed -i 's,\(-lcap\),-L${libcap}/lib \1,' $out/lib/libgcrypt.la
   '';
 
+  # TODO: figure out why this is even necessary and why the missing dylib only crashes
+  # random instead of every test
+  preCheck = stdenv.lib.optionalString stdenv.isDarwin ''
+    mkdir -p $out/lib
+    cp src/.libs/libgcrypt.20.dylib $out/lib
+  '';
+
   doCheck = true;
 
   meta = {