gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Wolfgang Walther
2025-09-06 13:04:18 +00:00
committed by GitHub
parent 413fda7434 0c5d7ad8e0
commit 6cd29a4785
13 changed files with 1 additions and 246 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/compilers/ghc/9.4.6-bytestring-posix-source.patch
-15
View File
@@ -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 <stdbool.h>
#include <stddef.h>
#include <stdint.h>
pkgs/development/compilers/ghc/9.4.7.nix
-6
View File
@@ -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";
}
pkgs/development/compilers/ghc/9.6.4.nix
-4
View File
@@ -1,4 +0,0 @@
import ./common-hadrian.nix {
version = "9.6.4";
sha256 = "10bf25b8b07174fdd9868b5c0c56c17c0ef1edcb6247b4b864be933651bfd4c0";
}
pkgs/development/compilers/ghc/9.6.5.nix
-4
View File
@@ -1,4 +0,0 @@
import ./common-hadrian.nix {
version = "9.6.5";
sha256 = "87b389924f98c1a26c205122757338c8dab33ad1fcf670faa22622742432b93c";
}
pkgs/development/compilers/ghc/9.6.6.nix
-4
View File
@@ -1,4 +0,0 @@
import ./common-hadrian.nix {
version = "9.6.6";
sha256 = "008f7a04d89ad10baae6486c96645d7d726aaac7e1476199f6dd86c6bd9977ad";
}
pkgs/development/compilers/ghc/9.8.1.nix
-4
View File
@@ -1,4 +0,0 @@
import ./common-hadrian.nix {
version = "9.8.1";
sha256 = "b2f8ed6b7f733797a92436f4ff6e088a520913149c9a9be90465b40ad1f20751";
}
pkgs/development/compilers/ghc/9.8.2.nix
-4
View File
@@ -1,4 +0,0 @@
import ./common-hadrian.nix {
version = "9.8.2";
sha256 = "4vt6fddGEjfSLoNlqD7dnhp30uFdBF85RTloRah3gck=";
}
pkgs/development/compilers/ghc/9.8.3.nix
-4
View File
@@ -1,4 +0,0 @@
import ./common-hadrian.nix {
version = "9.8.3";
sha256 = "99e40d729ec8831a633b75fd85d65dd10e31a0133dec9d198d686a273679ab70";
}
pkgs/development/compilers/ghc/common-hadrian.nix
-11
View File
@@ -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";
pkgs/development/compilers/ghc/common-make-native-bignum.nix
-6
View File
@@ -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.
pkgs/development/tools/haskell/hadrian/hadrian-9.8.1-allow-Cabal-3.10.patch
-13
View File
@@ -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
pkgs/top-level/haskell-packages.nix
-162
View File
@@ -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
@@ -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.
@@ -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
@@ -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;
@@ -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;
pkgs/top-level/release-haskell.nix
+1 -9
View File
@@ -66,16 +66,9 @@ let
ghc8107
ghc902
ghc928
ghc947
ghc948
ghc963
ghc964
ghc965
ghc966
ghc967
ghc981
ghc982
ghc983
ghc984
ghc9101
ghc9102
@@ -590,7 +583,6 @@ let
compilerNames.ghc8107
compilerNames.ghc902
compilerNames.ghc928
compilerNames.ghc947
compilerNames.ghc948
] released;
Cabal_3_10_3_0 = lib.subtractLists [
@@ -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