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 d1824ce680fd..000000000000 --- 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 effbdec32ee1..dff6daf681ac 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 krank:ignore-line diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 324dd4c6ea84..3f0a1eb35dab 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -112,21 +112,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; - inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook; - inherit buildTargetLlvmPackages llvmPackages; - }; ghc9102 = callPackage ../development/compilers/ghc/9.10.2.nix { bootPkgs = if stdenv.buildPlatform.isDarwin then @@ -257,11 +242,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 22ae9de4c624..aa0c3407873c 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 @@ -551,14 +550,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 @@ -586,7 +583,6 @@ let compilerNames.ghc967 ]; weeder = lib.subtractLists [ - compilerNames.ghc9101 compilerNames.ghc9102 compilerNames.ghc9103 compilerNames.ghc9122