diff --git a/lib/options.nix b/lib/options.nix index 3a1c0e540d7c0a..84d9fd5e15ded8 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -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 = { ... }; } */ diff --git a/nixos/doc/manual/development/option-declarations.section.md b/nixos/doc/manual/development/option-declarations.section.md index 79914f2cb6ca96..8bf73a66456ba4 100644 --- a/nixos/doc/manual/development/option-declarations.section.md +++ b/nixos/doc/manual/development/option-declarations.section.md @@ -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."; } ``` diff --git a/nixos/doc/manual/from_md/development/option-declarations.section.xml b/nixos/doc/manual/from_md/development/option-declarations.section.xml index 03ec48f35fd78b..d7c7f7716bead1 100644 --- a/nixos/doc/manual/from_md/development/option-declarations.section.xml +++ b/nixos/doc/manual/from_md/development/option-declarations.section.xml @@ -193,14 +193,14 @@ lib.mkOption { 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."; } diff --git a/pkgs/development/compilers/ghc/9.2.3.nix b/pkgs/development/compilers/ghc/9.2.4.nix similarity index 97% rename from pkgs/development/compilers/ghc/9.2.3.nix rename to pkgs/development/compilers/ghc/9.2.4.nix index 7803a50525590f..7643a60b1b2808 100644 --- a/pkgs/development/compilers/ghc/9.2.3.nix +++ b/pkgs/development/compilers/ghc/9.2.4.nix @@ -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; @@ -221,12 +219,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) '' @@ -291,7 +284,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) [ diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index 7c6481cabadcdd..8dbd4fc9fab628 100644 --- a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -1,6 +1,6 @@ { lib , stdenv -, supportedGhcVersions ? [ "884" "8107" "902" "923" ] +, supportedGhcVersions ? [ "884" "8107" "902" "924" ] , dynamic ? false , haskellPackages , haskell diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da519db11ca28f..17707b83d65eb3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14527,7 +14527,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 {}; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5afb94864a9898..109702ec5ea76f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -15,14 +15,14 @@ let "integer-simple" "native-bignum" "ghc902" - "ghc923" + "ghc924" "ghc941" "ghcHEAD" ]; nativeBignumIncludes = [ "ghc902" - "ghc923" + "ghc924" "ghc941" "ghcHEAD" ]; @@ -135,7 +135,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.isAarch64 || stdenv.isAarch32 then @@ -268,9 +268,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 { diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index d519444ce1ddf7..b98b71bfe0f755 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -52,7 +52,7 @@ let ghc884 ghc8107 ghc902 - ghc923 + ghc924 ]; # packagePlatforms applied to `haskell.packages.*` @@ -330,8 +330,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 @@ -381,7 +381,7 @@ let weeder = [ compilerNames.ghc8107 compilerNames.ghc902 - compilerNames.ghc923 + compilerNames.ghc924 ]; purescript = [ compilerNames.ghc8107 @@ -458,11 +458,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 ]; }; @@ -478,7 +478,7 @@ let }; constituents = accumulateDerivations [ jobs.pkgsStatic.haskellPackages - jobs.pkgsStatic.haskell.packages.native-bignum.ghc923 + jobs.pkgsStatic.haskell.packages.native-bignum.ghc924 ]; }; }