Skip to content

Commit a9b8698

Browse files
haskell.compiler.ghc{8107{,Binary},928}: drop (#440794)
2 parents ec22338 + 3b7e7e3 commit a9b8698

19 files changed

Lines changed: 44 additions & 2264 deletions

File tree

doc/languages-frameworks/haskell.section.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1305,7 +1305,7 @@ let
13051305
# Name of the compiler and package set you want to change. If you are using
13061306
# the default package set `haskellPackages`, you need to look up what version
13071307
# of GHC it currently uses (note that this is subject to change).
1308-
ghcName = "ghc92";
1308+
ghcName = "ghc910";
13091309
# Desired new setting
13101310
enableProfiling = true;
13111311

doc/release-notes/rl-2511.section.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,13 @@
2424

2525
- GCC 9, 10, 11, and 12 have been removed, as they have reached end‐of‐life upstream and are no longer supported.
2626

27-
- GHC 8.6 and its package set have been removed. It was only used to bootstrap GHC for powerpc64le, but this was probably broken anyway.
28-
2927
- GHCJS 8.10, exposed via `haskell.compiler.ghcjs` and `haskell.compiler.ghcjs810`, has been removed. Downstream users should migrate their projects to the new JavaScript backend of GHC proper which can be used via `pkgsCross.ghcjs` from Nixpkgs. Haskell packaging code, like `haskellPackages.mkDerivation`, `ghcWithPackages` and `hoogleWithPackages`, also no longer supports GHCJS.
3028

31-
- GHC 9.0 and its package set have been removed.
29+
- GHC 8.6, 8.10, 9.0, 9.2, and their package sets have been removed.
30+
31+
- Support for bootstrapping native GHC compilers on 32‐bit ARM and little‐endian 64‐bit PowerPC has been dropped.
32+
The latter was probably broken anyway.
33+
If there is interest in restoring support for these architectures, it should be possible to cross‐compile a bootstrap GHC binary.
3234

3335
- `base16-builder` node package has been removed due to lack of upstream maintenance.
3436

lib/options.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,9 +267,9 @@ rec {
267267
268268
mkPackageOption pkgs "GHC" {
269269
default = [ "ghc" ];
270-
example = "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])";
270+
example = "pkgs.haskellPackages.ghc.withPackages (hkgs: [ hkgs.primes ])";
271271
}
272-
=> { ...; default = pkgs.ghc; defaultText = literalExpression "pkgs.ghc"; description = "The GHC package to use."; example = literalExpression "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])"; type = package; }
272+
=> { ...; default = pkgs.ghc; defaultText = literalExpression "pkgs.ghc"; description = "The GHC package to use."; example = literalExpression "pkgs.haskellPackages.ghc.withPackages (hkgs: [ hkgs.primes ])"; type = package; }
273273
274274
mkPackageOption pkgs [ "python3Packages" "pytorch" ] {
275275
extraDescription = "This is an example and doesn't actually do anything.";

maintainers/scripts/haskell/test-configurations.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
and builds all derivations (or at least a reasonable subset) affected by
77
these overrides.
88
9-
By default, it checks `configuration-{common,nix,ghc-8.10.x}.nix`. You can
9+
By default, it checks `configuration-{common,nix,ghc-9.8.x}.nix`. You can
1010
invoke it like this:
1111
1212
nix-build maintainers/scripts/haskell/test-configurations.nix --keep-going
@@ -50,7 +50,7 @@
5050
files ? [
5151
"configuration-common.nix"
5252
"configuration-nix.nix"
53-
"configuration-ghc-8.10.x.nix"
53+
"configuration-ghc-9.8.x.nix"
5454
],
5555
nixpkgsPath ? ../../..,
5656
config ? {

nixos/doc/manual/development/option-declarations.section.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,15 +152,15 @@ lib.mkPackageOption pkgs "hello" { }
152152
lib.mkPackageOption pkgs "GHC"
153153
{
154154
default = [ "ghc" ];
155-
example = "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])";
155+
example = "pkgs.haskellPackages.ghc.withPackages (hkgs: [ hkgs.primes ])";
156156
}
157157
# is like
158158
lib.mkOption
159159
{
160160
type = lib.types.package;
161161
default = pkgs.ghc;
162162
defaultText = lib.literalExpression "pkgs.ghc";
163-
example = lib.literalExpression "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])";
163+
example = lib.literalExpression "pkgs.haskellPackages.ghc.withPackages (hkgs: [ hkgs.primes ])";
164164
description = "The GHC package to use.";
165165
}
166166
```

nixos/modules/services/x11/window-managers/xmonad.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ in
7474
haskellPackages = mkOption {
7575
default = pkgs.haskellPackages;
7676
defaultText = literalExpression "pkgs.haskellPackages";
77-
example = literalExpression "pkgs.haskell.packages.ghc810";
77+
example = literalExpression "pkgs.haskell.packages.ghc910";
7878
type = types.attrs;
7979
description = ''
8080
haskellPackages used to build Xmonad and other packages.

0 commit comments

Comments
 (0)