Merge branch 'master' into staging-next

Larger rebuild, probably mainly haskell. Hydra nixpkgs: ?compare=1503325
2019-02-02 17:05:15 +01:00
parent 14d21f60a8 5c986a45ce
commit bd9f835bf6
58 changed files with 1739 additions and 466 deletions
--- a/pkgs/development/interpreters/racket/default.nix
+++ b/pkgs/development/interpreters/racket/default.nix
@@ -101,5 +101,6 @@ stdenv.mkDerivation rec {
    license = licenses.lgpl3;
    maintainers = with maintainers; [ kkallio henrytill vrthra ];
    platforms = [ "x86_64-darwin" "x86_64-linux" ];
+    broken = stdenv.isDarwin; # No support yet for setting FFI lookup path
  };
 }
--- a/pkgs/development/interpreters/racket/minimal.nix
+++ b/pkgs/development/interpreters/racket/minimal.nix
@@ -15,5 +15,6 @@ racket.overrideAttrs (oldAttrs: rec {
      and the pkg library are still bundled.
    '';
    platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];
+    broken = false; # Minimal build does not require working FFI
  };
 })