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

Merge pull request #184194 from NixOS/haskell-updates

Browse source 
haskellPackages: update hackage and stackage; GHC 9.2.4
This commit is contained in:
sternenseemann 2022-08-04 16:37:18 +02:00 committed by GitHub
parent cf63df0364 4e7c3b9828
commit 214c9d5cef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 518 additions and 616 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/options.nix
View file

@ -121,7 +121,7 @@ rec {
Example:
mkPackageOption pkgs "GHC" {
default = [ "ghc" ];
example = "pkgs.haskell.package.ghc923.ghc.withPackages (hkgs: [ hkgs.primes ])";
example = "pkgs.haskell.packages.ghc924.ghc.withPackages (hkgs: [ hkgs.primes ])";
}
=> { _type = "option"; default = «derivation /nix/store/jxx55cxsjrf8kyh3fp2ya17q99w7541r-ghc-8.10.7.drv»; defaultText = { ... }; description = "The GHC package to use."; example = { ... }; type = { ... }; }
*/

4
maintainers/scripts/haskell/hydra-report.hs
View file

@ -451,8 +451,8 @@ printBuildSummary
showBuild (name, entry) = printJob id name (summaryBuilds entry, Text.pack (if summaryReverseDeps entry > 0 then " :arrow_heading_up: " <> show (summaryUnbrokenReverseDeps entry) <>" | "<> show (summaryReverseDeps entry) else ""))
showMaintainedBuild (name, (table, maintainers)) = printJob id name (table, Text.intercalate " " (fmap ("@" <>) (toList maintainers)))
tldr = case (errors, warnings) of
([],[]) -> [":green_circle: **Ready to merge** (if there are no [Evaluation Errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"]
([],_) -> [":yellow_circle: **Potential issues** (and possibly [Evaluation Errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"]
([],[]) -> [":green_circle: **Ready to merge** (if there are no [evaluation errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"]
([],_) -> [":yellow_circle: **Potential issues** (and possibly [evaluation errors](https://hydra.nixos.org/jobset/nixpkgs/haskell-updates))"]
_ -> [":red_circle: **Branch not mergeable**"]
warnings =
if' (Unfinished > maybe Success worstState maintainedJob) "`maintained` jobset failed." <>

4
nixos/doc/manual/development/option-declarations.section.md
View file

@ -127,14 +127,14 @@ lib.mkOption {
```nix
lib.mkPackageOption pkgs "GHC" {
default = [ "ghc" ];
example = "pkgs.haskell.package.ghc923.ghc.withPackages (hkgs: [ hkgs.primes ])";
example = "pkgs.haskell.packages.ghc924.ghc.withPackages (hkgs: [ hkgs.primes ])";
}
# is like
lib.mkOption {
type = lib.types.package;
default = pkgs.ghc;
defaultText = lib.literalExpression "pkgs.ghc";
example = lib.literalExpression "pkgs.haskell.package.ghc923.ghc.withPackages (hkgs: [ hkgs.primes ])";
example = lib.literalExpression "pkgs.haskell.packages.ghc924.ghc.withPackages (hkgs: [ hkgs.primes ])";
description = "The GHC package to use.";
}
```

4
nixos/doc/manual/from_md/development/option-declarations.section.xml
View file

@ -193,14 +193,14 @@ lib.mkOption {
<programlisting language="bash">
lib.mkPackageOption pkgs &quot;GHC&quot; {
default = [ &quot;ghc&quot; ];
example = &quot;pkgs.haskell.package.ghc923.ghc.withPackages (hkgs: [ hkgs.primes ])&quot;;
example = &quot;pkgs.haskell.packages.ghc924.ghc.withPackages (hkgs: [ hkgs.primes ])&quot;;
}
# is like
lib.mkOption {
type = lib.types.package;
default = pkgs.ghc;
defaultText = lib.literalExpression &quot;pkgs.ghc&quot;;
example = lib.literalExpression &quot;pkgs.haskell.package.ghc923.ghc.withPackages (hkgs: [ hkgs.primes ])&quot;;
example = lib.literalExpression &quot;pkgs.haskell.packages.ghc924.ghc.withPackages (hkgs: [ hkgs.primes ])&quot;;
description = &quot;The GHC package to use.&quot;;
}
</programlisting>

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

@ -1,6 +1,6 @@
{
"commit": "84a258f1f060f5f31f44b2d966b6e96305932eb2",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/84a258f1f060f5f31f44b2d966b6e96305932eb2.tar.gz",
"sha256": "0nyiyxxqa5h46p50jmvrx6sphxy0j8ib2vy3jvfijdpc4d6d5gx6",
"msg": "Update from Hackage at 2022-07-27T11:03:11Z"
"commit": "219207531a7a2e12e857b3ec55a7573f0a0f34d2",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/219207531a7a2e12e857b3ec55a7573f0a0f34d2.tar.gz",
"sha256": "146y45g6f1vvc3f8p1dq56y1fk1ls7v814iwa736k08ah6jfrq4f",
"msg": "Update from Hackage at 2022-07-31T09:12:37Z"
}

12
pkgs/development/compilers/ghc/9.2.3.nix → pkgs/development/compilers/ghc/9.2.4.nix
View file

@ -6,8 +6,6 @@
, xattr, autoSignDarwinBinariesHook
, bash
, autoreconfHook # GHC 9.2.3 tarballs don't have autoconf run on them
, libiconv ? null, ncurses
, glibcLocales ? null
@ -176,12 +174,12 @@ assert buildTargetLlvmPackages.llvm == llvmPackages.llvm;
assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang;
stdenv.mkDerivation (rec {
version = "9.2.3";
version = "9.2.4";
pname = "${targetPrefix}ghc${variantSuffix}";
src = fetchurl {
url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
sha256 = "50ecdc2bef013e518f9a62a15245d7db0e4409d737c43b1cea7306fd82e1669e";
sha256 = "15213888064a0ec4e7723d075f31b87a678ce0851773d58b44ef7aa3de996458";
};
enableParallelBuilding = true;
@ -231,12 +229,7 @@ stdenv.mkDerivation (rec {
# LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm
export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang"
'' + ''
echo -n "${buildMK}" > mk/build.mk
# GHC 9.2.3 tarball is not properly prepared
./boot
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") ''
export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"
'' + lib.optionalString (!stdenv.isDarwin) ''
@ -301,7 +294,6 @@ stdenv.mkDerivation (rec {
dontAddExtraLibs = true;
nativeBuildInputs = [
autoreconfHook # GHC 9.2.3 tarball hasn't autoconf run on it
perl autoconf automake m4 python3
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [

6
pkgs/development/compilers/ghc/9.4.1.nix
View file

@ -197,6 +197,12 @@ stdenv.mkDerivation (rec {
extraPrefix = "utils/haddock/";
stripLen = 1;
})
# fix race condition in make build system
(fetchpatch {
name = "ghc-hs-boot-copying-fix.patch";
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/4f17eff0cbd125eca55b68f4927befdd45008eb6.diff";
sha256 = "0anq3w9z9mhxb0wx6rvxac3n7rl3apcma9zk3r9zz9hj9v7vkqzx";
})
];
postPatch = "patchShebangs .";

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

@ -2145,16 +2145,16 @@ self: super: {
# 2022-03-21: Newest stylish-haskell needs ghc-lib-parser-9_2
stylish-haskell = (super.stylish-haskell.override {
ghc-lib-parser = super.ghc-lib-parser_9_2_3_20220709;
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_1_0;
ghc-lib-parser = super.ghc-lib-parser_9_2_4_20220729;
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_1_1;
});
ghc-lib-parser-ex_9_2_1_0 = super.ghc-lib-parser-ex_9_2_1_0.override {
ghc-lib-parser = super.ghc-lib-parser_9_2_3_20220709;
ghc-lib-parser-ex_9_2_1_1 = super.ghc-lib-parser-ex_9_2_1_1.override {
ghc-lib-parser = super.ghc-lib-parser_9_2_4_20220729;
};
ghc-lib-parser-ex_9_2_0_4 = super.ghc-lib-parser-ex_9_2_0_4.override {
ghc-lib-parser = super.ghc-lib-parser_9_2_3_20220709;
ghc-lib-parser = super.ghc-lib-parser_9_2_4_20220729;
};
hlint_3_4_1 = doDistribute (super.hlint_3_4_1.override {
@ -2407,9 +2407,12 @@ self: super: {
# 2022-03-16: strict upper bounds https://github.com/monadfix/shower/issues/18
shower = doJailbreak (dontCheck super.shower);
# Doesn't compile with HTF 0.15
# https://github.com/andrewufrank/uniform-error/issues/1
# Test suite isn't supposed to succeed yet, apparently…
# https://github.com/andrewufrank/uniform-error/blob/f40629ad119e90f8dae85e65e93d7eb149bddd53/test/Uniform/Error_test.hs#L124
# https://github.com/andrewufrank/uniform-error/issues/2
uniform-error = dontCheck super.uniform-error;
# https://github.com/andrewufrank/uniform-fileio/issues/2
uniform-fileio = dontCheck super.uniform-fileio;
# The shipped Setup.hs file is broken.
csv = overrideCabal (drv: { preCompileBuildDriver = "rm Setup.hs"; }) super.csv;
@ -2503,13 +2506,6 @@ self: super: {
servant-cassava = assert super.servant-cassava.version == "0.10.1";
doJailbreak super.servant-cassava;
# Fix tests failure for ghc 9 (https://github.com/clinty/debian-haskell/pull/3)
debian = appendPatch (fetchpatch {
name = "debian-haskell.3.patch";
url = "https://github.com/clinty/debian-haskell/pull/3/commits/47441c8e4a7a00a3c8825eec98bf7a823594f9be.patch";
sha256 = "0wxpqazjnal9naibapg63nm7x6qz0lklcfw2m5mzjrh2q9x2cvnd";
}) super.debian;
# Test data missing from sdist
# https://github.com/ngless-toolkit/ngless/issues/152
NGLess = dontCheck super.NGLess;

10
pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
View file

@ -98,9 +98,9 @@ self: super: {
self.data-default
] ++ drv.libraryHaskellDepends or [];
}) super.ghc-exactprint;
ghc-lib = self.ghc-lib_9_2_3_20220709;
ghc-lib-parser = self.ghc-lib-parser_9_2_3_20220709;
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_1_0;
ghc-lib = doDistribute self.ghc-lib_9_2_4_20220729;
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_2_4_20220729;
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_2_1_1;
hackage-security = doJailbreak super.hackage-security;
hashable = super.hashable_1_4_0_2;
hashable-time = doJailbreak super.hashable-time;
@ -190,7 +190,9 @@ self: super: {
implicit-hie-cradle = doJailbreak super.implicit-hie-cradle;
# 1.3 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed
hashtables = assert super.hashtables.version == "1.2.4.2"; doJailbreak super.hashtables;
hiedb = doJailbreak super.hiedb;
# 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46
hiedb = doJailbreak (dontCheck super.hiedb);
# 2022-02-05: The following plugins don‘t work yet on ghc9.2.
# Compare: https://haskell-language-server.readthedocs.io/en/latest/supported-versions.html

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

@ -543,7 +543,6 @@ broken-packages:
- cabalgraph
- cabal-graphdeps
- cabal-helper
- cabal-hoogle
- Cabal-ide-backend
- cabal-info
- cabal-install-bundle
@ -1042,6 +1041,7 @@ broken-packages:
- dbmigrations-mysql
- dbmigrations-postgresql
- dbmigrations-sqlite
- dbmonitor
- d-bus
- DBus
- dbus-core
@ -1742,6 +1742,7 @@ broken-packages:
- ginger
- gingersnap
- ginsu
- gi-pangocairo
- giphy-api
- gi-rsvg
- gist
@ -2987,7 +2988,6 @@ broken-packages:
- less-arbitrary
- Level0
- level-monad
- levenshtein
- levmar
- lfst
- lhc
@ -3007,6 +3007,7 @@ broken-packages:
- libpafe
- libpq
- librandomorg
- librarian
- libsecp256k1
- libsystemd-daemon
- libsystemd-journal
@ -4720,6 +4721,7 @@ broken-packages:
- skemmtun
- skulk
- skylighting-extensions
- skylighting-format-ansi
- skylighting-lucid
- skype4hs
- slack

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

@ -1,4 +1,4 @@
# Stackage LTS 19.16
# Stackage LTS 19.17
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -279,7 +279,7 @@ default-package-overrides:
- cached-json-file ==0.1.1
- cacophony ==0.10.1
- calendar-recycling ==0.0.0.1
- call-alloy ==0.3.0.2
- call-alloy ==0.3.0.3
- call-stack ==0.4.0
- can-i-haz ==0.3.1.0
- capability ==0.5.0.1
@ -536,7 +536,7 @@ default-package-overrides:
- DBFunctor ==0.1.2.1
- dbus ==1.2.22
- dbus-hslogger ==0.1.0.1
- debian ==4.0.2
- debian ==4.0.4
- debian-build ==0.10.2.1
- debug-trace-var ==0.2.0
- dec ==0.0.4
@ -673,7 +673,7 @@ default-package-overrides:
- eq ==4.3
- equal-files ==0.0.5.3
- equational-reasoning ==0.7.0.1
- equivalence ==0.4.0.1
- equivalence ==0.4.1
- erf ==2.0.0.0
- errata ==0.4.0.0
- error ==0.3.0.0
@ -708,7 +708,7 @@ default-package-overrides:
- exomizer ==1.0.0
- experimenter ==0.1.0.12
- expiring-cache-map ==0.0.6.1
- explainable-predicates ==0.1.2.1
- explainable-predicates ==0.1.2.2
- explicit-exception ==0.1.10
- exp-pairs ==0.2.1.0
- express ==1.0.10
@ -830,7 +830,7 @@ default-package-overrides:
- generic-constraints ==1.1.1.1
- generic-data ==0.9.2.1
- generic-data-surgery ==0.3.0.0
- generic-deriving ==1.14.1
- generic-deriving ==1.14.2
- generic-functor ==0.2.0.0
- generic-lens ==2.2.1.0
- generic-lens-core ==2.2.1.0
@ -979,7 +979,7 @@ default-package-overrides:
- HandsomeSoup ==0.4.2
- handwriting ==0.1.0.3
- happstack-server ==7.7.2
- happstack-server-tls ==7.2.1.2
- happstack-server-tls ==7.2.1.3
- happy ==1.20.0
- happy-meta ==0.2.0.11
- HasBigDecimal ==0.1.1
@ -1005,13 +1005,13 @@ default-package-overrides:
- haskintex ==0.8.0.0
- haskoin-core ==0.21.2
- hasktags ==0.72.0
- hasql ==1.5.0.5
- hasql ==1.5.1
- hasql-migration ==0.3.0
- hasql-notifications ==0.2.0.1
- hasql-optparse-applicative ==0.3.0.9
- hasql-pool ==0.5.2.2
- hasql-queue ==1.2.0.2
- hasql-th ==0.4.0.16
- hasql-th ==0.4.0.17
- hasql-transaction ==1.0.1.1
- has-transformers ==0.1.0.4
- hasty-hamiltonian ==1.3.4
@ -1176,7 +1176,7 @@ default-package-overrides:
- HTTP ==4000.3.16
- http-api-data ==0.4.3
- http-api-data-qq ==0.1.0.0
- http-client ==0.7.11
- http-client ==0.7.12
- http-client-openssl ==0.3.3
- http-client-overrides ==0.1.1.0
- http-client-tls ==0.3.6.1
@ -1269,7 +1269,7 @@ default-package-overrides:
- infer-license ==0.2.0
- inflections ==0.4.0.6
- influxdb ==1.9.2.2
- ini ==0.4.1
- ini ==0.4.2
- inj ==1.0
- inline-c ==0.9.1.6
- inline-c-cpp ==0.5.0.0
@ -1688,7 +1688,7 @@ default-package-overrides:
- numeric-prelude ==0.4.4
- numeric-quest ==0.2.0.2
- numhask ==0.10.1.0
- numhask-array ==0.10.0
- numhask-array ==0.10.1
- numhask-space ==0.10.0.0
- NumInstances ==1.4
- numtype-dk ==0.5.0.3
@ -1707,7 +1707,7 @@ default-package-overrides:
- OneTuple ==0.3.1
- Only ==0.1
- oo-prototypes ==0.1.0.0
- opaleye ==0.9.2.0
- opaleye ==0.9.3.2
- OpenAL ==1.7.0.5
- openapi3 ==3.2.2
- open-browser ==0.2.1.0
@ -1754,7 +1754,7 @@ default-package-overrides:
- pandoc-plot ==1.4.1
- pandoc-throw ==0.1.0.0
- pandoc-types ==1.22.2
- pantry ==0.5.5
- pantry ==0.5.6
- parallel ==3.2.2.0
- parallel-io ==0.3.5
- parameterized ==0.5.0.0
@ -1957,7 +1957,7 @@ default-package-overrides:
- pvar ==1.0.0.0
- PyF ==0.10.2.0
- qchas ==1.1.0.1
- qm-interpolated-string ==0.3.0.0
- qm-interpolated-string ==0.3.1.0
- qrcode-core ==0.9.5
- qrcode-juicypixels ==0.8.3
- quadratic-irrational ==0.1.1
@ -2047,7 +2047,7 @@ default-package-overrides:
- regex-pcre-builtin ==0.95.2.3.8.44
- regex-posix ==0.96.0.1
- regex-posix-clib ==2.7
- regex-tdfa ==1.3.1.4
- regex-tdfa ==1.3.2
- regex-with-pcre ==1.1.0.2
- reinterpret-cast ==0.1.0
- rel8 ==1.3.1.0
@ -2197,7 +2197,7 @@ default-package-overrides:
- servant-websockets ==2.0.0
- servant-xml ==1.0.1.4
- serversession ==1.0.3
- serversession-frontend-wai ==1.0
- serversession-frontend-wai ==1.0.1
- servius ==1.2.3.0
- ses-html ==0.4.0.0
- set-cover ==0.1.1
@ -2440,7 +2440,7 @@ default-package-overrides:
- tasty-tap ==0.1.0
- tasty-test-reporter ==0.1.1.4
- tasty-th ==0.1.7
- tasty-wai ==0.1.1.1
- tasty-wai ==0.1.2.0
- TCache ==0.12.1
- tce-conf ==1.3
- tcp-streams ==1.0.1.1
@ -2486,9 +2486,9 @@ default-package-overrides:
- text-zipper ==0.11
- tfp ==1.0.2
- tf-random ==0.5
- th-abstraction ==0.4.3.0
- th-abstraction ==0.4.4.0
- th-bang-compat ==0.0.1.0
- th-compat ==0.1.3
- th-compat ==0.1.4
- th-constraint-compat ==0.0.1.0
- th-desugar ==1.12
- th-env ==0.1.1
@ -2496,7 +2496,7 @@ default-package-overrides:
- these-lens ==1.0.1.2
- these-optics ==1.0.1.2
- these-skinny ==0.7.5
- th-expand-syns ==0.4.9.0
- th-expand-syns ==0.4.10.0
- th-extras ==0.0.0.6
- th-lego ==0.3.0.1
- th-lift ==0.8.2
@ -2842,7 +2842,7 @@ with-compiler: ghc-9.0.2
- yesod-auth-hashdb ==1.7.1.7
- yesod-auth-oauth2 ==0.7.0.1
- yesod-bin ==1.6.2.1
- yesod-core ==1.6.23.1
- yesod-core ==1.6.24.0
- yesod-eventsource ==1.6.0.1
- yesod-form ==1.7.0
- yesod-form-bootstrap4 ==3.0.1

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

@ -2426,6 +2426,7 @@ dont-distribute-packages:
- json-togo
- json-tokens
- json2-hdbc
- json2sg
- jsonlogic-aeson
- jsons-to-schema
- jspath
@ -3594,6 +3595,7 @@ dont-distribute-packages:
- skeletons
- sketch-frp-copilot
- skylark-client
- skylighting_0_13
- slate
- slidemews
- slip32
@ -3728,6 +3730,7 @@ dont-distribute-packages:
- subG-instances
- subhask
- substring-parser
- sugar-data
- sugar-json
- sugar-scheme
- summoner-tui
@ -3848,6 +3851,7 @@ dont-distribute-packages:
- timeprint
- timeseries
- timezone-unix
- tinkoff-invest-sdk
- tinyMesh
- tip-haskell-frontend
- tip-lib

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

@ -977,6 +977,9 @@ self: super: builtins.intersectAttrs super {
'';
}) super.jacinda;
# Tests assume dist-newstyle build directory is present
cabal-hoogle = dontCheck super.cabal-hoogle;
nfc = overrideCabal (drv: {
isExecutable = true;
executableHaskellDepends = with self; drv.executableHaskellDepends or [] ++ [ base base16-bytestring bytestring ];

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

File diff suppressed because it is too large Load diff

2
pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
View file

@ -1,6 +1,6 @@
{ lib
, stdenv
, supportedGhcVersions ? [ "884" "8107" "902" "923" ]
, supportedGhcVersions ? [ "884" "8107" "902" "924" ]
, dynamic ? false
, haskellPackages
, haskell

2
pkgs/top-level/all-packages.nix
View file

@ -14707,7 +14707,7 @@ with pkgs;
stdenv = clangStdenv;
};
jacinda = haskell.lib.compose.justStaticExecutables haskell.packages.ghc923.jacinda;
jacinda = haskell.lib.compose.justStaticExecutables haskell.packages.ghc924.jacinda;
janet = callPackage ../development/interpreters/janet {};

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

@ -15,14 +15,14 @@ let
"integer-simple"
"native-bignum"
"ghc902"
"ghc923"
"ghc924"
"ghc941"
"ghcHEAD"
];
nativeBignumIncludes = [
"ghc902"
"ghc923"
"ghc924"
"ghc941"
"ghcHEAD"
];
@ -138,7 +138,7 @@ in {
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
llvmPackages = pkgs.llvmPackages_12;
};
ghc923 = callPackage ../development/compilers/ghc/9.2.3.nix {
ghc924 = callPackage ../development/compilers/ghc/9.2.4.nix {
bootPkgs =
# aarch64 ghc8107Binary exceeds max output size on hydra
if stdenv.hostPlatform.isAarch then
@ -277,9 +277,9 @@ in {
ghc = bh.compiler.ghc902;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.0.x.nix { };
};
ghc923 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc923;
ghc = bh.compiler.ghc923;
ghc924 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc924;
ghc = bh.compiler.ghc924;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { };
};
ghc941 = callPackage ../development/haskell-modules {

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

@ -52,7 +52,7 @@ let
ghc884
ghc8107
ghc902
ghc923
ghc924
];
# packagePlatforms applied to `haskell.packages.*`
@ -331,8 +331,8 @@ let
;
};
haskell.packages.native-bignum.ghc923 = {
inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc923)
haskell.packages.native-bignum.ghc924 = {
inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc924)
hello
lens
random
@ -382,7 +382,7 @@ let
weeder = [
compilerNames.ghc8107
compilerNames.ghc902
compilerNames.ghc923
compilerNames.ghc924
];
purescript-cst = [
compilerNames.ghc8107
@ -456,11 +456,11 @@ let
jobs.pkgsMusl.haskell.compiler.ghc884
jobs.pkgsMusl.haskell.compiler.ghc8107
jobs.pkgsMusl.haskell.compiler.ghc902
jobs.pkgsMusl.haskell.compiler.ghc923
jobs.pkgsMusl.haskell.compiler.ghc924
jobs.pkgsMusl.haskell.compiler.ghcHEAD
jobs.pkgsMusl.haskell.compiler.integer-simple.ghc8107
jobs.pkgsMusl.haskell.compiler.native-bignum.ghc902
jobs.pkgsMusl.haskell.compiler.native-bignum.ghc923
jobs.pkgsMusl.haskell.compiler.native-bignum.ghc924
jobs.pkgsMusl.haskell.compiler.native-bignum.ghcHEAD
];
};
@ -476,7 +476,7 @@ let
};
constituents = accumulateDerivations [
jobs.pkgsStatic.haskellPackages
jobs.pkgsStatic.haskell.packages.native-bignum.ghc923
jobs.pkgsStatic.haskell.packages.native-bignum.ghc924
];
};
}