Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/languages-frameworks/haskell.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -1305,7 +1305,7 @@ let
# Name of the compiler and package set you want to change. If you are using
# the default package set `haskellPackages`, you need to look up what version
# of GHC it currently uses (note that this is subject to change).
ghcName = "ghc92";
ghcName = "ghc910";
# Desired new setting
enableProfiling = true;

Expand Down
8 changes: 5 additions & 3 deletions doc/release-notes/rl-2511.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,13 @@

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

- 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.

- 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.

- GHC 9.0 and its package set have been removed.
- GHC 8.6, 8.10, 9.0, 9.2, and their package sets have been removed.

- Support for bootstrapping native GHC compilers on 32‐bit ARM and little‐endian 64‐bit PowerPC has been dropped.
The latter was probably broken anyway.
If there is interest in restoring support for these architectures, it should be possible to cross‐compile a bootstrap GHC binary.

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

Expand Down
4 changes: 2 additions & 2 deletions lib/options.nix
Original file line number Diff line number Diff line change
Expand Up @@ -267,9 +267,9 @@ rec {

mkPackageOption pkgs "GHC" {
default = [ "ghc" ];
example = "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])";
example = "pkgs.haskellPackages.ghc.withPackages (hkgs: [ hkgs.primes ])";
}
=> { ...; 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; }
=> { ...; default = pkgs.ghc; defaultText = literalExpression "pkgs.ghc"; description = "The GHC package to use."; example = literalExpression "pkgs.haskellPackages.ghc.withPackages (hkgs: [ hkgs.primes ])"; type = package; }

mkPackageOption pkgs [ "python3Packages" "pytorch" ] {
extraDescription = "This is an example and doesn't actually do anything.";
Expand Down
4 changes: 2 additions & 2 deletions maintainers/scripts/haskell/test-configurations.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
and builds all derivations (or at least a reasonable subset) affected by
these overrides.

By default, it checks `configuration-{common,nix,ghc-8.10.x}.nix`. You can
By default, it checks `configuration-{common,nix,ghc-9.8.x}.nix`. You can
invoke it like this:

nix-build maintainers/scripts/haskell/test-configurations.nix --keep-going
Expand Down Expand Up @@ -50,7 +50,7 @@
files ? [
"configuration-common.nix"
"configuration-nix.nix"
"configuration-ghc-8.10.x.nix"
"configuration-ghc-9.8.x.nix"
],
nixpkgsPath ? ../../..,
config ? {
Expand Down
4 changes: 2 additions & 2 deletions nixos/doc/manual/development/option-declarations.section.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,15 +152,15 @@ lib.mkPackageOption pkgs "hello" { }
lib.mkPackageOption pkgs "GHC"
{
default = [ "ghc" ];
example = "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])";
example = "pkgs.haskellPackages.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.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])";
example = lib.literalExpression "pkgs.haskellPackages.ghc.withPackages (hkgs: [ hkgs.primes ])";
description = "The GHC package to use.";
}
```
Expand Down
2 changes: 1 addition & 1 deletion nixos/modules/services/x11/window-managers/xmonad.nix
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ in
haskellPackages = mkOption {
default = pkgs.haskellPackages;
defaultText = literalExpression "pkgs.haskellPackages";
example = literalExpression "pkgs.haskell.packages.ghc810";
example = literalExpression "pkgs.haskell.packages.ghc910";
type = types.attrs;
description = ''
haskellPackages used to build Xmonad and other packages.
Expand Down
Loading
Loading