From 14488d4051243696786742844af1ebe908c9f36c Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Fri, 19 Sep 2025 12:07:06 +0200 Subject: [PATCH 1/3] compilers/ghc/common-hadrian: remove unused condition Hadrian is only used for GHC 9.6+ anyway. --- pkgs/development/compilers/ghc/common-hadrian.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 60224a33d2365..670549279e4b2 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -208,7 +208,7 @@ extraPrefix = "libraries/unix/"; }) ] - ++ lib.optionals (lib.versionAtLeast version "9.6" && lib.versionOlder version "9.8") [ + ++ lib.optionals (lib.versionOlder version "9.8") [ # Fix unlit being installed under a different name than is used in the # settings file: https://gitlab.haskell.org/ghc/ghc/-/issues/23317 (fetchpatch { From ac5228c6c02590a0d05afad272e1598385ee9680 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 1 Sep 2025 22:11:05 +0200 Subject: [PATCH 2/3] haskell.compiler.ghc9101: drop Latest 9.10.x minor release is 9.10.2, which is also in Stackage 24.8. Thus, dropping according to the GHC Deprecation Policy. --- pkgs/development/compilers/ghc/9.10.1.nix | 4 -- .../compilers/ghc/common-hadrian.nix | 39 ++++++++----------- pkgs/top-level/haskell-packages.nix | 23 ----------- pkgs/top-level/release-haskell.nix | 4 -- 4 files changed, 16 insertions(+), 54 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/9.10.1.nix diff --git a/pkgs/development/compilers/ghc/9.10.1.nix b/pkgs/development/compilers/ghc/9.10.1.nix deleted file mode 100644 index d1824ce680fd9..0000000000000 --- a/pkgs/development/compilers/ghc/9.10.1.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common-hadrian.nix { - version = "9.10.1"; - sha256 = "bf386a302d4ee054791ffd51748900f15d71760fd199157922d120cc1f89e2f7"; -} diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 670549279e4b2..678bf11a618f1 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -185,29 +185,22 @@ || (lib.versionAtLeast version "9.8" && lib.versionOlder version "9.11"); in - lib.optionals - ( - # 2025-01-16: unix >= 2.8.6.0 is unaffected which is shipped by GHC 9.12.1 and 9.8.4 - lib.versionOlder version "9.11" - && !(lib.versionAtLeast version "9.6.7" && lib.versionOlder version "9.8") - && !(lib.versionAtLeast version "9.8.4" && lib.versionOlder version "9.9") - && !(lib.versionAtLeast version "9.10.2" && lib.versionOlder version "9.11") - ) - [ - # Determine size of time related types using hsc2hs instead of assuming CLong. - # Prevents failures when e.g. stat(2)ing on 32bit systems with 64bit time_t etc. - # https://github.com/haskell/ghcup-hs/issues/1107 - # https://gitlab.haskell.org/ghc/ghc/-/issues/25095 - # Note that in normal situations this shouldn't be the case since nixpkgs - # doesn't set -D_FILE_OFFSET_BITS=64 and friends (yet). - (fetchpatch { - name = "unix-fix-ctimeval-size-32-bit.patch"; - url = "https://github.com/haskell/unix/commit/8183e05b97ce870dd6582a3677cc82459ae566ec.patch"; - sha256 = "17q5yyigqr5kxlwwzb95sx567ysfxlw6bp3j4ji20lz0947aw6gv"; - stripLen = 1; - extraPrefix = "libraries/unix/"; - }) - ] + # 2025-01-16: unix >= 2.8.6.0 is unaffected which is shipped by GHC 9.12.1, 9.10.2, 9.8.4 and 9.6.7 + lib.optionals (lib.versionOlder version "9.6.7") [ + # Determine size of time related types using hsc2hs instead of assuming CLong. + # Prevents failures when e.g. stat(2)ing on 32bit systems with 64bit time_t etc. + # https://github.com/haskell/ghcup-hs/issues/1107 + # https://gitlab.haskell.org/ghc/ghc/-/issues/25095 + # Note that in normal situations this shouldn't be the case since nixpkgs + # doesn't set -D_FILE_OFFSET_BITS=64 and friends (yet). + (fetchpatch { + name = "unix-fix-ctimeval-size-32-bit.patch"; + url = "https://github.com/haskell/unix/commit/8183e05b97ce870dd6582a3677cc82459ae566ec.patch"; + sha256 = "17q5yyigqr5kxlwwzb95sx567ysfxlw6bp3j4ji20lz0947aw6gv"; + stripLen = 1; + extraPrefix = "libraries/unix/"; + }) + ] ++ lib.optionals (lib.versionOlder version "9.8") [ # Fix unlit being installed under a different name than is used in the # settings file: https://gitlab.haskell.org/ghc/ghc/-/issues/23317 diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 827685681415a..5190ca26801c4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -121,24 +121,6 @@ in inherit buildTargetLlvmPackages llvmPackages; }; ghc98 = compiler.ghc984; - ghc9101 = callPackage ../development/compilers/ghc/9.10.1.nix { - bootPkgs = - if stdenv.buildPlatform.isDarwin then - # it seems like the GHC 9.6.* bindists are built with a different - # toolchain than we are using (which I'm guessing from the fact - # that 9.6.4 bindists pass linker flags our ld doesn't support). - # With both 9.6.3 and 9.6.4 binary it is impossible to link against - # the clock package (probably a hsc2hs problem). - bb.packages.ghc967 - else - bb.packages.ghc963Binary; - inherit (buildPackages.python3Packages) sphinx; - # Need to use apple's patched xattr until - # https://github.com/xattr/xattr/issues/44 and - # https://github.com/xattr/xattr/issues/55 are solved. - inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; - inherit buildTargetLlvmPackages llvmPackages; - }; ghc9102 = callPackage ../development/compilers/ghc/9.10.2.nix { bootPkgs = if stdenv.buildPlatform.isDarwin then @@ -284,11 +266,6 @@ in compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { }; }; ghc98 = packages.ghc984; - ghc9101 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc9101; - ghc = bh.compiler.ghc9101; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.10.x.nix { }; - }; ghc9102 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc9102; ghc = bh.compiler.ghc9102; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 5013bf119de82..b4e1b1b66f205 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -66,7 +66,6 @@ let ghc948 ghc967 ghc984 - ghc9101 ghc9102 ghc9103 # exclude ghc9121 due to severe miscompilation bug @@ -552,14 +551,12 @@ let funcmp = released; git-annex = [ # for 9.10, test that using filepath (instead of filepath-bytestring) works. - compilerNames.ghc9101 compilerNames.ghc9102 compilerNames.ghc9103 ]; haskell-language-server = released; hoogle = released; hlint = lib.subtractLists [ - compilerNames.ghc9101 compilerNames.ghc9102 compilerNames.ghc9103 compilerNames.ghc9122 @@ -587,7 +584,6 @@ let compilerNames.ghc967 ]; weeder = lib.subtractLists [ - compilerNames.ghc9101 compilerNames.ghc9102 compilerNames.ghc9103 compilerNames.ghc9122 From 5df6c9a28f1ddcb54ca5f558e0764ab92e782904 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 6 Sep 2025 13:05:05 +0200 Subject: [PATCH 3/3] haskell.compiler.ghc963Binary: drop This bootstraps mostly from ghc984Binary, at least for the major platforms. The bootstrap paths for darwin become much shorter. Unfortunately, the bootstrap paths for i686-linux become a bit longer, so it's a trade-off. --- .../compilers/ghc/9.6.3-binary.nix | 467 ------------------ .../compilers/ghc/common-hadrian.nix | 18 +- pkgs/top-level/haskell-packages.nix | 37 +- 3 files changed, 4 insertions(+), 518 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/9.6.3-binary.nix diff --git a/pkgs/development/compilers/ghc/9.6.3-binary.nix b/pkgs/development/compilers/ghc/9.6.3-binary.nix deleted file mode 100644 index fcfa43f64b24c..0000000000000 --- a/pkgs/development/compilers/ghc/9.6.3-binary.nix +++ /dev/null @@ -1,467 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - perl, - gcc, - ncurses5, - ncurses6, - gmp, - libiconv, - numactl, - libffi, - coreutils, - targetPackages, - - # minimal = true; will remove files that aren't strictly necessary for - # regular builds and GHC bootstrapping. - # This is "useful" for staying within hydra's output limits for at least the - # aarch64-linux architecture. - minimal ? false, -}: - -# Prebuilt only does native -assert stdenv.targetPlatform == stdenv.hostPlatform; - -let - downloadsUrl = "https://downloads.haskell.org/ghc"; - - # Copy sha256 from https://downloads.haskell.org/~ghc/9.6.3/SHA256SUMS - version = "9.6.3"; - - # Information about available bindists that we use in the build. - # - # # Bindist library checking - # - # The field `archSpecificLibraries` also provides a way for us get notified - # early when the upstream bindist changes its dependencies (e.g. because a - # newer Debian version is used that uses a new `ncurses` version). - # - # Usage: - # - # * You can find the `fileToCheckFor` of libraries by running `readelf -d` - # on the compiler binary (`exePathForLibraryCheck`). - # * To skip library checking for an architecture, - # set `exePathForLibraryCheck = null`. - # * To skip file checking for a specific arch specific library, - # set `fileToCheckFor = null`. - ghcBinDists = { - # Binary distributions for the default libc (e.g. glibc, or libSystem on Darwin) - # nixpkgs uses for the respective system. - defaultLibc = { - i686-linux = { - variantSuffix = ""; - src = { - url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz"; - sha256 = "58be26f8b8f6b5bd8baf5c32abb03e2c4621646b2142fab10e5c7de5af5c50f8"; - }; - exePathForLibraryCheck = "bin/ghc"; - archSpecificLibraries = [ - { - nixPackage = gmp; - fileToCheckFor = null; - } - # The i686-linux bindist provided by GHC HQ is currently built on Debian 9, - # which link it against `libtinfo.so.5` (ncurses 5). - # Other bindists are linked `libtinfo.so.6` (ncurses 6). - { - nixPackage = ncurses5; - fileToCheckFor = "libtinfo.so.5"; - } - ]; - }; - x86_64-linux = { - variantSuffix = ""; - src = { - url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-deb11-linux.tar.xz"; - sha256 = "c4c0124857265926f1cf22a09d950d7ba989ff94053a4ddf3dcdab5359f4cab7"; - }; - exePathForLibraryCheck = "bin/ghc"; - archSpecificLibraries = [ - { - nixPackage = gmp; - fileToCheckFor = null; - } - { - nixPackage = ncurses6; - fileToCheckFor = "libtinfo.so.6"; - } - ]; - }; - aarch64-linux = { - variantSuffix = ""; - src = { - url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz"; - sha256 = "03c389859319f09452081310fc13af7525063ea8930830ef76be2a14b312271e"; - }; - exePathForLibraryCheck = "bin/ghc"; - archSpecificLibraries = [ - { - nixPackage = gmp; - fileToCheckFor = null; - } - { - nixPackage = ncurses6; - fileToCheckFor = "libtinfo.so.6"; - } - { - nixPackage = numactl; - fileToCheckFor = null; - } - ]; - }; - x86_64-darwin = { - variantSuffix = ""; - src = { - url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz"; - sha256 = "dde46118ab8388fb1066312c097123e93b1dcf6ae366e3370f88ea456382c9db"; - }; - exePathForLibraryCheck = null; # we don't have a library check for darwin yet - archSpecificLibraries = [ - { - nixPackage = gmp; - fileToCheckFor = null; - } - { - nixPackage = ncurses6; - fileToCheckFor = null; - } - { - nixPackage = libiconv; - fileToCheckFor = null; - } - ]; - }; - aarch64-darwin = { - variantSuffix = ""; - src = { - url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-apple-darwin.tar.xz"; - sha256 = "e1cdf458926b2eaf52d2a8287d99a965040ff9051171f5c3b7467049cf0eb213"; - }; - exePathForLibraryCheck = null; # we don't have a library check for darwin yet - archSpecificLibraries = [ - { - nixPackage = gmp; - fileToCheckFor = null; - } - { - nixPackage = ncurses6; - fileToCheckFor = null; - } - { - nixPackage = libiconv; - fileToCheckFor = null; - } - ]; - }; - }; - # Binary distributions for the musl libc for the respective system. - musl = { - x86_64-linux = { - variantSuffix = "-musl"; - src = { - url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-alpine3_12-linux.tar.xz"; - sha256 = "8f457af0aa40127049c11134c8793f64351a446e87da1f8ec256e1279b5ab61f"; - }; - exePathForLibraryCheck = "bin/ghc"; - archSpecificLibraries = [ - { - nixPackage = gmp; - fileToCheckFor = null; - } - { - nixPackage = ncurses6; - fileToCheckFor = "libncursesw.so.6"; - } - ]; - }; - }; - }; - - distSetName = if stdenv.hostPlatform.isMusl then "musl" else "defaultLibc"; - - binDistUsed = - ghcBinDists.${distSetName}.${stdenv.hostPlatform.system} - or (throw "cannot bootstrap GHC on this platform ('${stdenv.hostPlatform.system}' with libc '${distSetName}')"); - - gmpUsed = - (builtins.head ( - builtins.filter ( - drv: lib.hasPrefix "gmp" (drv.nixPackage.name or "") - ) binDistUsed.archSpecificLibraries - )).nixPackage; - - libPath = lib.makeLibraryPath ( - # Add arch-specific libraries. - map ({ nixPackage, ... }: nixPackage) binDistUsed.archSpecificLibraries - ); - - libEnvVar = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH"; - - runtimeDeps = [ - targetPackages.stdenv.cc - targetPackages.stdenv.cc.bintools - coreutils # for cat - ] - # On darwin, we need unwrapped bintools as well (for otool) - ++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [ - targetPackages.stdenv.cc.bintools.bintools - ]; - -in - -stdenv.mkDerivation { - inherit version; - pname = "ghc-binary${binDistUsed.variantSuffix}"; - - src = fetchurl binDistUsed.src; - - nativeBuildInputs = [ perl ]; - - # Set LD_LIBRARY_PATH or equivalent so that the programs running as part - # of the bindist installer can find the libraries they expect. - # Cannot patchelf beforehand due to relative RPATHs that anticipate - # the final install location. - ${libEnvVar} = libPath; - - postUnpack = - # Verify our assumptions of which `libtinfo.so` (ncurses) version is used, - # so that we know when ghc bindists upgrade that and we need to update the - # version used in `libPath`. - lib.optionalString (binDistUsed.exePathForLibraryCheck != null) - # Note the `*` glob because some GHCs have a suffix when unpacked, e.g. - # the musl bindist has dir `ghc-VERSION-x86_64-unknown-linux/`. - # As a result, don't shell-quote this glob when splicing the string. - ( - let - buildExeGlob = ''ghc-${version}*/"${binDistUsed.exePathForLibraryCheck}"''; - in - lib.concatStringsSep "\n" [ - '' - shopt -u nullglob - echo "Checking that ghc binary exists in bindist at ${buildExeGlob}" - if ! test -e ${buildExeGlob}; then - echo >&2 "GHC binary ${binDistUsed.exePathForLibraryCheck} could not be found in the bindist build directory (at ${buildExeGlob}) for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; - fi - '' - (lib.concatMapStringsSep "\n" ( - { fileToCheckFor, nixPackage }: - lib.optionalString (fileToCheckFor != null) '' - echo "Checking bindist for ${fileToCheckFor} to ensure that is still used" - if ! readelf -d ${buildExeGlob} | grep "${fileToCheckFor}"; then - echo >&2 "File ${fileToCheckFor} could not be found in ${binDistUsed.exePathForLibraryCheck} for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; - fi - - echo "Checking that the nix package ${nixPackage} contains ${fileToCheckFor}" - if ! test -e "${lib.getLib nixPackage}/lib/${fileToCheckFor}"; then - echo >&2 "Nix package ${nixPackage} did not contain ${fileToCheckFor} for arch ${stdenv.hostPlatform.system}, please check that ghcBinDists correctly reflect the bindist dependencies!"; exit 1; - fi - '' - ) binDistUsed.archSpecificLibraries) - ] - ) - # GHC has dtrace probes, which causes ld to try to open /usr/lib/libdtrace.dylib - # during linking - + lib.optionalString stdenv.hostPlatform.isDarwin '' - export NIX_LDFLAGS+=" -no_dtrace_dof" - # not enough room in the object files for the full path to libiconv :( - for exe in $(find . -type f -executable); do - isMachO $exe || continue - ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe - done - '' - - # We have to patch the GMP paths for the ghc-bignum package, for hadrian by - # modifying the package-db directly - + '' - find . -name 'ghc-bignum*.conf' \ - -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib gmpUsed}/lib' -i {} \; - '' - # Similar for iconv and libffi on darwin - + lib.optionalString stdenv.hostPlatform.isDarwin '' - find . -name 'base*.conf' \ - -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib libiconv}/lib' -i {} \; - - # To link RTS in the end we also need libffi now - find . -name 'rts*.conf' \ - -exec sed -e '/^[a-z-]*library-dirs/a \ ${lib.getLib libffi}/lib' \ - -e 's@/Library/Developer/.*/usr/include/ffi@${lib.getDev libffi}/include@' \ - -i {} \; - '' - + - # Some platforms do HAVE_NUMA so -lnuma requires it in library-dirs in rts/package.conf.in - # FFI_LIB_DIR is a good indication of places it must be needed. - lib.optionalString - ( - lib.meta.availableOn stdenv.hostPlatform numactl - && builtins.any ({ nixPackage, ... }: nixPackage == numactl) binDistUsed.archSpecificLibraries - ) - '' - find . -name package.conf.in \ - -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \; - '' - + - # Rename needed libraries and binaries, fix interpreter - lib.optionalString stdenv.hostPlatform.isLinux '' - find . -type f -executable -exec patchelf \ - --interpreter ${stdenv.cc.bintools.dynamicLinker} {} \; - ''; - - # fix for `configure: error: Your linker is affected by binutils #16177` - preConfigure = lib.optionalString stdenv.targetPlatform.isAarch32 "LD=ld.gold"; - - # GHC has a patched config.sub and bindists' platforms should always work - dontUpdateAutotoolsGnuConfigScripts = true; - - configurePlatforms = [ ]; - configureFlags = - lib.optional stdenv.hostPlatform.isDarwin "--with-gcc=${./gcc-clang-wrapper.sh}" - # From: https://github.com/NixOS/nixpkgs/pull/43369/commits - ++ lib.optional stdenv.hostPlatform.isMusl "--disable-ld-override"; - - # No building is necessary, but calling make without flags ironically - # calls install-strip ... - dontBuild = true; - - # GHC tries to remove xattrs when installing to work around Gatekeeper - # (see https://gitlab.haskell.org/ghc/ghc/-/issues/17418). This step normally - # succeeds in nixpkgs because xattrs are not allowed in the store, but it - # can fail when a file has the `com.apple.provenance` xattr, and it can’t be - # modified (such as target of the symlink to `libiconv.dylib`). - # The `com.apple.provenance` xattr is a new feature of macOS as of macOS 13. - # See: https://eclecticlight.co/2023/03/13/ventura-has-changed-app-quarantine-with-a-new-xattr/ - makeFlags = lib.optionals stdenv.buildPlatform.isDarwin [ "XATTR=/does-not-exist" ]; - - # Patch scripts to include runtime dependencies in $PATH. - postInstall = '' - for i in "$out/bin/"*; do - test ! -h "$i" || continue - isScript "$i" || continue - sed -i -e '2i export PATH="${lib.makeBinPath runtimeDeps}:$PATH"' "$i" - done - '' - + lib.optionalString stdenv.targetPlatform.isDarwin '' - # Work around building with binary GHC on Darwin due to GHC’s use of `ar -L` when it - # detects `llvm-ar` even though the resulting archives are not supported by ld64. - # https://gitlab.haskell.org/ghc/ghc/-/issues/23188 - # https://github.com/haskell/cabal/issues/8882 - sed -i -e 's/,("ar supports -L", "YES")/,("ar supports -L", "NO")/' "$out/lib/ghc-${version}/lib/settings" - ''; - - # Apparently necessary for the ghc Alpine (musl) bindist: - # When we strip, and then run the - # patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p - # below, running ghc (e.g. during `installCheckPhase)` gives some apparently - # corrupted rpath or whatever makes the loader work on nonsensical strings: - # running install tests - # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: : symbol not found - # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: ir6zf6c9f86pfx8sr30n2vjy-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/../lib/x86_64-linux-ghc-8.10.5/libHSexceptions-0.10.4-ghc8.10.5.so: symbol not found - # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: y/lib/ghc-8.10.5/bin/../lib/x86_64-linux-ghc-8.10.5/libHStemplate-haskell-2.16.0.0-ghc8.10.5.so: symbol not found - # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: 8.10.5/libHStemplate-haskell-2.16.0.0-ghc8.10.5.so: symbol not found - # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: �: symbol not found - # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: �?: symbol not found - # Error relocating /nix/store/...-ghc-8.10.2-binary/lib/ghc-8.10.5/bin/ghc: 64-linux-ghc-8.10.5/libHSexceptions-0.10.4-ghc8.10.5.so: symbol not found - # This is extremely bogus and should be investigated. - dontStrip = if stdenv.hostPlatform.isMusl then true else false; # `if` for explicitness - - # On Linux, use patchelf to modify the executables so that they can - # find editline/gmp. - postFixup = - lib.optionalString (stdenv.hostPlatform.isLinux && !(binDistUsed.isStatic or false)) ( - if stdenv.hostPlatform.isAarch64 then - # Keep rpath as small as possible on aarch64 for patchelf#244. All Elfs - # are 2 directories deep from $out/lib, so pooling symlinks there makes - # a short rpath. - '' - (cd $out/lib; ln -s ${ncurses6.out}/lib/libtinfo.so.6) - (cd $out/lib; ln -s ${lib.getLib gmpUsed}/lib/libgmp.so.10) - (cd $out/lib; ln -s ${numactl.out}/lib/libnuma.so.1) - for p in $(find "$out/lib" -type f -name "*\.so*"); do - (cd $out/lib; ln -s $p) - done - - for p in $(find "$out/lib" -type f -executable); do - if isELF "$p"; then - echo "Patchelfing $p" - patchelf --set-rpath "\$ORIGIN:\$ORIGIN/../.." $p - fi - done - '' - else - '' - for p in $(find "$out" -type f -executable); do - if isELF "$p"; then - echo "Patchelfing $p" - patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p - fi - done - '' - ) - + lib.optionalString stdenv.hostPlatform.isDarwin '' - # not enough room in the object files for the full path to libiconv :( - for exe in $(find "$out" -type f -executable); do - isMachO $exe || continue - ln -fs ${libiconv}/lib/libiconv.dylib $(dirname $exe)/libiconv.dylib - install_name_tool -change /usr/lib/libiconv.2.dylib @executable_path/libiconv.dylib $exe - done - - for file in $(find "$out" -name setup-config); do - substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" - done - '' - # Recache package db which needs to happen for Hadrian bindists - # where we modify the package db before installing - + '' - package_db=("$out"/lib/ghc-*/lib/package.conf.d) - "$out/bin/ghc-pkg" --package-db="$package_db" recache - ''; - - doInstallCheck = true; - installCheckPhase = '' - # Sanity check, can ghc create executables? - cd $TMP - mkdir test-ghc; cd test-ghc - cat > main.hs << EOF - {-# LANGUAGE TemplateHaskell #-} - module Main where - main = putStrLn \$([|"yes"|]) - EOF - env -i $out/bin/ghc --make main.hs || exit 1 - echo compilation ok - [ $(./main) == "yes" ] - ''; - - passthru = { - targetPrefix = ""; - enableShared = true; - - llvmPackages = null; - - # Our Cabal compiler name - haskellCompilerName = "ghc-${version}"; - - # Normal GHC derivations expose the hadrian derivation used to build them - # here. In the case of bindists we just make sure that the attribute exists, - # as it is used for checking if a GHC derivation has been built with hadrian. - hadrian = null; - }; - - meta = { - homepage = "http://haskell.org/ghc"; - description = "Glasgow Haskell Compiler"; - license = lib.licenses.bsd3; - # HACK: since we can't encode the libc / abi in platforms, we need - # to make the platform list dependent on the evaluation platform - # in order to avoid eval errors with musl which supports less - # platforms than the default libcs (i. e. glibc / libSystem). - # This is done for the benefit of Hydra, so `packagePlatforms` - # won't return any platforms that would cause an evaluation - # failure for `pkgsMusl.haskell.compiler.ghc922Binary`, as - # long as the evaluator runs on a platform that supports - # `pkgsMusl`. - platforms = builtins.attrNames ghcBinDists.${distSetName}; - teams = [ lib.teams.haskell ]; - broken = !(import ./common-have-ncg.nix { inherit lib stdenv version; }); - }; -} diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 678bf11a618f1..829c6a14edf64 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -185,23 +185,7 @@ || (lib.versionAtLeast version "9.8" && lib.versionOlder version "9.11"); in - # 2025-01-16: unix >= 2.8.6.0 is unaffected which is shipped by GHC 9.12.1, 9.10.2, 9.8.4 and 9.6.7 - lib.optionals (lib.versionOlder version "9.6.7") [ - # Determine size of time related types using hsc2hs instead of assuming CLong. - # Prevents failures when e.g. stat(2)ing on 32bit systems with 64bit time_t etc. - # https://github.com/haskell/ghcup-hs/issues/1107 - # https://gitlab.haskell.org/ghc/ghc/-/issues/25095 - # Note that in normal situations this shouldn't be the case since nixpkgs - # doesn't set -D_FILE_OFFSET_BITS=64 and friends (yet). - (fetchpatch { - name = "unix-fix-ctimeval-size-32-bit.patch"; - url = "https://github.com/haskell/unix/commit/8183e05b97ce870dd6582a3677cc82459ae566ec.patch"; - sha256 = "17q5yyigqr5kxlwwzb95sx567ysfxlw6bp3j4ji20lz0947aw6gv"; - stripLen = 1; - extraPrefix = "libraries/unix/"; - }) - ] - ++ lib.optionals (lib.versionOlder version "9.8") [ + lib.optionals (lib.versionOlder version "9.8") [ # Fix unlit being installed under a different name than is used in the # settings file: https://gitlab.haskell.org/ghc/ghc/-/issues/23317 (fetchpatch { diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 5190ca26801c4..58b0665ba647a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -15,7 +15,6 @@ let # Binary GHCs "ghc902Binary" "ghc924Binary" - "ghc963Binary" "ghc984Binary" ]; @@ -80,8 +79,6 @@ in ghc924Binary = callPackage ../development/compilers/ghc/9.2.4-binary.nix { }; - ghc963Binary = callPackage ../development/compilers/ghc/9.6.3-binary.nix { }; - ghc984Binary = callPackage ../development/compilers/ghc/9.8.4-binary.nix { }; ghc948 = callPackage ../development/compilers/ghc/9.4.8.nix { @@ -108,11 +105,7 @@ in }; ghc96 = compiler.ghc967; ghc984 = callPackage ../development/compilers/ghc/9.8.4.nix { - bootPkgs = - if stdenv.buildPlatform.isAarch64 && stdenv.buildPlatform.isMusl then - bb.packages.ghc984Binary - else - bb.packages.ghc963Binary; + bootPkgs = if stdenv.buildPlatform.isi686 then bb.packages.ghc948 else bb.packages.ghc984Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and @@ -122,16 +115,7 @@ in }; ghc98 = compiler.ghc984; ghc9102 = callPackage ../development/compilers/ghc/9.10.2.nix { - bootPkgs = - if stdenv.buildPlatform.isDarwin then - # it seems like the GHC 9.6.* bindists are built with a different - # toolchain than we are using (which I'm guessing from the fact - # that 9.6.4 bindists pass linker flags our ld doesn't support). - # With both 9.6.3 and 9.6.4 binary it is impossible to link against - # the clock package (probably a hsc2hs problem). - bb.packages.ghc967 - else - bb.packages.ghc963Binary; + bootPkgs = if stdenv.buildPlatform.isi686 then bb.packages.ghc967 else bb.packages.ghc984Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and @@ -140,16 +124,7 @@ in inherit buildTargetLlvmPackages llvmPackages; }; ghc9103 = callPackage ../development/compilers/ghc/9.10.3.nix { - bootPkgs = - if stdenv.buildPlatform.isDarwin then - # it seems like the GHC 9.6.* bindists are built with a different - # toolchain than we are using (which I'm guessing from the fact - # that 9.6.4 bindists pass linker flags our ld doesn't support). - # With both 9.6.3 and 9.6.4 binary it is impossible to link against - # the clock package (probably a hsc2hs problem). - bb.packages.ghc967 - else - bb.packages.ghc963Binary; + bootPkgs = if stdenv.buildPlatform.isi686 then bb.packages.ghc967 else bb.packages.ghc984Binary; inherit (buildPackages.python3Packages) sphinx; # Need to use apple's patched xattr until # https://github.com/xattr/xattr/issues/44 and @@ -236,12 +211,6 @@ in compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; packageSetConfig = bootstrapPackageSet; }; - ghc963Binary = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc963Binary; - ghc = bh.compiler.ghc963Binary; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; - packageSetConfig = bootstrapPackageSet; - }; ghc984Binary = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc984Binary; ghc = bh.compiler.ghc984Binary;