Skip to content

haskell.compiler.ghc{947,964,965,966,981,982,983}: drop #440659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wolfgangwalther merged 8 commits into from
Sep 6, 2025
Merged

haskell.compiler.ghc{947,964,965,966,981,982,983}: drop #440659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b03a4b0
haskell.compiler.ghc946: remove left-over patch
wolfgangwalther Sep 1, 2025
5ebeca3
haskell.compiler.ghc947: drop
wolfgangwalther Sep 1, 2025
7b693d9
haskell.compiler.ghc964: drop
wolfgangwalther Sep 1, 2025
2a85d5e
haskell.compiler.ghc965: drop
wolfgangwalther Sep 1, 2025
cfa7d4d
haskell.compiler.ghc966: drop
wolfgangwalther Sep 1, 2025
4405a6a
haskell.compiler.ghc981: drop
wolfgangwalther Sep 1, 2025
d5e27fa
haskell.compiler.ghc982: drop
wolfgangwalther Sep 1, 2025
0c5d7ad
haskell.compiler.ghc983: drop
wolfgangwalther Sep 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions pkgs/development/compilers/ghc/9.4.6-bytestring-posix-source.patch
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions pkgs/development/compilers/ghc/9.4.7.nix
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions pkgs/development/compilers/ghc/9.6.4.nix
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions pkgs/development/compilers/ghc/9.6.5.nix
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions pkgs/development/compilers/ghc/9.6.6.nix
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions pkgs/development/compilers/ghc/9.8.1.nix
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions pkgs/development/compilers/ghc/9.8.2.nix
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions pkgs/development/compilers/ghc/9.8.3.nix
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions pkgs/development/compilers/ghc/common-hadrian.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,17 +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.1"
"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";
Expand Down
6 changes: 0 additions & 6 deletions pkgs/development/compilers/ghc/common-make-native-bignum.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
13 changes: 0 additions & 13 deletions pkgs/development/tools/haskell/hadrian/hadrian-9.8.1-allow-Cabal-3.10.patch
View file
Open in desktop

This file was deleted.

162 changes: 0 additions & 162 deletions pkgs/top-level/haskell-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -215,60 +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.
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.
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.
Expand All @@ -288,60 +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.
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.
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
Expand Down Expand Up @@ -561,11 +434,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;
Expand All @@ -577,42 +445,12 @@ 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;
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;
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;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.8.x.nix { };
};
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;
Expand Down
10 changes: 1 addition & 9 deletions pkgs/top-level/release-haskell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,9 @@ let
ghc8107
ghc902
ghc928
ghc947
ghc948
ghc963
ghc964
ghc965
ghc966
ghc967
ghc981
ghc982
ghc983
ghc984
ghc9101
ghc9102
Expand Down Expand Up @@ -590,7 +583,6 @@ let
compilerNames.ghc8107
compilerNames.ghc902
compilerNames.ghc928
compilerNames.ghc947
compilerNames.ghc948
] released;
Cabal_3_10_3_0 = lib.subtractLists [
Expand Down Expand Up @@ -650,7 +642,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
Expand Down
Loading