From b03a4b0b5183ea76c249847c82f241c07d7ce873 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 1 Sep 2025 22:03:41 +0200 Subject: [PATCH 1/8] haskell.compiler.ghc946: remove left-over patch This was specific to GHC 9.4.6 and should have been dropped in 95c179f9fbe0178a6d96cf0c1e3e06566d90aa29 as well. (cherry picked from commit 7edc323045c293ae5e8c22db42bc17771724e8e8) --- .../ghc/9.4.6-bytestring-posix-source.patch | 15 --------------- .../compilers/ghc/common-make-native-bignum.nix | 6 ------ 2 files changed, 21 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/9.4.6-bytestring-posix-source.patch diff --git a/pkgs/development/compilers/ghc/9.4.6-bytestring-posix-source.patch b/pkgs/development/compilers/ghc/9.4.6-bytestring-posix-source.patch deleted file mode 100644 index 644ab295191fe..0000000000000 --- a/pkgs/development/compilers/ghc/9.4.6-bytestring-posix-source.patch +++ /dev/null @@ -1,15 +0,0 @@ -Make sure that the appropriate feature flags are set when -Rts.h is included, so that clockid_t is defined. - -diff --git a/cbits/is-valid-utf8.c b/cbits/is-valid-utf8.c -index 01b3b41..c69596a 100644 ---- a/libraries/bytestring/cbits/is-valid-utf8.c -+++ b/libraries/bytestring/cbits/is-valid-utf8.c -@@ -29,6 +29,7 @@ SUCH DAMAGE. - */ - #pragma GCC push_options - #pragma GCC optimize("-O2") -+#include "rts/PosixSource.h" - #include - #include - #include diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix index 9b9d386ecdb17..b9d0b58832d3d 100644 --- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix +++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix @@ -410,12 +410,6 @@ stdenv.mkDerivation ( }) ] - ++ lib.optionals (version == "9.4.6") [ - # Work around a type not being defined when including Rts.h in bytestring's cbits - # due to missing feature macros. See https://gitlab.haskell.org/ghc/ghc/-/issues/23810. - ./9.4.6-bytestring-posix-source.patch - ] - ++ lib.optionals (stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64) [ # Prevent the paths module from emitting symbols that we don't use # when building with separate outputs. From 5ebeca32d419ecfa76324cc3f254751d2d0ec0e5 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 1 Sep 2025 22:02:53 +0200 Subject: [PATCH 2/8] haskell.compiler.ghc947: drop Latest 9.4.x minor release is 9.4.8, which is also in Stackage 21.25. Thus, dropping according to the GHC Deprecation Policy. (cherry picked from commit a24e99ea74e19eed447af06037fd499fd4a4c122) --- pkgs/development/compilers/ghc/9.4.7.nix | 6 ------ pkgs/top-level/haskell-packages.nix | 24 ------------------------ pkgs/top-level/release-haskell.nix | 2 -- 3 files changed, 32 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/9.4.7.nix diff --git a/pkgs/development/compilers/ghc/9.4.7.nix b/pkgs/development/compilers/ghc/9.4.7.nix deleted file mode 100644 index 2be8c9f092fb3..0000000000000 --- a/pkgs/development/compilers/ghc/9.4.7.nix +++ /dev/null @@ -1,6 +0,0 @@ -# DO NOT port this expression to hadrian. It is not possible to build a GHC -# cross compiler with 9.4.* and hadrian. -import ./common-make-native-bignum.nix { - version = "9.4.7"; - sha256 = "06775a52b4d13ac09edc6dabc299fd11e59d8886bbcae450af367baee2684c8f"; -} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 38a85aa064f14..0193d81cca4cc 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -158,25 +158,6 @@ in llvmPackages = pkgs.llvmPackages_12; }; ghc92 = compiler.ghc928; - ghc947 = callPackage ../development/compilers/ghc/9.4.7.nix { - bootPkgs = - # Building with 9.2 is broken due to - # https://gitlab.haskell.org/ghc/ghc/-/issues/21914 - - # No suitable bindists for powerpc64le - if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then - bb.packages.ghc902 - else - bb.packages.ghc902Binary; - 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; - # Support range >= 10 && < 14 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12; - llvmPackages = pkgs.llvmPackages_12; - }; ghc948 = callPackage ../development/compilers/ghc/9.4.8.nix { bootPkgs = # Building with 9.2 is broken due to @@ -561,11 +542,6 @@ in compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { }; }; ghc92 = packages.ghc928; - ghc947 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc947; - ghc = bh.compiler.ghc947; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { }; - }; ghc948 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc948; ghc = bh.compiler.ghc948; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 13d5f02fbae6c..de24217db4c4f 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -66,7 +66,6 @@ let ghc8107 ghc902 ghc928 - ghc947 ghc948 ghc963 ghc964 @@ -590,7 +589,6 @@ let compilerNames.ghc8107 compilerNames.ghc902 compilerNames.ghc928 - compilerNames.ghc947 compilerNames.ghc948 ] released; Cabal_3_10_3_0 = lib.subtractLists [ From 7b693d97aa4b2597f8e1f5aef7dde9aed9e18be4 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 1 Sep 2025 22:05:34 +0200 Subject: [PATCH 3/8] haskell.compiler.ghc964: drop Latest 9.6.x minor release is 9.6.7, which is also in Stackage 22.44. Thus, dropping according to the GHC Deprecation Policy. (cherry picked from commit 78f24837ced61196d7b18073b3bf1a7bbf14773f) --- pkgs/development/compilers/ghc/9.6.4.nix | 4 ---- pkgs/top-level/haskell-packages.nix | 23 ----------------------- pkgs/top-level/release-haskell.nix | 1 - 3 files changed, 28 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/9.6.4.nix diff --git a/pkgs/development/compilers/ghc/9.6.4.nix b/pkgs/development/compilers/ghc/9.6.4.nix deleted file mode 100644 index 40a2261180e21..0000000000000 --- a/pkgs/development/compilers/ghc/9.6.4.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common-hadrian.nix { - version = "9.6.4"; - sha256 = "10bf25b8b07174fdd9868b5c0c56c17c0ef1edcb6247b4b864be933651bfd4c0"; -} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 0193d81cca4cc..20127feb9f895 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -196,24 +196,6 @@ in buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; llvmPackages = pkgs.llvmPackages_15; }; - ghc964 = callPackage ../development/compilers/ghc/9.6.4.nix { - bootPkgs = - # For GHC 9.2 no armv7l bindists are available. - if stdenv.buildPlatform.isAarch32 then - bb.packages.ghc928 - else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then - bb.packages.ghc928 - else - bb.packages.ghc924Binary; - 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; - # Support range >= 11 && < 16 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; - llvmPackages = pkgs.llvmPackages_15; - }; ghc965 = callPackage ../development/compilers/ghc/9.6.5.nix { bootPkgs = # For GHC 9.2 no armv7l bindists are available. @@ -553,11 +535,6 @@ in ghc = bh.compiler.ghc963; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; }; - ghc964 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc964; - ghc = bh.compiler.ghc964; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; - }; ghc965 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc965; ghc = bh.compiler.ghc965; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index de24217db4c4f..7224fa1ce1c41 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -68,7 +68,6 @@ let ghc928 ghc948 ghc963 - ghc964 ghc965 ghc966 ghc967 From 2a85d5e998565f1452785bd00fc543c437b7422b Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 1 Sep 2025 22:06:43 +0200 Subject: [PATCH 4/8] haskell.compiler.ghc965: drop Latest 9.6.x minor release is 9.6.7, which is also in Stackage 22.44. Thus, dropping according to the GHC Deprecation Policy. (cherry picked from commit ef2d9b7ffad0facb5e39278f538b050e357c2086) --- pkgs/development/compilers/ghc/9.6.5.nix | 4 ---- pkgs/top-level/haskell-packages.nix | 23 ----------------------- pkgs/top-level/release-haskell.nix | 1 - 3 files changed, 28 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/9.6.5.nix diff --git a/pkgs/development/compilers/ghc/9.6.5.nix b/pkgs/development/compilers/ghc/9.6.5.nix deleted file mode 100644 index 0f1ac5022f8bf..0000000000000 --- a/pkgs/development/compilers/ghc/9.6.5.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common-hadrian.nix { - version = "9.6.5"; - sha256 = "87b389924f98c1a26c205122757338c8dab33ad1fcf670faa22622742432b93c"; -} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 20127feb9f895..a11f94751c9ed 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -196,24 +196,6 @@ in buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; llvmPackages = pkgs.llvmPackages_15; }; - ghc965 = callPackage ../development/compilers/ghc/9.6.5.nix { - bootPkgs = - # For GHC 9.2 no armv7l bindists are available. - if stdenv.buildPlatform.isAarch32 then - bb.packages.ghc928 - else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then - bb.packages.ghc928 - else - bb.packages.ghc924Binary; - 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; - # Support range >= 11 && < 16 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; - llvmPackages = pkgs.llvmPackages_15; - }; ghc966 = callPackage ../development/compilers/ghc/9.6.6.nix { bootPkgs = # For GHC 9.2 no armv7l bindists are available. @@ -535,11 +517,6 @@ in ghc = bh.compiler.ghc963; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; }; - ghc965 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc965; - ghc = bh.compiler.ghc965; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; - }; ghc966 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc966; ghc = bh.compiler.ghc966; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 7224fa1ce1c41..45acb6797aaa1 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -68,7 +68,6 @@ let ghc928 ghc948 ghc963 - ghc965 ghc966 ghc967 ghc981 From cfa7d4d560265fc7d880108d0f416a8f028627ab Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 1 Sep 2025 22:07:27 +0200 Subject: [PATCH 5/8] haskell.compiler.ghc966: drop Latest 9.6.x minor release is 9.6.7, which is also in Stackage 22.44. Thus, dropping according to the GHC Deprecation Policy. (cherry picked from commit a8920172f0ee823eb9e2371a24c600d0f9f599fc) --- pkgs/development/compilers/ghc/9.6.6.nix | 4 ---- pkgs/top-level/haskell-packages.nix | 23 ----------------------- pkgs/top-level/release-haskell.nix | 3 +-- 3 files changed, 1 insertion(+), 29 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/9.6.6.nix diff --git a/pkgs/development/compilers/ghc/9.6.6.nix b/pkgs/development/compilers/ghc/9.6.6.nix deleted file mode 100644 index 60854685f1e13..0000000000000 --- a/pkgs/development/compilers/ghc/9.6.6.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common-hadrian.nix { - version = "9.6.6"; - sha256 = "008f7a04d89ad10baae6486c96645d7d726aaac7e1476199f6dd86c6bd9977ad"; -} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a11f94751c9ed..79db70d190051 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -196,24 +196,6 @@ in buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; llvmPackages = pkgs.llvmPackages_15; }; - ghc966 = callPackage ../development/compilers/ghc/9.6.6.nix { - bootPkgs = - # For GHC 9.2 no armv7l bindists are available. - if stdenv.buildPlatform.isAarch32 then - bb.packages.ghc928 - else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then - bb.packages.ghc928 - else - bb.packages.ghc924Binary; - 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; - # Support range >= 11 && < 16 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; - llvmPackages = pkgs.llvmPackages_15; - }; ghc967 = callPackage ../development/compilers/ghc/9.6.7.nix { bootPkgs = # For GHC 9.2 no armv7l bindists are available. @@ -517,11 +499,6 @@ in ghc = bh.compiler.ghc963; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; }; - ghc966 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc966; - ghc = bh.compiler.ghc966; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; - }; ghc967 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc967; ghc = bh.compiler.ghc967; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 45acb6797aaa1..329f9b4483863 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -68,7 +68,6 @@ let ghc928 ghc948 ghc963 - ghc966 ghc967 ghc981 ghc982 @@ -646,7 +645,7 @@ let semaphore-compat = [ # Compiler < 9.8 don't have the semaphore-compat core package, but # requires unix >= 2.8.1.0 which implies GHC >= 9.6 for us. - compilerNames.ghc966 + compilerNames.ghc967 ]; weeder = lib.subtractLists [ compilerNames.ghc9101 From 4405a6a81cb939326ba277edef80e7b20531d514 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 1 Sep 2025 22:08:23 +0200 Subject: [PATCH 6/8] haskell.compiler.ghc981: drop Latest 9.8.x minor release is 9.8.4, which is also in Stackage 23.28. Thus, dropping according to the GHC Deprecation Policy. (cherry picked from commit 50b634db21784896375bcdbd6fba8009772ed9c8) --- pkgs/development/compilers/ghc/9.8.1.nix | 4 ---- .../compilers/ghc/common-hadrian.nix | 1 - pkgs/top-level/haskell-packages.nix | 23 ------------------- pkgs/top-level/release-haskell.nix | 1 - 4 files changed, 29 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/9.8.1.nix diff --git a/pkgs/development/compilers/ghc/9.8.1.nix b/pkgs/development/compilers/ghc/9.8.1.nix deleted file mode 100644 index eed5bd67f5119..0000000000000 --- a/pkgs/development/compilers/ghc/9.8.1.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common-hadrian.nix { - version = "9.8.1"; - sha256 = "b2f8ed6b7f733797a92436f4ff6e088a520913149c9a9be90465b40ad1f20751"; -} diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 7d652f4f81118..2702953158b9a 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -279,7 +279,6 @@ ++ lib.optionals (lib.elem version [ - "9.8.1" "9.8.2" ]) [ diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 79db70d190051..daf5d2d8a6317 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -215,24 +215,6 @@ in llvmPackages = pkgs.llvmPackages_15; }; ghc96 = compiler.ghc967; - ghc981 = callPackage ../development/compilers/ghc/9.8.1.nix { - bootPkgs = - # For GHC 9.6 no armv7l bindists are available. - if stdenv.buildPlatform.isAarch32 then - bb.packages.ghc963 - else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then - bb.packages.ghc963 - 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; - # Support range >= 11 && < 16 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; - llvmPackages = pkgs.llvmPackages_15; - }; ghc982 = callPackage ../development/compilers/ghc/9.8.2.nix { bootPkgs = # For GHC 9.6 no armv7l bindists are available. @@ -505,11 +487,6 @@ in compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; }; ghc96 = packages.ghc967; - ghc981 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc981; - ghc = bh.compiler.ghc981; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { }; - }; ghc982 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc982; ghc = bh.compiler.ghc982; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 329f9b4483863..269e2c18d16fb 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -69,7 +69,6 @@ let ghc948 ghc963 ghc967 - ghc981 ghc982 ghc983 ghc984 From d5e27faf8e25ef5b0bed36b9b473f849b8f36322 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 1 Sep 2025 22:08:51 +0200 Subject: [PATCH 7/8] haskell.compiler.ghc982: drop Latest 9.8.x minor release is 9.8.4, which is also in Stackage 23.28. Thus, dropping according to the GHC Deprecation Policy. (cherry picked from commit 1874b16d387f9009b1ff28d9123b3ad74dcff669) --- pkgs/development/compilers/ghc/9.8.2.nix | 4 ---- .../compilers/ghc/common-hadrian.nix | 10 -------- .../hadrian-9.8.1-allow-Cabal-3.10.patch | 13 ----------- pkgs/top-level/haskell-packages.nix | 23 ------------------- pkgs/top-level/release-haskell.nix | 1 - 5 files changed, 51 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/9.8.2.nix delete mode 100644 pkgs/development/tools/haskell/hadrian/hadrian-9.8.1-allow-Cabal-3.10.patch diff --git a/pkgs/development/compilers/ghc/9.8.2.nix b/pkgs/development/compilers/ghc/9.8.2.nix deleted file mode 100644 index da29023b2bfa5..0000000000000 --- a/pkgs/development/compilers/ghc/9.8.2.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common-hadrian.nix { - version = "9.8.2"; - sha256 = "4vt6fddGEjfSLoNlqD7dnhp30uFdBF85RTloRah3gck="; -} diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix index 2702953158b9a..0cb9ea8b866e2 100644 --- a/pkgs/development/compilers/ghc/common-hadrian.nix +++ b/pkgs/development/compilers/ghc/common-hadrian.nix @@ -274,16 +274,6 @@ ../../tools/haskell/hadrian/disable-hyperlinked-source-extra-args.patch ) ] - # Incorrect bounds on Cabal in hadrian - # https://gitlab.haskell.org/ghc/ghc/-/issues/24100 - ++ - lib.optionals - (lib.elem version [ - "9.8.2" - ]) - [ - ../../tools/haskell/hadrian/hadrian-9.8.1-allow-Cabal-3.10.patch - ] ++ lib.optionals (lib.versionAtLeast version "9.8" && lib.versionOlder version "9.12") [ (fetchpatch { name = "enable-ignore-build-platform-mismatch.patch"; diff --git a/pkgs/development/tools/haskell/hadrian/hadrian-9.8.1-allow-Cabal-3.10.patch b/pkgs/development/tools/haskell/hadrian/hadrian-9.8.1-allow-Cabal-3.10.patch deleted file mode 100644 index eccf1a987d06a..0000000000000 --- a/pkgs/development/tools/haskell/hadrian/hadrian-9.8.1-allow-Cabal-3.10.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/hadrian.cabal b/hadrian.cabal -index 70fded11aa..3893537f05 100644 ---- a/hadrian/hadrian.cabal -+++ b/hadrian/hadrian.cabal -@@ -150,7 +150,7 @@ executable hadrian - , TypeOperators - other-extensions: MultiParamTypeClasses - , TypeFamilies -- build-depends: Cabal >= 3.2 && < 3.9 -+ build-depends: Cabal >= 3.2 && < 3.11 - , base >= 4.11 && < 5 - , bytestring >= 0.10 && < 0.13 - , containers >= 0.5 && < 0.7 diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index daf5d2d8a6317..c3a48c1e3b995 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -215,24 +215,6 @@ in llvmPackages = pkgs.llvmPackages_15; }; ghc96 = compiler.ghc967; - ghc982 = callPackage ../development/compilers/ghc/9.8.2.nix { - bootPkgs = - # For GHC 9.6 no armv7l bindists are available. - if stdenv.buildPlatform.isAarch32 then - bb.packages.ghc963 - else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then - bb.packages.ghc963 - 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; - # Support range >= 11 && < 16 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; - llvmPackages = pkgs.llvmPackages_15; - }; ghc983 = callPackage ../development/compilers/ghc/9.8.3.nix { bootPkgs = # For GHC 9.6 no armv7l bindists are available. @@ -487,11 +469,6 @@ in compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; }; ghc96 = packages.ghc967; - ghc982 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc982; - ghc = bh.compiler.ghc982; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { }; - }; ghc983 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc983; ghc = bh.compiler.ghc983; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 269e2c18d16fb..2ff55cefb8a2c 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -69,7 +69,6 @@ let ghc948 ghc963 ghc967 - ghc982 ghc983 ghc984 ghc9101 From 0c5d7ad8e03d80a510692e5f861ba7e274d42b61 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Mon, 1 Sep 2025 22:09:26 +0200 Subject: [PATCH 8/8] haskell.compiler.ghc983: drop Latest 9.8.x minor release is 9.8.4, which is also in Stackage 23.28. Thus, dropping according to the GHC Deprecation Policy. (cherry picked from commit 0943cd9574fa533ec39da3ed435b9fe225934e22) --- pkgs/development/compilers/ghc/9.8.3.nix | 4 ---- pkgs/top-level/haskell-packages.nix | 23 ----------------------- pkgs/top-level/release-haskell.nix | 1 - 3 files changed, 28 deletions(-) delete mode 100644 pkgs/development/compilers/ghc/9.8.3.nix diff --git a/pkgs/development/compilers/ghc/9.8.3.nix b/pkgs/development/compilers/ghc/9.8.3.nix deleted file mode 100644 index 9f850708265f2..0000000000000 --- a/pkgs/development/compilers/ghc/9.8.3.nix +++ /dev/null @@ -1,4 +0,0 @@ -import ./common-hadrian.nix { - version = "9.8.3"; - sha256 = "99e40d729ec8831a633b75fd85d65dd10e31a0133dec9d198d686a273679ab70"; -} diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c3a48c1e3b995..1cb983a49d418 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -215,24 +215,6 @@ in llvmPackages = pkgs.llvmPackages_15; }; ghc96 = compiler.ghc967; - ghc983 = callPackage ../development/compilers/ghc/9.8.3.nix { - bootPkgs = - # For GHC 9.6 no armv7l bindists are available. - if stdenv.buildPlatform.isAarch32 then - bb.packages.ghc963 - else if stdenv.buildPlatform.isPower64 && stdenv.buildPlatform.isLittleEndian then - bb.packages.ghc963 - 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; - # Support range >= 11 && < 16 - buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_15; - llvmPackages = pkgs.llvmPackages_15; - }; ghc984 = callPackage ../development/compilers/ghc/9.8.4.nix { bootPkgs = if stdenv.buildPlatform.isAarch64 && stdenv.buildPlatform.isMusl then @@ -469,11 +451,6 @@ in compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.6.x.nix { }; }; ghc96 = packages.ghc967; - ghc983 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc983; - ghc = bh.compiler.ghc983; - compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { }; - }; ghc984 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc984; ghc = bh.compiler.ghc984; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index 2ff55cefb8a2c..30aad20b6de3c 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -69,7 +69,6 @@ let ghc948 ghc963 ghc967 - ghc983 ghc984 ghc9101 ghc9102