b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #168049 from NixOS/haskell-updates

Browse source 
haskellPackages: update stackage and hackage
This commit is contained in:
Dennis Gosnell 2022-04-21 11:30:27 +09:00 committed by GitHub
parent 76b68621e8 ddbc061b4b
commit 1a763b8465
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 465 additions and 598 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/data/misc/hackage/pin.json
View file

@ -1,6 +1,6 @@
{
"commit": "6387c3141750050e170d6ac030c063536c39aede",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/6387c3141750050e170d6ac030c063536c39aede.tar.gz",
"sha256": "1w9vy5ky3aqqnkldxqdvma21qz3myhc961xmgh1iqn60q03j4d2j",
"msg": "Update from Hackage at 2022-04-06T22:24:53Z"
"commit": "e5167f06cba67fa268ebafb97f5ccbffe412cd2a",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e5167f06cba67fa268ebafb97f5ccbffe412cd2a.tar.gz",
"sha256": "1ihkrjk7a24wbzjz4wlx3mdh88bbq4665l1ld7gxs5jaimcmhn5j",
"msg": "Update from Hackage at 2022-04-09T11:23:17Z"
}

35
pkgs/development/compilers/ghcjs/8.10/common-overrides.nix
View file

@ -1,8 +1,37 @@
{ haskellLib }:
{ haskellLib, fetchpatch, buildPackages }:
let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak;
let inherit (haskellLib) addBuildTools appendConfigureFlag dontHaddock doJailbreak markUnbroken overrideCabal;
in self: super: {
ghcjs = doJailbreak (super.ghcjs.overrideScope (self: super: {
ghcjs = overrideCabal (drv: {
# Jailbreak and patch can be dropped after https://github.com/ghcjs/ghcjs/pull/833
jailbreak = true;
patches = drv.patches or [] ++ [
(fetchpatch {
name = "ghcjs-aeson-2.0.patch";
url = "https://github.com/ghcjs/ghcjs/commit/9ef1f92d740e8503d15d91699f57db147f0474cc.patch";
sha256 = "0cgxcy6b5870bv4kj54n3bzcqinh4gl4w4r78dg43h2mblhkzbnj";
})
];
}) (super.ghcjs.overrideScope (self: super: {
optparse-applicative = self.optparse-applicative_0_15_1_0;
webdriver = overrideCabal (drv: {
patches = drv.patches or [] ++ [
# Patch for aeson 2.0 which adds a lower bound on it, so we don't apply it globally
# Pending https://github.com/kallisti-dev/hs-webdriver/pull/183
(fetchpatch {
name = "webdriver-aeson-2.0.patch";
url = "https://github.com/georgefst/hs-webdriver/commit/90ded63218da17fc0bd9f9b208b0b3f60b135757.patch";
sha256 = "1xvkk51r2v020xlmci5n1fd1na8raa332lrj7r9f0ijsyfvnqlv0";
excludes = [ "webdriver.cabal" ];
})
];
# Fix line endings so patch applies
prePatch = drv.prePatch or "" + ''
find . -name '*.hs' | xargs "${buildPackages.dos2unix}/bin/dos2unix"
'';
jailbreak = true;
broken = false;
}) super.webdriver;
}));
}

3
pkgs/development/compilers/ghcjs/8.10/default.nix
View file

@ -2,6 +2,7 @@
, pkgsHostHost
, callPackage
, fetchgit
, fetchpatch
, ghcjsSrcJson ? null
, ghcjsSrc ? fetchgit (lib.importJSON ghcjsSrcJson)
, bootPkgs
@ -36,7 +37,7 @@ let
})
(callPackage ./common-overrides.nix {
inherit haskellLib;
inherit haskellLib fetchpatch buildPackages;
})
ghcjsDepOverrides
]);

11
pkgs/development/haskell-modules/configuration-common.nix
View file

@ -252,7 +252,7 @@ self: super: {
binary-protocol = dontCheck super.binary-protocol; # http://hydra.cryp.to/build/499749/log/raw
binary-search = dontCheck super.binary-search;
bits = dontCheck super.bits; # http://hydra.cryp.to/build/500239/log/raw
bloodhound = dontCheck super.bloodhound;
bloodhound = dontCheck super.bloodhound; # https://github.com/plow-technologies/quickcheck-arbitrary-template/issues/10
buildwrapper = dontCheck super.buildwrapper;
burst-detection = dontCheck super.burst-detection; # http://hydra.cryp.to/build/496948/log/raw
cabal-meta = dontCheck super.cabal-meta; # http://hydra.cryp.to/build/497892/log/raw
@ -2584,6 +2584,15 @@ self: super: {
# 2022-03-16: Upstream stopped updating bounds https://github.com/haskell-hvr/base-noprelude/pull/15
base-noprelude = doJailbreak super.base-noprelude;
# Manually upgrade cryptostore to work around
# https://github.com/ocheron/cryptostore/issues/7
cryptostore = assert super.cryptostore.version == "0.2.1.0"; overrideCabal {
version = "0.2.2.0";
sha256 = "0n70amg7y2qwfjhj4xaqjia46fbabba9l2g19ry191m7c4zp1skx";
revision = null;
editedCabalFile = null;
} super.cryptostore;
# 2022-03-16: Bounds need to be loosened https://github.com/obsidiansystems/dependent-sum-aeson-orphans/issues/10
dependent-sum-aeson-orphans = doJailbreak super.dependent-sum-aeson-orphans;

20
pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
View file

@ -89,20 +89,22 @@ self: super: {
mime-string = disableOptimization super.mime-string;
# Older compilers need the latest ghc-lib to build this package.
hls-hlint-plugin = addBuildDepend self.ghc-lib super.hls-hlint-plugin;
hls-hlint-plugin = addBuildDepend self.ghc-lib (overrideCabal (drv: {
# Workaround for https://github.com/haskell/haskell-language-server/issues/2728
postPatch = ''
sed -i 's/(GHC.RealSrcSpan x,/(GHC.RealSrcSpan x Nothing,/' src/Ide/Plugin/Hlint.hs
'';
})
super.hls-hlint-plugin);
haskell-language-server = appendConfigureFlags [
"-f-fourmolu"
"-f-stylishhaskell"
"-f-brittany"
"-f-hlint"
]
(super.haskell-language-server.override {
# Not buildable on 8.10
hls-fourmolu-plugin = null;
# https://github.com/haskell/haskell-language-server/issues/2728
hls-hlint-plugin = null;
});
super.haskell-language-server;
# has a restrictive lower bound on Cabal
fourmolu = doJailbreak super.fourmolu;
# ormolu 0.3 requires Cabal == 3.4
ormolu = super.ormolu_0_2_0_0;

21
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View file

@ -131,18 +131,23 @@ self: super: {
mime-string = disableOptimization super.mime-string;
# Older compilers need the latest ghc-lib to build this package.
hls-hlint-plugin = addBuildDepend self.ghc-lib (overrideCabal (drv: {
# Workaround for https://github.com/haskell/haskell-language-server/issues/2728
postPatch = ''
sed -i 's/(GHC.RealSrcSpan x,/(GHC.RealSrcSpan x Nothing,/' src/Ide/Plugin/Hlint.hs
'';
})
super.hls-hlint-plugin);
haskell-language-server = appendConfigureFlags [
"-f-fourmolu"
"-f-stylishhaskell"
"-f-brittany"
"-f-hlint"
]
(super.haskell-language-server.override {
# Not buildable on 8.8
hls-fourmolu-plugin = null;
# https://github.com/haskell/haskell-language-server/issues/2728
hls-hlint-plugin = null;
});
super.haskell-language-server;
# has a restrictive lower bound on Cabal
fourmolu = doJailbreak super.fourmolu;
# OneTuple needs hashable instead of ghc-prim for GHC < 9
OneTuple = super.OneTuple.override {

9
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View file

@ -357,6 +357,7 @@ broken-packages:
- binary-communicator
- binary-derive
- binary-ext
- binary-generic-combinators
- binary-indexed-tree
- binary-protocol
- binary-tree
@ -433,7 +434,6 @@ broken-packages:
- blockfrost-api
- blockhash
- Blogdown
- bloodhound
- bloomfilter-redis
- blubber-server
- bludigon
@ -1688,6 +1688,7 @@ broken-packages:
- ghcup
- ghc-usage
- gh-labeler
- gi-adwaita
- giak
- gi-cogl
- Gifcurry
@ -2546,6 +2547,7 @@ broken-packages:
- hylolib
- hyperdrive
- hyperfunctions
- hyper-haskell-server
- hyperion
- hyperloglogplus
- hyperscript
@ -2779,6 +2781,7 @@ broken-packages:
- kangaroo
- karabiner-config
- katip-datadog
- katip-elasticsearch
- katip-kafka
- katip-logzio
- katip-scalyr-scribe
@ -3331,6 +3334,7 @@ broken-packages:
- msgpack
- msgpack-binary
- msgpack-persist
- msgpack-types
- msh
- msi-kb-backlit
- MTGBuilder
@ -3596,6 +3600,7 @@ broken-packages:
- open-signals
- opensoundcontrol-ht
- openssh-protocol
- opentelemetry-extra
- opentelemetry-http-client
- opentheory-char
- opentok
@ -4025,6 +4030,7 @@ broken-packages:
- process-leksah
- process-listlike
- processmemory
- procex
- procrastinating-variable
- procstat
- prof2pretty
@ -4331,6 +4337,7 @@ broken-packages:
- robin
- robots-txt
- roc-cluster
- roc-id
- roku-api
- rollbar-client
- rollbar-hs

3
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View file

@ -68,8 +68,7 @@ core-packages:
# tracked in stackage.yaml. Adding conflicting overrides with stackage here will
# not work.
default-package-overrides:
# gi-gdkx11-4.x requires gtk-4.x, which is still under development and
# not yet available in Nixpkgs
# gi-gdkx11-4.x requires gtk-4.x, but stackage still restricts gi-gtk to 3.*
- gi-gdkx11 < 4
# reflex-dom-pandoc is only used by neuron which needs a version < 1.0.0.0
- reflex-dom-pandoc < 1.0.0.0

78
pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
View file

@ -1,4 +1,4 @@
# Stackage LTS 19.2
# Stackage LTS 19.3
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -296,7 +296,7 @@ default-package-overrides:
- cborg ==0.2.6.0
- cborg-json ==0.2.3.0
- cdar-mBound ==0.1.0.4
- c-enum ==0.1.1.2
- c-enum ==0.1.1.3
- cereal ==0.5.8.2
- cereal-conduit ==0.8.0
- cereal-text ==0.1.0.2
@ -329,9 +329,9 @@ default-package-overrides:
- circle-packing ==0.1.0.6
- circular ==0.4.0.2
- citeproc ==0.6.0.1
- clash-ghc ==1.6.2
- clash-lib ==1.6.2
- clash-prelude ==1.6.2
- clash-ghc ==1.6.3
- clash-lib ==1.6.3
- clash-prelude ==1.6.3
- classy-prelude ==1.5.0.2
- classy-prelude-conduit ==1.5.0
- classy-prelude-yesod ==1.5.0
@ -423,8 +423,8 @@ default-package-overrides:
- cookie ==0.4.5
- copr-api ==0.1.0
- core-data ==0.3.1.1
- core-program ==0.4.4.0
- core-telemetry ==0.1.9.1
- core-program ==0.4.5.1
- core-telemetry ==0.1.9.2
- core-text ==0.3.5.0
- countable ==1.0
- covariance ==0.1.0.6
@ -708,7 +708,7 @@ default-package-overrides:
- explainable-predicates ==0.1.2.1
- explicit-exception ==0.1.10
- exp-pairs ==0.2.1.0
- express ==1.0.8
- express ==1.0.10
- extended-reals ==0.2.4.0
- extensible-effects ==5.0.0.1
- extensible-exceptions ==0.1.1.4
@ -823,7 +823,7 @@ default-package-overrides:
- gdp ==0.0.3.0
- general-games ==1.1.1
- generic-aeson ==0.2.0.13
- generic-arbitrary ==0.2.0
- generic-arbitrary ==0.2.1
- generic-constraints ==1.1.1.1
- generic-data ==0.9.2.1
- generic-data-surgery ==0.3.0.0
@ -1091,7 +1091,7 @@ default-package-overrides:
- hpack-dhall ==0.5.4
- hpc-codecov ==0.3.0.0
- HPDF ==1.6.0
- hpp ==0.6.4
- hpp ==0.6.5
- hpqtypes ==1.9.3.1
- hprotoc ==2.4.17
- hreader ==1.1.0
@ -1116,7 +1116,7 @@ default-package-overrides:
- hslua-classes ==2.1.0
- hslua-core ==2.1.0
- hslua-marshalling ==2.1.0
- hslua-module-doclayout ==1.0.3
- hslua-module-doclayout ==1.0.4
- hslua-module-path ==1.0.2
- hslua-module-system ==1.0.2
- hslua-module-text ==1.0.2
@ -1354,7 +1354,7 @@ default-package-overrides:
- LambdaHack ==0.11.0.0
- lame ==0.2.0
- language-bash ==0.9.2
- language-c ==0.9.0.2
- language-c ==0.9.1
- language-c-quote ==0.13
- language-docker ==10.4.3
- language-dot ==0.1.1
@ -1462,7 +1462,7 @@ default-package-overrides:
- lz4-frame-conduit ==0.1.0.1
- lzma ==0.0.0.3
- lzma-clib ==5.2.2
- lzma-conduit ==1.2.2
- lzma-conduit ==1.2.3
- machines ==0.7.2
- magic ==1.1
- magico ==0.0.2.3
@ -1533,9 +1533,9 @@ default-package-overrides:
- MissingH ==1.5.0.1
- mixed-types-num ==0.5.9.1
- mmap ==0.5.9
- mmark ==0.0.7.5
- mmark ==0.0.7.6
- mmark-cli ==0.0.5.1
- mmark-ext ==0.2.1.4
- mmark-ext ==0.2.1.5
- mmorph ==1.1.5
- mnist-idx ==0.1.3.0
- mnist-idx-conduit ==0.4.0.0
@ -1543,7 +1543,7 @@ default-package-overrides:
- mock-time ==0.1.0
- mod ==0.1.2.2
- model ==0.5
- modern-uri ==0.3.4.3
- modern-uri ==0.3.4.4
- modular ==0.1.0.8
- monad-chronicle ==1.0.0.1
- monad-control ==1.0.3.1
@ -1797,7 +1797,7 @@ default-package-overrides:
- perf ==0.9.0
- perfect-hash-generator ==0.2.0.6
- persist ==0.1.1.5
- persistent ==2.13.3.3
- persistent ==2.13.3.4
- persistent-discover ==0.1.0.5
- persistent-documentation ==0.1.0.4
- persistent-mongoDB ==2.13.0.1
@ -1833,7 +1833,7 @@ default-package-overrides:
- pipes-ordered-zip ==1.2.1
- pipes-parse ==3.0.9
- pipes-random ==1.0.0.5
- pipes-safe ==2.3.3
- pipes-safe ==2.3.4
- pipes-wai ==3.2.0
- pkgtreediff ==0.5.0
- place-cursor-at ==1.0.1
@ -1930,13 +1930,13 @@ default-package-overrides:
- protocol-buffers-descriptor ==2.4.17
- protocol-radius ==0.0.1.1
- protocol-radius-test ==0.1.0.1
- proto-lens ==0.7.1.0
- proto-lens-arbitrary ==0.1.2.10
- proto-lens-optparse ==0.1.1.8
- proto-lens-protobuf-types ==0.7.1.0
- proto-lens-protoc ==0.7.1.0
- proto-lens-runtime ==0.7.0.1
- proto-lens-setup ==0.4.0.5
- proto-lens ==0.7.1.1
- proto-lens-arbitrary ==0.1.2.11
- proto-lens-optparse ==0.1.1.9
- proto-lens-protobuf-types ==0.7.1.1
- proto-lens-protoc ==0.7.1.1
- proto-lens-runtime ==0.7.0.2
- proto-lens-setup ==0.4.0.6
- proxied ==0.3.1
- psql-helpers ==0.1.0.0
- psqueues ==0.2.7.3
@ -2839,7 +2839,7 @@ default-package-overrides:
- yesod-form-bootstrap4 ==3.0.1
- yesod-gitrepo ==0.3.0
- yesod-gitrev ==0.2.2
- yesod-markdown ==0.12.6.12
- yesod-markdown ==0.12.6.13
- yesod-newsfeed ==1.7.0.0
- yesod-page-cursor ==2.0.0.10
- yesod-paginator ==1.1.2.1
@ -2847,30 +2847,4 @@ default-package-overrides:
- yesod-recaptcha2 ==1.0.2
- yesod-routes-flow ==3.0.0.2
- yesod-sitemap ==1.6.0
- yesod-static ==1.6.1.0
- yesod-test ==1.6.12
- yesod-websockets ==0.3.0.3
- yes-precure5-command ==5.5.3
- yi-rope ==0.11
- yjsvg ==0.2.0.1
- yjtools ==0.9.18
- yoga ==0.0.0.5
- youtube ==0.2.1.1
- zenacy-html ==2.0.4
- zenacy-unicode ==1.0.1
- zero ==0.1.5
- zeromq4-haskell ==0.8.0
- zeromq4-patterns ==0.3.1.0
- zim-parser ==0.2.1.0
- zio ==0.1.0.2
- zip ==1.7.2
- zip-archive ==0.4.2.1
- zipper-extra ==0.1.3.2
- zippers ==0.3.2
- zip-stream ==0.2.1.0
- zlib ==0.6.2.3
- zlib-bindings ==0.1.1.5
- zlib-lens ==0.1.2.1
- zot ==0.0.3
- zstd ==0.1.3.0
- ztail ==1.2.0.3

7
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
View file

@ -2446,7 +2446,6 @@ dont-distribute-packages:
- kansas-lava-shake
- karakuri
- karps
- katip-elasticsearch
- katip-raven
- katip-rollbar
- keenser
@ -2789,6 +2788,7 @@ dont-distribute-packages:
- moonshine
- morley
- morley-client
- morley-prelude
- morley-upgradeable
- morpheus-graphql
- morpheus-graphql-app
@ -2811,9 +2811,11 @@ dont-distribute-packages:
- mptcp-pm
- mptcpanalyzer
- msgpack-aeson
- msgpack-arbitrary
- msgpack-idl
- msgpack-rpc
- msgpack-rpc-conduit
- msgpack-testsuite
- mtgoxapi
- mu-avro
- mu-graphql
@ -2965,6 +2967,8 @@ dont-distribute-packages:
- openpgp-Crypto
- openpgp-crypto-api
- openssh-github-keys
- opentelemetry-lightstep
- opentelemetry-lightstep_0_8_0
- optima-for-hasql
- optimal-blocks
- optimusprime
@ -3650,7 +3654,6 @@ dont-distribute-packages:
- soundgen
- source-code-server
- spade
- spago
- sparkle
- sparrow
- sparsebit

14
pkgs/development/haskell-modules/configuration-nix.nix
View file

@ -619,8 +619,15 @@ self: super: builtins.intersectAttrs super {
'';
}) super.spago;
spagoOldAeson = spagoDocs.overrideScope (hfinal: hprev: {
# spago (and its dependency, bower-json) is not yet updated for aeson-2.0
aeson = hfinal.aeson_1_5_6_0;
# bower-json needs aeson_1_5_6_0 and is marked broken without it.
bower-json = doDistribute (markUnbroken hprev.bower-json);
});
# Tests require network access.
spagoWithoutChecks = dontCheck spagoDocs;
spagoWithoutChecks = dontCheck spagoOldAeson;
in
spagoWithoutChecks;
@ -869,7 +876,10 @@ self: super: builtins.intersectAttrs super {
cachix = generateOptparseApplicativeCompletion "cachix" (super.cachix.override { nix = pkgs.nixVersions.nix_2_7; });
hercules-ci-agent = super.hercules-ci-agent.override { nix = pkgs.nixVersions.nix_2_7; };
hercules-ci-cnix-expr = super.hercules-ci-cnix-expr.override { nix = pkgs.nixVersions.nix_2_7; };
hercules-ci-cnix-expr =
addTestToolDepend pkgs.git (
super.hercules-ci-cnix-expr.override { nix = pkgs.nixVersions.nix_2_7; }
);
hercules-ci-cnix-store = super.hercules-ci-cnix-store.override { nix = pkgs.nixVersions.nix_2_7; };
# Enable extra optimisations which increase build time, but also

756
pkgs/development/haskell-modules/hackage-packages.nix generated
View file

File diff suppressed because it is too large Load diff

5
pkgs/development/misc/haskell/hasura/graphql-engine.nix
View file

@ -96,4 +96,9 @@ mkDerivation {
description = "GraphQL API over Postgres";
license = lib.licenses.asl20;
maintainers = with lib.maintainers; [ lassulus ];
# Needs to be updated for aeson-2.0
# https://github.com/hasura/graphql-engine/issues/8369
hydraPlatforms = lib.platforms.none;
broken = true;
}

5
pkgs/development/misc/haskell/hasura/graphql-parser.nix
View file

@ -29,4 +29,9 @@ mkDerivation {
description = "A native Haskell GraphQL parser";
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ lassulus ];
# Needs to be updated for aeson-2.0
# https://github.com/hasura/graphql-engine/issues/8369
hydraPlatforms = lib.platforms.none;
broken = true;
}

9
pkgs/development/tools/haskell/hyper-haskell/server.nix
View file

@ -1,4 +1,4 @@
{ stdenv, ghcWithPackages, makeWrapper, packages }:
{ stdenv, ghcWithPackages, makeWrapper, packages, lib }:
let
hyperHaskellEnv = ghcWithPackages (self: [ self.hyper-haskell-server ] ++ packages self);
@ -19,4 +19,11 @@ in stdenv.mkDerivation {
# trivial derivation
preferLocalBuild = true;
allowSubstitutes = false;
meta = {
# Marked as broken because the underlying
# haskellPackages.hyper-haskell-server is marked as broken.
hydraPlatforms = lib.platforms.none;
broken = true;
};
}

6
pkgs/development/tools/jl/default.nix
View file

@ -34,4 +34,10 @@ mkDerivation rec {
description = "Functional sed for JSON";
maintainers = with lib.maintainers; [ fgaz ];
homepage = "https://github.com/chrisdone/jl";
# jl needs to be updated to work with aeson-2.0.
# As far as I can tell, there is unfortunately no where to report issues upstream
# for us to be able to track when upstream adds aeson-2.0 support.
hydraPlatforms = lib.platforms.none;
broken = true;
}

60
pkgs/top-level/haskell-packages.nix
View file

@ -79,9 +79,12 @@ in {
ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix {
bootPkgs =
# aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar
# Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them
if stdenv.isAarch64 || stdenv.hostPlatform.isMusl then
# 8.10.2 is needed as using 8.10.7 is broken due to RTS-incompatibilities
if stdenv.isAarch64 then
packages.ghc8102BinaryMinimal
# Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them
else if stdenv.hostPlatform.isMusl then
packages.ghc8102Binary
else
packages.ghc865Binary;
inherit (buildPackages.python3Packages) sphinx;
@ -245,29 +248,36 @@ in {
# The integer-simple attribute set contains package sets for all the GHC compilers
# using integer-simple instead of integer-gmp.
integer-simple = let
integerSimpleGhcNames = pkgs.lib.filter
(name: ! builtins.elem name integerSimpleExcludes)
(pkgs.lib.attrNames packages);
in pkgs.lib.genAttrs integerSimpleGhcNames (name: packages.${name}.override {
ghc = bh.compiler.integer-simple.${name};
buildHaskellPackages = bh.packages.integer-simple.${name};
overrides = _self : _super : {
integer-simple = null;
integer-gmp = null;
};
});
integer-simple =
let
integerSimpleGhcNames = pkgs.lib.filter
(name: ! builtins.elem name integerSimpleExcludes)
(pkgs.lib.attrNames packages);
in
pkgs.lib.genAttrs integerSimpleGhcNames
(name:
packages.${name}.override (oldAttrs: {
ghc = bh.compiler.integer-simple.${name};
buildHaskellPackages = bh.packages.integer-simple.${name};
overrides =
pkgs.lib.composeExtensions
(oldAttrs.overrides or (_: _: {}))
(_: _: { integer-simple = null; });
})
);
native-bignum = let
nativeBignumGhcNames = pkgs.lib.filter
(name: builtins.elem name nativeBignumIncludes)
(pkgs.lib.attrNames compiler);
in pkgs.lib.genAttrs nativeBignumGhcNames (name: packages.${name}.override {
ghc = bh.compiler.native-bignum.${name};
buildHaskellPackages = bh.packages.native-bignum.${name};
overrides = _self : _super : {
integer-gmp = null;
};
});
native-bignum =
let
nativeBignumGhcNames = pkgs.lib.filter
(name: builtins.elem name nativeBignumIncludes)
(pkgs.lib.attrNames compiler);
in
pkgs.lib.genAttrs nativeBignumGhcNames
(name:
packages.${name}.override {
ghc = bh.compiler.native-bignum.${name};
buildHaskellPackages = bh.packages.native-bignum.${name};
}
);
};
}

13
pkgs/top-level/release-haskell.nix
View file

@ -129,7 +129,18 @@ let
jobs = recursiveUpdateMany [
(mapTestOn {
haskellPackages = packagePlatforms pkgs.haskellPackages;
haskell.compiler = packagePlatforms pkgs.haskell.compiler;
haskell.compiler = packagePlatforms pkgs.haskell.compiler // (lib.genAttrs [
"ghcjs"
"ghcjs810"
] (ghcjsName: {
# We can't build ghcjs itself, since it exceeds 3GB (Hydra's output limit) due
# to the size of its bundled libs. We can however save users a bit of compile
# time by building the bootstrap ghcjs on Hydra. For this reason, we overwrite
# the ghcjs attributes in haskell.compiler with a reference to the bootstrap
# ghcjs attribute in their bootstrap package set (exposed via passthru) which
# would otherwise be ignored by Hydra.
bootGhcjs = (packagePlatforms pkgs.haskell.compiler.${ghcjsName}.passthru).bootGhcjs;
}));
tests.haskell = packagePlatforms pkgs.tests.haskell;