lol

haskell.compiler.ghc92: 9.2.4 -> 9.2.5

+406 -15
+1 -1
lib/options.nix
··· 123 123 Example: 124 124 mkPackageOption pkgs "GHC" { 125 125 default = [ "ghc" ]; 126 - example = "pkgs.haskell.packages.ghc924.ghc.withPackages (hkgs: [ hkgs.primes ])"; 126 + example = "pkgs.haskell.packages.ghc92.ghc.withPackages (hkgs: [ hkgs.primes ])"; 127 127 } 128 128 => { _type = "option"; default = «derivation /nix/store/jxx55cxsjrf8kyh3fp2ya17q99w7541r-ghc-8.10.7.drv»; defaultText = { ... }; description = "The GHC package to use."; example = { ... }; type = { ... }; } 129 129 */
+1 -1
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
··· 2106 2106 <literal>ghc810</literal>. Those attributes point to the same 2107 2107 compilers and packagesets but have the advantage that e.g. 2108 2108 <literal>ghc92</literal> stays stable when we update from 2109 - <literal>ghc924</literal> to <literal>ghc925</literal>. 2109 + <literal>ghc925</literal> to <literal>ghc926</literal>. 2110 2110 </para> 2111 2111 </listitem> 2112 2112 </itemizedlist>
+1 -1
nixos/doc/manual/release-notes/rl-2111.section.md
··· 576 576 577 577 - More jdk and jre versions are now exposed via `java-packages.compiler`. 578 578 579 - - The sets `haskell.packages` and `haskell.compiler` now contain for every ghc version an attribute with the minor version dropped. E.g. for `ghc8107` there also now exists `ghc810`. Those attributes point to the same compilers and packagesets but have the advantage that e.g. `ghc92` stays stable when we update from `ghc924` to `ghc925`. 579 + - The sets `haskell.packages` and `haskell.compiler` now contain for every ghc version an attribute with the minor version dropped. E.g. for `ghc8107` there also now exists `ghc810`. Those attributes point to the same compilers and packagesets but have the advantage that e.g. `ghc92` stays stable when we update from `ghc925` to `ghc926`.
+367
pkgs/development/compilers/ghc/9.2.5.nix
··· 1 + { lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages 2 + 3 + # build-tools 4 + , bootPkgs 5 + , autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx 6 + , xattr, autoSignDarwinBinariesHook 7 + , bash 8 + 9 + , libiconv ? null, ncurses 10 + , glibcLocales ? null 11 + 12 + , # GHC can be built with system libffi or a bundled one. 13 + libffi ? null 14 + 15 + , useLLVM ? !(stdenv.targetPlatform.isx86 16 + || stdenv.targetPlatform.isPower 17 + || stdenv.targetPlatform.isSparc 18 + || (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin)) 19 + , # LLVM is conceptually a run-time-only depedendency, but for 20 + # non-x86, we need LLVM to bootstrap later stages, so it becomes a 21 + # build-time dependency too. 22 + buildTargetLlvmPackages, llvmPackages 23 + 24 + , # If enabled, GHC will be built with the GPL-free but slightly slower native 25 + # bignum backend instead of the faster but GPLed gmp backend. 26 + enableNativeBignum ? !(lib.meta.availableOn stdenv.hostPlatform gmp) 27 + , gmp 28 + 29 + , # If enabled, use -fPIC when compiling static libs. 30 + enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform 31 + 32 + # aarch64 outputs otherwise exceed 2GB limit 33 + , enableProfiledLibs ? !stdenv.targetPlatform.isAarch64 34 + 35 + , # Whether to build dynamic libs for the standard library (on the target 36 + # platform). Static libs are always built. 37 + enableShared ? with stdenv.targetPlatform; !isWindows && !useiOSPrebuilt && !isStatic 38 + 39 + , # Whether to build terminfo. 40 + enableTerminfo ? !stdenv.targetPlatform.isWindows 41 + 42 + , # What flavour to build. An empty string indicates no 43 + # specific flavour and falls back to ghc default values. 44 + ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) 45 + (if useLLVM then "perf-cross" else "perf-cross-ncg") 46 + 47 + , # Whether to build sphinx documentation. 48 + enableDocs ? ( 49 + # Docs disabled for musl and cross because it's a large task to keep 50 + # all `sphinx` dependencies building in those environments. 51 + # `sphinx` pulls in among others: 52 + # Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM. 53 + (stdenv.targetPlatform == stdenv.hostPlatform) 54 + && !stdenv.hostPlatform.isMusl 55 + ) 56 + 57 + , enableHaddockProgram ? 58 + # Disabled for cross; see note [HADDOCK_DOCS]. 59 + (stdenv.targetPlatform == stdenv.hostPlatform) 60 + 61 + , # Whether to disable the large address space allocator 62 + # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ 63 + disableLargeAddressSpace ? stdenv.targetPlatform.isiOS 64 + }: 65 + 66 + assert !enableNativeBignum -> gmp != null; 67 + 68 + # Cross cannot currently build the `haddock` program for silly reasons, 69 + # see note [HADDOCK_DOCS]. 70 + assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram; 71 + 72 + let 73 + inherit (stdenv) buildPlatform hostPlatform targetPlatform; 74 + 75 + inherit (bootPkgs) ghc; 76 + 77 + # TODO(@Ericson2314) Make unconditional 78 + targetPrefix = lib.optionalString 79 + (targetPlatform != hostPlatform) 80 + "${targetPlatform.config}-"; 81 + 82 + buildMK = '' 83 + BuildFlavour = ${ghcFlavour} 84 + ifneq \"\$(BuildFlavour)\" \"\" 85 + include mk/flavours/\$(BuildFlavour).mk 86 + endif 87 + BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"} 88 + BUILD_SPHINX_PDF = NO 89 + '' + 90 + # Note [HADDOCK_DOCS]: 91 + # Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock` 92 + # program is built (which we generally always want to have a complete GHC install) 93 + # and whether it is run on the GHC sources to generate hyperlinked source code 94 + # (which is impossible for cross-compilation); see: 95 + # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 96 + # This implies that currently a cross-compiled GHC will never have a `haddock` 97 + # program, so it can never generate haddocks for any packages. 98 + # If this is solved in the future, we'd like to unconditionally 99 + # build the haddock program (removing the `enableHaddockProgram` option). 100 + '' 101 + HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"} 102 + # Build haddocks for boot packages with hyperlinking 103 + EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump 104 + 105 + DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} 106 + BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} 107 + '' + lib.optionalString (targetPlatform != hostPlatform) '' 108 + Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} 109 + CrossCompilePrefix = ${targetPrefix} 110 + '' + lib.optionalString (!enableProfiledLibs) '' 111 + GhcLibWays = "v dyn" 112 + '' + 113 + # -fexternal-dynamic-refs apparently (because it's not clear from the documentation) 114 + # makes the GHC RTS able to load static libraries, which may be needed for TemplateHaskell. 115 + # This solution was described in https://www.tweag.io/blog/2020-09-30-bazel-static-haskell 116 + lib.optionalString enableRelocatedStaticLibs '' 117 + GhcLibHcOpts += -fPIC -fexternal-dynamic-refs 118 + GhcRtsHcOpts += -fPIC -fexternal-dynamic-refs 119 + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' 120 + EXTRA_CC_OPTS += -std=gnu99 121 + ''; 122 + 123 + # Splicer will pull out correct variations 124 + libDeps = platform: lib.optional enableTerminfo ncurses 125 + ++ [libffi] 126 + ++ lib.optional (!enableNativeBignum) gmp 127 + ++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv; 128 + 129 + # TODO(@sternenseemann): is buildTarget LLVM unnecessary? 130 + # GHC doesn't seem to have {LLC,OPT}_HOST 131 + toolsForTarget = [ 132 + pkgsBuildTarget.targetPackages.stdenv.cc 133 + ] ++ lib.optional useLLVM buildTargetLlvmPackages.llvm; 134 + 135 + targetCC = builtins.head toolsForTarget; 136 + 137 + # Sometimes we have to dispatch between the bintools wrapper and the unwrapped 138 + # derivation for certain tools depending on the platform. 139 + bintoolsFor = { 140 + # GHC needs install_name_tool on all darwin platforms. On aarch64-darwin it is 141 + # part of the bintools wrapper (due to codesigning requirements), but not on 142 + # x86_64-darwin. 143 + install_name_tool = 144 + if stdenv.targetPlatform.isAarch64 145 + then targetCC.bintools 146 + else targetCC.bintools.bintools; 147 + # Same goes for strip. 148 + strip = 149 + # TODO(@sternenseemann): also use wrapper if linker == "bfd" or "gold" 150 + if stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin 151 + then targetCC.bintools 152 + else targetCC.bintools.bintools; 153 + }; 154 + 155 + # Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues. 156 + # But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856 157 + # see #84670 and #49071 for more background. 158 + useLdGold = targetPlatform.linker == "gold" || 159 + (targetPlatform.linker == "bfd" && (targetCC.bintools.bintools.hasGold or false) && !targetPlatform.isMusl); 160 + 161 + # Makes debugging easier to see which variant is at play in `nix-store -q --tree`. 162 + variantSuffix = lib.concatStrings [ 163 + (lib.optionalString stdenv.hostPlatform.isMusl "-musl") 164 + (lib.optionalString enableNativeBignum "-native-bignum") 165 + ]; 166 + 167 + in 168 + 169 + # C compiler, bintools and LLVM are used at build time, but will also leak into 170 + # the resulting GHC's settings file and used at runtime. This means that we are 171 + # currently only able to build GHC if hostPlatform == buildPlatform. 172 + assert targetCC == pkgsHostTarget.targetPackages.stdenv.cc; 173 + assert buildTargetLlvmPackages.llvm == llvmPackages.llvm; 174 + assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang; 175 + 176 + stdenv.mkDerivation (rec { 177 + version = "9.2.5"; 178 + pname = "${targetPrefix}ghc${variantSuffix}"; 179 + 180 + src = fetchurl { 181 + url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; 182 + sha256 = "0606797d1b38e2d88ee2243f38ec6b9a1aa93e9b578e95f0de9a9c0a4144021c"; 183 + }; 184 + 185 + enableParallelBuilding = true; 186 + 187 + outputs = [ "out" "doc" ]; 188 + 189 + patches = [ 190 + # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482 191 + (fetchpatch { 192 + url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch"; 193 + sha256 = "sha256-8w8QUCsODaTvknCDGgTfFNZa8ZmvIKaKS+2ZJZ9foYk="; 194 + extraPrefix = "utils/haddock/"; 195 + stripLen = 1; 196 + }) 197 + ]; 198 + 199 + postPatch = "patchShebangs ."; 200 + 201 + # GHC needs the locale configured during the Haddock phase. 202 + LANG = "en_US.UTF-8"; 203 + 204 + # GHC is a bit confused on its cross terminology. 205 + # TODO(@sternenseemann): investigate coreutils dependencies and pass absolute paths 206 + preConfigure = '' 207 + for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do 208 + export "''${env#TARGET_}=''${!env}" 209 + done 210 + # GHC is a bit confused on its cross terminology, as these would normally be 211 + # the *host* tools. 212 + export CC="${targetCC}/bin/${targetCC.targetPrefix}cc" 213 + export CXX="${targetCC}/bin/${targetCC.targetPrefix}c++" 214 + # Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177 215 + export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}" 216 + export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as" 217 + export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar" 218 + export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm" 219 + export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib" 220 + export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf" 221 + export STRIP="${bintoolsFor.strip}/bin/${bintoolsFor.strip.targetPrefix}strip" 222 + '' + lib.optionalString (stdenv.targetPlatform.linker == "cctools") '' 223 + export OTOOL="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}otool" 224 + export INSTALL_NAME_TOOL="${bintoolsFor.install_name_tool}/bin/${bintoolsFor.install_name_tool.targetPrefix}install_name_tool" 225 + '' + lib.optionalString useLLVM '' 226 + export LLC="${lib.getBin buildTargetLlvmPackages.llvm}/bin/llc" 227 + export OPT="${lib.getBin buildTargetLlvmPackages.llvm}/bin/opt" 228 + '' + lib.optionalString (useLLVM && stdenv.targetPlatform.isDarwin) '' 229 + # LLVM backend on Darwin needs clang: https://downloads.haskell.org/~ghc/latest/docs/html/users_guide/codegens.html#llvm-code-generator-fllvm 230 + export CLANG="${buildTargetLlvmPackages.clang}/bin/${buildTargetLlvmPackages.clang.targetPrefix}clang" 231 + '' + '' 232 + echo -n "${buildMK}" > mk/build.mk 233 + '' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") '' 234 + export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive" 235 + '' + lib.optionalString (!stdenv.isDarwin) '' 236 + export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" 237 + '' + lib.optionalString stdenv.isDarwin '' 238 + export NIX_LDFLAGS+=" -no_dtrace_dof" 239 + 240 + # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 241 + export XATTR=${lib.getBin xattr}/bin/xattr 242 + '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' 243 + sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets 244 + '' + lib.optionalString targetPlatform.isMusl '' 245 + echo "patching llvm-targets for musl targets..." 246 + echo "Cloning these existing '*-linux-gnu*' targets:" 247 + grep linux-gnu llvm-targets | sed 's/^/ /' 248 + echo "(go go gadget sed)" 249 + sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets 250 + echo "llvm-targets now contains these '*-linux-musl*' targets:" 251 + grep linux-musl llvm-targets | sed 's/^/ /' 252 + 253 + echo "And now patching to preserve '-musleabi' as done with '-gnueabi'" 254 + # (aclocal.m4 is actual source, but patch configure as well since we don't re-gen) 255 + for x in configure aclocal.m4; do 256 + substituteInPlace $x \ 257 + --replace '*-android*|*-gnueabi*)' \ 258 + '*-android*|*-gnueabi*|*-musleabi*)' 259 + done 260 + ''; 261 + 262 + # TODO(@Ericson2314): Always pass "--target" and always prefix. 263 + configurePlatforms = [ "build" "host" ] 264 + ++ lib.optional (targetPlatform != hostPlatform) "target"; 265 + 266 + # `--with` flags for libraries needed for RTS linker 267 + configureFlags = [ 268 + "--datadir=$doc/share/doc/ghc" 269 + "--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib" 270 + ] ++ lib.optionals (libffi != null) [ 271 + "--with-system-libffi" 272 + "--with-ffi-includes=${targetPackages.libffi.dev}/include" 273 + "--with-ffi-libraries=${targetPackages.libffi.out}/lib" 274 + ] ++ lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ 275 + "--with-gmp-includes=${targetPackages.gmp.dev}/include" 276 + "--with-gmp-libraries=${targetPackages.gmp.out}/lib" 277 + ] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ 278 + "--with-iconv-includes=${libiconv}/include" 279 + "--with-iconv-libraries=${libiconv}/lib" 280 + ] ++ lib.optionals (targetPlatform != hostPlatform) [ 281 + "--enable-bootstrap-with-devel-snapshot" 282 + ] ++ lib.optionals useLdGold [ 283 + "CFLAGS=-fuse-ld=gold" 284 + "CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold" 285 + "CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold" 286 + ] ++ lib.optionals (disableLargeAddressSpace) [ 287 + "--disable-large-address-space" 288 + ]; 289 + 290 + # Make sure we never relax`$PATH` and hooks support for compatibility. 291 + strictDeps = true; 292 + 293 + # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. 294 + dontAddExtraLibs = true; 295 + 296 + nativeBuildInputs = [ 297 + perl autoconf automake m4 python3 298 + ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour 299 + ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ 300 + autoSignDarwinBinariesHook 301 + ] ++ lib.optionals enableDocs [ 302 + sphinx 303 + ]; 304 + 305 + # For building runtime libs 306 + depsBuildTarget = toolsForTarget; 307 + 308 + buildInputs = [ perl bash ] ++ (libDeps hostPlatform); 309 + 310 + depsTargetTarget = map lib.getDev (libDeps targetPlatform); 311 + depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform); 312 + 313 + # required, because otherwise all symbols from HSffi.o are stripped, and 314 + # that in turn causes GHCi to abort 315 + stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; 316 + 317 + checkTarget = "test"; 318 + 319 + hardeningDisable = 320 + [ "format" ] 321 + # In nixpkgs, musl based builds currently enable `pie` hardening by default 322 + # (see `defaultHardeningFlags` in `make-derivation.nix`). 323 + # But GHC cannot currently produce outputs that are ready for `-pie` linking. 324 + # Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear. 325 + # See: 326 + # * https://github.com/NixOS/nixpkgs/issues/129247 327 + # * https://gitlab.haskell.org/ghc/ghc/-/issues/19580 328 + ++ lib.optional stdenv.targetPlatform.isMusl "pie"; 329 + 330 + # big-parallel allows us to build with more than 2 cores on 331 + # Hydra which already warrants a significant speedup 332 + requiredSystemFeatures = [ "big-parallel" ]; 333 + 334 + postInstall = '' 335 + # Install the bash completion file. 336 + install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc 337 + ''; 338 + 339 + passthru = { 340 + inherit bootPkgs targetPrefix; 341 + 342 + inherit llvmPackages; 343 + inherit enableShared; 344 + 345 + # This is used by the haskell builder to query 346 + # the presence of the haddock program. 347 + hasHaddock = enableHaddockProgram; 348 + 349 + # Our Cabal compiler name 350 + haskellCompilerName = "ghc-${version}"; 351 + }; 352 + 353 + meta = { 354 + homepage = "http://haskell.org/ghc"; 355 + description = "The Glasgow Haskell Compiler"; 356 + maintainers = with lib.maintainers; [ 357 + guibou 358 + ] ++ lib.teams.haskell.members; 359 + timeout = 24 * 3600; 360 + inherit (ghc.meta) license platforms; 361 + }; 362 + 363 + } // lib.optionalAttrs targetPlatform.useAndroidPrebuilt { 364 + dontStrip = true; 365 + dontPatchELF = true; 366 + noAuditTmpdir = true; 367 + })
+27 -3
pkgs/top-level/haskell-packages.nix
··· 17 17 "ghc902" 18 18 "ghc90" 19 19 "ghc924" 20 + "ghc925" 20 21 "ghc92" 21 22 "ghc943" 22 23 "ghc94" ··· 28 29 "ghc902" 29 30 "ghc92" 30 31 "ghc924" 32 + "ghc925" 31 33 "ghc94" 32 34 "ghc943" 33 35 "ghcHEAD" ··· 164 166 buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; 165 167 llvmPackages = pkgs.llvmPackages_12; 166 168 }; 167 - ghc92 = ghc924; 169 + ghc925 = callPackage ../development/compilers/ghc/9.2.5.nix { 170 + bootPkgs = 171 + # aarch64 ghc8107Binary exceeds max output size on hydra 172 + if stdenv.hostPlatform.isAarch then 173 + packages.ghc8107BinaryMinimal 174 + else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then 175 + packages.ghc810 176 + else 177 + packages.ghc8107Binary; 178 + inherit (buildPackages.python3Packages) sphinx; 179 + # Need to use apple's patched xattr until 180 + # https://github.com/xattr/xattr/issues/44 and 181 + # https://github.com/xattr/xattr/issues/55 are solved. 182 + inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; 183 + buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; 184 + llvmPackages = pkgs.llvmPackages_12; 185 + }; 186 + ghc92 = ghc925; 168 187 ghc943 = callPackage ../development/compilers/ghc/9.4.3.nix { 169 188 bootPkgs = 170 189 # Building with 9.2 is broken due to ··· 192 211 ghc94 = ghc943; 193 212 ghcHEAD = callPackage ../development/compilers/ghc/head.nix { 194 213 bootPkgs = 195 - # For GHC 9.2.3 and 9.2.4 no armv7l bindists are available. 214 + # For GHC 9.2 no armv7l bindists are available. 196 215 if stdenv.hostPlatform.isAarch32 then 197 216 packages.ghc924 198 217 else if stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian then ··· 310 329 ghc = bh.compiler.ghc924; 311 330 compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; 312 331 }; 313 - ghc92 = ghc924; 332 + ghc925 = callPackage ../development/haskell-modules { 333 + buildHaskellPackages = bh.packages.ghc925; 334 + ghc = bh.compiler.ghc925; 335 + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; 336 + }; 337 + ghc92 = ghc925; 314 338 ghc943 = callPackage ../development/haskell-modules { 315 339 buildHaskellPackages = bh.packages.ghc943; 316 340 ghc = bh.compiler.ghc943;
+9 -9
pkgs/top-level/release-haskell.nix
··· 52 52 ghc884 53 53 ghc8107 54 54 ghc902 55 - ghc924 55 + ghc925 56 56 ghc943 57 57 ]; 58 58 ··· 333 333 ; 334 334 }; 335 335 336 - haskell.packages.native-bignum.ghc924 = { 337 - inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc92) 336 + haskell.packages.native-bignum.ghc925 = { 337 + inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.native-bignum.ghc925) 338 338 hello 339 339 lens 340 340 random ··· 365 365 compilerNames.ghc884 366 366 compilerNames.ghc8107 367 367 compilerNames.ghc902 368 - compilerNames.ghc924 368 + compilerNames.ghc925 369 369 # https://github.com/ndmitchell/hlint/issues/1413 370 370 ]; 371 371 hpack = released; ··· 392 392 weeder = [ 393 393 compilerNames.ghc8107 394 394 compilerNames.ghc902 395 - compilerNames.ghc924 395 + compilerNames.ghc925 396 396 ]; 397 397 purescript = [ 398 - compilerNames.ghc924 398 + compilerNames.ghc925 399 399 ]; 400 400 purescript-cst = [ 401 401 compilerNames.ghc8107 ··· 469 469 jobs.pkgsMusl.haskell.compiler.ghc884 470 470 jobs.pkgsMusl.haskell.compiler.ghc8107 471 471 jobs.pkgsMusl.haskell.compiler.ghc902 472 - jobs.pkgsMusl.haskell.compiler.ghc924 472 + jobs.pkgsMusl.haskell.compiler.ghc925 473 473 jobs.pkgsMusl.haskell.compiler.ghcHEAD 474 474 jobs.pkgsMusl.haskell.compiler.integer-simple.ghc8107 475 475 jobs.pkgsMusl.haskell.compiler.native-bignum.ghc902 476 - jobs.pkgsMusl.haskell.compiler.native-bignum.ghc924 476 + jobs.pkgsMusl.haskell.compiler.native-bignum.ghc925 477 477 jobs.pkgsMusl.haskell.compiler.native-bignum.ghcHEAD 478 478 ]; 479 479 }; ··· 489 489 }; 490 490 constituents = accumulateDerivations [ 491 491 jobs.pkgsStatic.haskellPackages 492 - jobs.pkgsStatic.haskell.packages.native-bignum.ghc924 492 + jobs.pkgsStatic.haskell.packages.native-bignum.ghc925 493 493 ]; 494 494 }; 495 495 }