Merge pull request #105867 from NixOS/haskell-updates

Update Haskell package set to Stackage Nightly 2020-12-04 (plus other fixes)
This commit is contained in:
Peter Simons 2020-12-04 22:01:14 +01:00 committed by GitHub
commit 50863eb06c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 1199 additions and 926 deletions

View file

@ -38,11 +38,6 @@ self: super: {
ghcjs-base = null;
ghcjs-prim = null;
# Some packages add this (non-existent) dependency to express that they
# cannot compile in a given configuration. Win32 does this, for example, when
# compiled on Linux. We provide the name to avoid evaluation errors.
unbuildable = throw "package depends on meta package 'unbuildable'";
# enable using a local hoogle with extra packagages in the database
# nix-shell -p "haskellPackages.hoogleLocal { packages = with haskellPackages; [ mtl lens ]; }"
# $ hoogle server
@ -327,6 +322,7 @@ self: super: {
http-link-header = dontCheck super.http-link-header; # non deterministic failure https://hydra.nixos.org/build/75041105
ihaskell = dontCheck super.ihaskell;
influxdb = dontCheck super.influxdb;
integer-roots = dontCheck super.integer-roots; # requires an old version of smallcheck, will be fixed in > 1.0
itanium-abi = dontCheck super.itanium-abi;
katt = dontCheck super.katt;
language-nix = if (pkgs.stdenv.hostPlatform.isAarch64 || pkgs.stdenv.hostPlatform.isi686) then dontCheck super.language-nix else super.language-nix; # aarch64: https://ghc.haskell.org/trac/ghc/ticket/15275
@ -442,9 +438,6 @@ self: super: {
rematch = dontCheck super.rematch; # https://github.com/tcrayford/rematch/issues/5
rematch-text = dontCheck super.rematch-text; # https://github.com/tcrayford/rematch/issues/6
# Should not appear in nixpkgs yet (broken anyway)
yarn2nix = throw "yarn2nix is not yet packaged for nixpkgs. See https://github.com/Profpatsch/yarn2nix#yarn2nix";
# no haddock since this is an umbrella package.
cloud-haskell = dontHaddock super.cloud-haskell;

View file

@ -830,4 +830,7 @@ self: super: builtins.intersectAttrs super {
export HOME=$TMPDIR
'';
});
# tests depend on a specific version of solc
hevm = dontCheck (doJailbreak super.hevm);
}

File diff suppressed because it is too large Load diff

View file

@ -7,9 +7,6 @@
# files.
self: super: {
multi-ghc-travis = throw ("haskellPackages.multi-ghc-travis has been renamed"
+ " to haskell-ci, which is now on hackage");
dconf2nix = self.callPackage ../tools/haskell/dconf2nix/dconf2nix.nix { };
# https://github.com/channable/vaultenv/issues/1