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

Merge pull request #187575 from NixOS/haskell-updates

Browse Source 
haskellPackages: update stackage and hackage
This commit is contained in:
Ellie Hermaszewska 2022-08-29 10:47:06 +08:00 committed by GitHub
commit ab0f52080f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
21 changed files with 1973 additions and 1208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/data/misc/hackage/pin.json
View File

@ -1,6 +1,6 @@
{
"commit": "eb862a59277fd86ad3138e9f25e793f0fe0364ba",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/eb862a59277fd86ad3138e9f25e793f0fe0364ba.tar.gz",
"sha256": "10agwlxzp76lnp4d6zncvjgv78hr3rss3j3i3bfpsn3i7af1qcw8",
"msg": "Update from Hackage at 2022-08-09T06:14:32Z"
"commit": "3c1ad4d78a1d5fc29c5e169f5ba9f82bc580d2f0",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3c1ad4d78a1d5fc29c5e169f5ba9f82bc580d2f0.tar.gz",
"sha256": "0cd24ibv0i2zq0vvawafm0hqjgv70flmna84g320h5jy3lc0qrv4",
"msg": "Update from Hackage at 2022-08-20T06:29:36Z"
}

16
pkgs/development/compilers/ghc/9.4.1.nix → pkgs/development/compilers/ghc/9.4.2.nix
View File

@ -1,4 +1,4 @@
# Preliminary GHC 9.4.1 expression using the make build system.
# Preliminary GHC 9.4.2 expression using the make build system.
# TODO(@sternenseemann): port to hadrian, so we are prepared for 9.6
# where make support will be dropped.
{ lib, stdenv, pkgsBuildTarget, pkgsHostTarget, targetPackages
@ -177,12 +177,12 @@ assert buildTargetLlvmPackages.llvm == llvmPackages.llvm;
assert stdenv.targetPlatform.isDarwin -> buildTargetLlvmPackages.clang == llvmPackages.clang;
stdenv.mkDerivation (rec {
version = "9.4.1";
version = "9.4.2";
pname = "${targetPrefix}ghc${variantSuffix}";
src = fetchurl {
url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
sha256 = "sha256-y/7UZAvfAl4zulVDPa+M32mPTgSZrnqADd5EqC5zluM=";
sha256 = "7227ef3b5e15a0d70b8f1a43aec32867e2a9b2d857cc0ed556aeed172d4db3a5";
};
enableParallelBuilding = true;
@ -190,16 +190,6 @@ stdenv.mkDerivation (rec {
outputs = [ "out" "doc" ];
patches = [
# add missing profiling targets in make build system
(fetchpatch {
name = "ghc-9.4.1-fix-bootstrapping-with-profiling-1.patch";
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/47b4fea08bd0ef1476b8d134c7baf06157fe5fa5.diff";
sha256 = "sha256-oYQWg9cK0RNL9I+kap8KER+iiKim73zG6URQs8BeAXU=";
})
./ghc-9.4.1-fix-bootstrapping-with-profiling-2.patch
];
postPatch = "patchShebangs .";
# GHC needs the locale configured during the Haddock phase.

24
pkgs/development/compilers/ghc/backport-dylib-command-size-limit.patch
View File

@ -1,24 +0,0 @@
diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index acd0d61..3e83c15 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -1916,6 +1916,7 @@ linkBinary' staticLink dflags o_files dep_packages = do
++ pkg_framework_opts
++ debug_opts
++ thread_opts
+ ++ (if (platformOS platform `elem` [OSDarwin]) then [ "-Wl,-dead_strip_dylibs" ] else [])
))
exeFileName :: Bool -> DynFlags -> FilePath
diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs
index 1ab5b13..2ebbf51 100644
--- a/compiler/main/SysTools.hs
+++ b/compiler/main/SysTools.hs
@@ -1737,6 +1737,7 @@ linkDynLib dflags0 o_files dep_packages
++ map Option pkg_lib_path_opts
++ map Option pkg_link_opts
++ map Option pkg_framework_opts
+ ++ [ Option "-Wl,-dead_strip_dylibs" ]
)
OSiOS -> throwGhcExceptionIO (ProgramError "dynamic libraries are not supported on iOS target")
_ -> do

18
pkgs/development/compilers/ghc/ghc-9.4.1-fix-bootstrapping-with-profiling-2.patch
View File

@ -1,18 +0,0 @@
diff --git a/ghc.mk b/ghc.mk
index dd65e7adfe..b91af56078 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -509,11 +509,13 @@ libraries/containers/containers/dist-install/build/Data/IntMap/Internal.o: libra
libraries/containers/containers/dist-install/build/Data/Graph.o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.hi
libraries/containers/containers/dist-install/build/Data/Set/Internal.o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.hi
libraries/containers/containers/dist-install/build/Data/IntSet/Internal.o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.hi
+libraries/containers/containers/dist-install/build/Data/Sequence/Internal.o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.hi
libraries/containers/containers/dist-install/build/Data/IntMap/Internal.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi
libraries/containers/containers/dist-install/build/Data/Graph.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi
libraries/containers/containers/dist-install/build/Data/Set/Internal.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi
libraries/containers/containers/dist-install/build/Data/IntSet/Internal.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi
+libraries/containers/containers/dist-install/build/Data/Sequence/Internal.p_o: libraries/template-haskell/dist-install/build/Language/Haskell/TH/Lib/Internal.p_hi
ifeq "$(BIGNUM_BACKEND)" "gmp"
GMP_ENABLED = YES

296
pkgs/development/compilers/ghc/issue-18549.patch
View File

@ -1,296 +0,0 @@
From fac083e7ac8a37b61a4082bbbca2848e52fd1bb2 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Sun, 9 Aug 2020 09:15:16 -0400
Subject: [PATCH] Revert "[linker/rtsSymbols] More linker symbols"
This reverts commit aa2e5863699306920513b216f337de09e29b5bb8.
---
rts/RtsSymbols.c | 224 ++++-------------------------------------------
1 file changed, 17 insertions(+), 207 deletions(-)
diff --git a/rts/RtsSymbols.c b/rts/RtsSymbols.c
index d10a6900db..b2f90a892d 100644
--- a/rts/RtsSymbols.c
+++ b/rts/RtsSymbols.c
@@ -58,6 +58,7 @@
SymI_HasProto(signal_handlers) \
SymI_HasProto(stg_sig_install) \
SymI_HasProto(rtsTimerSignal) \
+ SymI_HasProto(atexit) \
SymI_NeedsDataProto(nocldstop)
#endif
@@ -976,213 +977,29 @@
RTS_USER_SIGNALS_SYMBOLS \
RTS_INTCHAR_SYMBOLS
+
// 64-bit support functions in libgcc.a
-// See https://gcc.gnu.org/onlinedocs/gccint/Libgcc.html#Libgcc
-#define RTS_LIBGCC_SYMBOLS_32 \
- SymI_NeedsProto(__fixunsdfdi) \
- /* 4 The GCC low-level runtime library */\
- /* 4.1.1 Arithmetic functions */\
- /* SymI_NeedsProto(__ashlsi3) */\
- SymI_NeedsProto(__ashldi3) \
- /* SymI_NeedsProto(__ashlti3) */\
- /* These functions return the result of shifting a left by b bits. */\
- /* SymI_NeedsProto(__ashrsi3) */\
- SymI_NeedsProto(__ashrdi3) \
- /* SymI_NeedsProto(__ashrti3) */\
- /* These functions return the result of arithmetically shifting a right by b bits. */\
- /* SymI_NeedsProto(__divsi3) */\
- SymI_NeedsProto(__divdi3) \
- /* SymI_NeedsProto(__divti3) */\
- /* These functions return the quotient of the signed division of a and b. */\
- /* SymI_NeedsProto(__lshrsi3) */ \
- SymI_NeedsProto(__lshrdi3) \
- /* SymI_NeedsProto(__lshrti3) */ \
- /* These functions return the result of logically shifting a right by b bits. */\
- /* SymI_NeedsProto(__modsi3) */ \
- SymI_NeedsProto(__moddi3) \
- /* SymI_NeedsProto(__modti3) */ \
- /* These functions return the remainder of the signed division of a and b. */\
- /* SymI_NeedsProto(__mulsi3) */ \
- SymI_NeedsProto(__muldi3) \
- /* SymI_NeedsProto(__multi3) */ \
- /* These functions return the product of a and b. */\
- SymI_NeedsProto(__negdi2) \
- /* SymI_NeedsProto(__negti2) */ \
- /* These functions return the negation of a. */\
- /* SymI_NeedsProto(__udivsi3) */ \
- SymI_NeedsProto(__udivdi3) \
- /* SymI_NeedsProto(__udivti3) */ \
- /* These functions return the quotient of the unsigned division of a and b. */\
- SymI_NeedsProto(__udivmoddi4) \
- /* SymI_NeedsProto(__udivmodti4) */ \
- /* These functions calculate both the quotient and remainder of the unsigned division of a and b. The return value is the quotient, and the remainder is placed in variable pointed to by c. */\
- /* SymI_NeedsProto(__umodsi3) */ \
- SymI_NeedsProto(__umoddi3) \
- /* SymI_NeedsProto(__umodti3) */ \
- /* These functions return the remainder of the unsigned division of a and b. */\
- /* 4.1.2 Comparison functions */\
- /* The following functions implement integral comparisons. These functions implement a low-level compare, upon which the higher level comparison operators (such as less than and greater than or equal to) can be constructed. The returned values lie in the range zero to two, to allow the high-level operators to be implemented by testing the returned result using either signed or unsigned comparison. */\
- SymI_NeedsProto(__cmpdi2) \
- /* SymI_NeedsProto(__cmpti2) */ \
- /* These functions perform a signed comparison of a and b. If a is less than b, they return 0; if a is greater than b, they return 2; and if a and b are equal they return 1. */\
- SymI_NeedsProto(__ucmpdi2) \
- /* SymI_NeedsProto(__ucmpti2) */ \
- /* These functions perform an unsigned comparison of a and b. If a is less than b, they return 0; if a is greater than b, they return 2; and if a and b are equal they return 1. */\
- /* 4.1.3 Trapping arithmetic functions */\
- /* The following functions implement trapping arithmetic. These functions call the libc function abort upon signed arithmetic overflow. */\
- SymI_NeedsProto(__absvsi2) \
- SymI_NeedsProto(__absvdi2) \
- /* These functions return the absolute value of a. */\
- /* SymI_NeedsProto(__addvsi3) */ \
- SymI_NeedsProto(__addvdi3) \
- /* These functions return the sum of a and b; that is a + b. */\
- /* SymI_NeedsProto(__mulvsi3) */ \
- SymI_NeedsProto(__mulvdi3) \
- /* The functions return the product of a and b; that is a * b. */\
- SymI_NeedsProto(__negvsi2) \
- SymI_NeedsProto(__negvdi2) \
- /* These functions return the negation of a; that is -a. */\
- /* SymI_NeedsProto(__subvsi3) */ \
- SymI_NeedsProto(__subvdi3) \
- /* These functions return the difference between b and a; that is a - b. */\
- /* 4.1.4 Bit operations */\
- SymI_NeedsProto(__clzsi2) \
- SymI_NeedsProto(__clzdi2) \
- /* SymI_NeedsProto(__clzti2) */ \
- /* These functions return the number of leading 0-bits in a, starting at the most significant bit position. If a is zero, the result is undefined. */\
- SymI_NeedsProto(__ctzsi2) \
- SymI_NeedsProto(__ctzdi2) \
- /* SymI_NeedsProto(__ctzti2) */ \
- /* These functions return the number of trailing 0-bits in a, starting at the least significant bit position. If a is zero, the result is undefined. */\
- SymI_NeedsProto(__ffsdi2) \
- /* SymI_NeedsProto(__ffsti2) */ \
- /* These functions return the index of the least significant 1-bit in a, or the value zero if a is zero. The least significant bit is index one. */\
- SymI_NeedsProto(__paritysi2) \
- SymI_NeedsProto(__paritydi2) \
- /* SymI_NeedsProto(__parityti2) */\
- /* These functions return the value zero if the number of bits set in a is even, and the value one otherwise. */\
- SymI_NeedsProto(__popcountsi2) \
- SymI_NeedsProto(__popcountdi2) \
- /* SymI_NeedsProto(__popcountti2) */ \
- /* These functions return the number of bits set in a. */\
- SymI_NeedsProto(__bswapsi2) \
- SymI_NeedsProto(__bswapdi2)
-#define RTS_LIBGCC_SYMBOLS_aarch32 \
- /* armv6l */\
- /* TODO: should check for __ARM_EABI__ */\
- SymI_NeedsProto(__aeabi_d2f) \
- SymI_NeedsProto(__aeabi_d2iz) \
- SymI_NeedsProto(__aeabi_d2lz) \
- SymI_NeedsProto(__aeabi_d2uiz) \
- SymI_NeedsProto(__aeabi_d2ulz) \
- SymI_NeedsProto(__aeabi_dadd) \
- SymI_NeedsProto(__aeabi_dcmpeq) \
- SymI_NeedsProto(__aeabi_dcmpge) \
- SymI_NeedsProto(__aeabi_dcmpgt) \
- SymI_NeedsProto(__aeabi_dcmple) \
- SymI_NeedsProto(__aeabi_dcmplt) \
- SymI_NeedsProto(__aeabi_dcmpun) \
- SymI_NeedsProto(__aeabi_ddiv) \
- SymI_NeedsProto(__aeabi_dmul) \
- SymI_NeedsProto(__aeabi_dneg) \
- SymI_NeedsProto(__aeabi_dsub) \
- SymI_NeedsProto(__aeabi_f2d) \
- SymI_NeedsProto(__aeabi_f2iz) \
- SymI_NeedsProto(__aeabi_f2lz) \
- SymI_NeedsProto(__aeabi_f2uiz) \
- SymI_NeedsProto(__aeabi_f2ulz) \
- SymI_NeedsProto(__aeabi_fadd) \
- SymI_NeedsProto(__aeabi_fcmpeq) \
- SymI_NeedsProto(__aeabi_fcmpge) \
- SymI_NeedsProto(__aeabi_fcmpgt) \
- SymI_NeedsProto(__aeabi_fcmple) \
- SymI_NeedsProto(__aeabi_fcmplt) \
- SymI_NeedsProto(__aeabi_fcmpun) \
- SymI_NeedsProto(__aeabi_fdiv) \
- SymI_NeedsProto(__aeabi_fmul) \
- SymI_NeedsProto(__aeabi_fneg) \
- SymI_NeedsProto(__aeabi_fsub) \
- SymI_NeedsProto(__aeabi_i2d) \
- SymI_NeedsProto(__aeabi_i2f) \
- SymI_NeedsProto(__aeabi_idiv) \
- SymI_NeedsProto(__aeabi_idivmod) \
- SymI_NeedsProto(__aeabi_l2d) \
- SymI_NeedsProto(__aeabi_l2f) \
- SymI_NeedsProto(__aeabi_lasr) \
- SymI_NeedsProto(__aeabi_lcmp) \
- SymI_NeedsProto(__aeabi_ldivmod) \
- SymI_NeedsProto(__aeabi_llsl) \
- SymI_NeedsProto(__aeabi_llsr) \
- SymI_NeedsProto(__aeabi_lmul) \
- SymI_NeedsProto(__aeabi_ui2d) \
- SymI_NeedsProto(__aeabi_ui2f) \
- SymI_NeedsProto(__aeabi_uidiv) \
- SymI_NeedsProto(__aeabi_uidivmod) \
- SymI_NeedsProto(__aeabi_ul2d) \
- SymI_NeedsProto(__aeabi_ul2f) \
- SymI_NeedsProto(__aeabi_ulcmp) \
- SymI_NeedsProto(__aeabi_uldivmod)
-#define RTS_LIBGCC_SYMBOLS_64 \
+#if defined(__GNUC__) && SIZEOF_VOID_P <= 4 && !defined(_ABIN32)
+#define RTS_LIBGCC_SYMBOLS \
+ SymI_NeedsProto(__divdi3) \
+ SymI_NeedsProto(__udivdi3) \
+ SymI_NeedsProto(__moddi3) \
+ SymI_NeedsProto(__umoddi3) \
+ SymI_NeedsProto(__muldi3) \
+ SymI_NeedsProto(__ashldi3) \
+ SymI_NeedsProto(__ashrdi3) \
+ SymI_NeedsProto(__lshrdi3) \
+ SymI_NeedsProto(__fixunsdfdi)
+#elif defined(__GNUC__) && SIZEOF_VOID_P == 8
+#define RTS_LIBGCC_SYMBOLS \
SymI_NeedsProto(__udivti3) \
SymI_NeedsProto(__umodti3)
-
-/* for aarch64 */
-#define RTS_LIBGCC_SYMBOLS_aarch64 \
- SymI_NeedsProto(__netf2) \
- SymI_NeedsProto(__addtf3) \
- SymI_NeedsProto(__subtf3) \
- SymI_NeedsProto(__multf3) \
- SymI_NeedsProto(__extenddftf2) \
- SymI_NeedsProto(__fixtfsi) \
- SymI_NeedsProto(__fixunstfsi) \
- SymI_NeedsProto(__floatsitf) \
- SymI_NeedsProto(__floatunsitf)
-
-#if defined(__GNUC__) && SIZEOF_VOID_P <= 4 && defined(arm_HOST_OS)
-#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_32 RTS_LIBGCC_SYMBOLS_aarch32
-#elif defined(__GNUC__) && SIZEOF_VOID_P <= 4 && !defined(_ABIN32)
-#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_32
-#elif defined(__GNUC__) && SIZEOF_VOID_P == 8 && defined(aarch64_HOST_OS)
-#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_64 RTS_LIBGCC_SYMBOLS_aarch64
-#elif defined(__GNUC__) && SIZEOF_VOID_P == 8
-#define RTS_LIBGCC_SYMBOLS RTS_LIBGCC_SYMBOLS_64
#else
#define RTS_LIBGCC_SYMBOLS
#endif
-#if !defined(mingw32_HOST_OS) && !defined(DYNAMIC) && (defined(_FORTIFY_SOURCE) || defined(__SSP__))
-#define RTS_SSP_SYMBOLS \
- SymI_NeedsProto(__stack_chk_guard) \
- SymI_NeedsProto(__stack_chk_fail)
-#else
-#define RTS_SSP_SYMBOLS
-#endif
-#if !defined(DYNAMIC) && defined(linux_HOST_OS)
-// we need these for static musl builds. However when
-// linking shared objects (DLLs) this will fail, hence
-// we do not include them when building with -DDYNAMIC
-#define RTS_LINKER_SYMBOLS \
- SymI_NeedsProto(__fini_array_start) \
- SymI_NeedsProto(__fini_array_end)
-#else
-#define RTS_LINKER_SYMBOLS
-#endif
-
-#if defined(darwin_HOST_OS) && defined(powerpc_HOST_ARCH)
- // Symbols that don't have a leading underscore
- // on Mac OS X. They have to receive special treatment,
- // see machoInitSymbolsWithoutUnderscore()
-#define RTS_MACHO_NOUNDERLINE_SYMBOLS \
- SymI_NeedsProto(saveFP) \
- SymI_NeedsProto(restFP)
-#endif
-
/* entirely bogus claims about types of these symbols */
-/* to prevent a bit of define expansion, SymI_NeedsProto is a variadic
- * macro. And we'll concat vvv with the __VA_ARGS__. This prevents
- * vvv from getting macro expanded.
- */
-#define SymI_NeedsProto(vvv,...) extern void vvv ## __VA_ARGS__ (void);
+#define SymI_NeedsProto(vvv) extern void vvv(void);
#define SymI_NeedsDataProto(vvv) extern StgWord vvv[];
#if defined(COMPILING_WINDOWS_DLL)
#define SymE_HasProto(vvv) SymE_HasProto(vvv);
@@ -1209,8 +1026,6 @@ RTS_DARWIN_ONLY_SYMBOLS
RTS_OPENBSD_ONLY_SYMBOLS
RTS_LIBGCC_SYMBOLS
RTS_LIBFFI_SYMBOLS
-RTS_SSP_SYMBOLS
-RTS_LINKER_SYMBOLS
#undef SymI_NeedsProto
#undef SymI_NeedsDataProto
#undef SymI_HasProto
@@ -1230,7 +1045,7 @@ RTS_LINKER_SYMBOLS
#define SymE_HasDataProto(vvv) \
SymE_HasProto(vvv)
-#define SymI_NeedsProto(vvv,...) SymI_HasProto(vvv ## __VA_ARGS__)
+#define SymI_NeedsProto(vvv) SymI_HasProto(vvv)
#define SymI_NeedsDataProto(vvv) SymI_HasDataProto(vvv)
#define SymE_NeedsProto(vvv) SymE_HasProto(vvv)
#define SymE_NeedsDataProto(vvv) SymE_HasDataProto(vvv)
@@ -1251,8 +1066,6 @@ RTS_LINKER_SYMBOLS
#define SymI_HasProto_deprecated(vvv) \
{ #vvv, (void*)0xBAADF00D, true },
-void *RTS_DYNAMIC = NULL;
-
RtsSymbolVal rtsSyms[] = {
RTS_SYMBOLS
RTS_RET_SYMBOLS
@@ -1264,14 +1077,11 @@ RtsSymbolVal rtsSyms[] = {
RTS_LIBGCC_SYMBOLS
RTS_LIBFFI_SYMBOLS
SymI_HasDataProto(nonmoving_write_barrier_enabled)
- RTS_SSP_SYMBOLS
- RTS_LINKER_SYMBOLS
#if defined(darwin_HOST_OS) && defined(i386_HOST_ARCH)
// dyld stub code contains references to this,
// but it should never be called because we treat
// lazy pointers as nonlazy.
{ "dyld_stub_binding_helper", (void*)0xDEADBEEF, false },
#endif
- { "_DYNAMIC", (void*)(&RTS_DYNAMIC), false },
{ 0, 0, false } /* sentinel */
};
--
2.25.4

2
pkgs/development/haskell-modules/HACKING.md
View File

@ -249,6 +249,8 @@ opening the next one. When you want to merge the currently open
$ ./maintainers/scripts/haskell/merge-and-open-pr.sh PR_NUM_OF_CURRENT_HASKELL_UPDATES_PR
```
Find the PR number easily [here](https://github.com/nixos/nixpkgs/pulls?q=is%3Apr+is%3Aopen+head%3Ahaskell-updates)
This does the following things:
1. Fetches `origin`, makes sure you currently have the `haskell-updates`

29
pkgs/development/haskell-modules/configuration-common.nix
View File

@ -1773,21 +1773,6 @@ self: super: {
vivid-osc = dontCheck super.vivid-osc;
vivid-supercollider = dontCheck super.vivid-supercollider;
# cabal-install switched to build type simple in 3.2.0.0
# as a result, the cabal(1) man page is no longer installed
# automatically. Instead we need to use the `cabal man`
# command which generates the man page on the fly and
# install it to $out/share/man/man1 ourselves in this
# override.
# The commit that introduced this change:
# https://github.com/haskell/cabal/commit/91ac075930c87712eeada4305727a4fa651726e7
cabal-install = overrideCabal (old: {
postInstall = old.postInstall + ''
mkdir -p "$out/share/man/man1"
"$out/bin/cabal" man --raw > "$out/share/man/man1/cabal.1"
'';
}) super.cabal-install;
# while waiting for a new release: https://github.com/brendanhay/amazonka/pull/572
amazonka = appendPatches [
(fetchpatch {
@ -2417,13 +2402,12 @@ self: super: {
}))
];
# 2022-02-25: Not compatible with relude 1.0
ema = assert super.ema.version == "0.6.0.0";
super.ema.overrideScope (self: super: { relude = doJailbreak self.relude_0_7_0_0; });
# Tests require ghc-9.2.
ema = dontCheck super.ema;
glirc = super.glirc.override {
glirc = doJailbreak (super.glirc.override {
vty = self.vty_5_35_1;
};
});
# 2022-02-25: Unmaintained and to strict upper bounds
paths = doJailbreak super.paths;
@ -2492,11 +2476,6 @@ self: super: {
sha256 = "sha256-fW5bVbAGQxU/gd9zqgVNclwKraBtUjkKDek7L0c4+O0=";
}) super.wstunnel;
# Adjustment of bounds on servant is unreleased
# https://github.com/haskell-servant/servant-cassava/commit/66617547851d38d48f5f1d1b786db1286bdafa9d
servant-cassava = assert super.servant-cassava.version == "0.10.1";
doJailbreak super.servant-cassava;
# Test data missing from sdist
# https://github.com/ngless-toolkit/ngless/issues/152
NGLess = dontCheck super.NGLess;

4
pkgs/development/haskell-modules/configuration-darwin.nix
View File

@ -18,6 +18,10 @@ self: super: ({
__darwinAllowLocalNetworking = true;
});
streaming-commons = super.streaming-commons.overrideAttrs (_: {
__darwinAllowLocalNetworking = true;
});
halive = addBuildDepend darwin.apple_sdk.frameworks.AppKit super.halive;
# Hakyll's tests are broken on Darwin (3 failures); and they require util-linux

11
pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix
View File

@ -48,9 +48,16 @@ self: super: {
# still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463
xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1;
# cabal-install needs more recent versions of Cabal and base16-bytestring.
# cabal-install needs most recent versions of Cabal and Cabal-syntax
cabal-install = super.cabal-install.overrideScope (self: super: {
Cabal = self.Cabal_3_6_3_0;
Cabal = self.Cabal_3_8_1_0;
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
process = self.process_1_6_15_0;
});
cabal-install-solver = super.cabal-install-solver.overrideScope (self: super: {
Cabal = self.Cabal_3_8_1_0;
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
process = self.process_1_6_15_0;
});
# Pick right versions for GHC-specific packages

1
pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix
View File

@ -48,7 +48,6 @@ self: super: {
xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1;
# Needs Cabal 3.0.x.
cabal-install = super.cabal-install.overrideScope (self: super: { Cabal = self.Cabal_3_2_1_0; });
jailbreak-cabal = super.jailbreak-cabal.override { Cabal = self.Cabal_3_2_1_0; };
# https://github.com/tibbe/unordered-containers/issues/214

12
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View File

@ -54,10 +54,16 @@ self: super: {
# This build needs a newer version of Cabal.
cabal2spec = super.cabal2spec.override { Cabal = self.Cabal_3_2_1_0; };
# cabal-install needs more recent versions of Cabal and random, but an older
# version of base16-bytestring.
# cabal-install needs most recent versions of Cabal and Cabal-syntax
cabal-install = super.cabal-install.overrideScope (self: super: {
Cabal = self.Cabal_3_6_3_0;
Cabal = self.Cabal_3_8_1_0;
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
process = self.process_1_6_15_0;
});
cabal-install-solver = super.cabal-install-solver.overrideScope (self: super: {
Cabal = self.Cabal_3_8_1_0;
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
process = self.process_1_6_15_0;
});
# Ignore overly restrictive upper version bounds.

13
pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix
View File

@ -49,9 +49,16 @@ self: super: {
# still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463
xhtml = if self.ghc.hasHaddock or true then null else self.xhtml_3000_2_2_1;
# cabal-install needs more recent versions of Cabal and base16-bytestring.
cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: {
Cabal = self.Cabal_3_6_3_0;
# cabal-install needs the latest/matching versions of Cabal-syntax and Cabal
cabal-install = super.cabal-install.overrideScope (self: super: {
Cabal = self.Cabal_3_8_1_0;
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
process = self.process_1_6_15_0;
});
cabal-install-solver = super.cabal-install-solver.overrideScope (self: super: {
Cabal = self.Cabal_3_8_1_0;
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
process = self.process_1_6_15_0;
});
# Jailbreaks & Version Updates

21
pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
View File

@ -55,9 +55,16 @@ self: super: {
# 0.30 introduced support for GHC 9.2.
cryptonite = doDistribute self.cryptonite_0_30;
# cabal-install needs more recent versions of Cabal
cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: {
Cabal = self.Cabal_3_6_3_0;
# cabal-install needs most recent versions of Cabal and Cabal-syntax
cabal-install = super.cabal-install.overrideScope (self: super: {
Cabal = self.Cabal_3_8_1_0;
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
process = self.process_1_6_15_0;
});
cabal-install-solver = super.cabal-install-solver.overrideScope (self: super: {
Cabal = self.Cabal_3_8_1_0;
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
process = self.process_1_6_15_0;
});
doctest = dontCheck (doJailbreak super.doctest);
@ -73,8 +80,8 @@ self: super: {
assoc = doJailbreak super.assoc;
async = doJailbreak super.async;
base64-bytestring = doJailbreak super.base64-bytestring;
base-compat = self.base-compat_0_12_1;
base-compat-batteries = self.base-compat-batteries_0_12_1;
base-compat = self.base-compat_0_12_2;
base-compat-batteries = self.base-compat-batteries_0_12_2;
binary-instances = doJailbreak super.binary-instances;
ChasingBottoms = doJailbreak super.ChasingBottoms;
constraints = doJailbreak super.constraints;
@ -102,7 +109,7 @@ self: super: {
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_2_4_20220729;
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_2_1_1;
hackage-security = doJailbreak super.hackage-security;
hashable = super.hashable_1_4_0_2;
hashable = super.hashable_1_4_1_0;
hashable-time = doJailbreak super.hashable-time;
# 1.1.1 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed
hedgehog = assert super.hedgehog.version == "1.0.5"; doJailbreak super.hedgehog;
@ -146,7 +153,7 @@ self: super: {
}) (doJailbreak super.hpack);
# lens >= 5.1 supports 9.2.1
lens = doDistribute self.lens_5_1_1;
lens = doDistribute self.lens_5_2;
# Syntax error in tests fixed in https://github.com/simonmar/alex/commit/84b29475e057ef744f32a94bc0d3954b84160760
alex = dontCheck super.alex;

7
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
View File

@ -4,6 +4,7 @@ broken-packages:
- 3d-graphics-examples
- 3dmodels
- AAI
- aasam
- abacate
- abcnotation
- abeson
@ -2660,6 +2661,7 @@ broken-packages:
- intrinsic-superclasses
- introduction
- intro-prelude
- invertible
- invertible-hlist
- invertible-syntax
- involutive-semigroups
@ -2868,6 +2870,7 @@ broken-packages:
- lambda-toolbox
- lame
- lame-tester
- landlock
- language-asn
- language-c-comments
- language-c-inline
@ -2966,6 +2969,7 @@ broken-packages:
- libpq
- librandomorg
- librarian
- libsecp256k1
- libsystemd-daemon
- libsystemd-journal
- libtagc
@ -3489,6 +3493,7 @@ broken-packages:
- next-ref
- nextstep-plist
- NGrams
- ngx-export-log
- niagra
- nibblestring
- nice-html
@ -3820,6 +3825,7 @@ broken-packages:
- phone-numbers
- phone-push
- phonetic-languages-constaints
- phonetic-languages-simplified-properties-array-old
- phonetic-languages-vector
- phraskell
- Phsu
@ -4312,6 +4318,7 @@ broken-packages:
- ReviewBoard
- rewrite-inspector
- rfc-prelude
- r-glpk-phonetic-languages-ukrainian-durations
- rhbzquery
- riak
- riak-protobuf-lens

1
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
View File

@ -99,6 +99,7 @@ extra-packages:
- Cabal == 2.4.* # required for cabal-install etc.
- Cabal == 3.2.* # required for cabal-install etc.
- Cabal == 3.4.* # required for cabal-install etc.
- Cabal == 3.6.* # required for cabal-install-parsers etc.
- Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729
- ShellCheck == 0.7.2 # 2022-02-20: haskell-ci 0.14 needs this
- aeson < 2 # required by pantry-0.5.2

62
pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
View File

@ -1,4 +1,4 @@
# Stackage LTS 19.18
# Stackage LTS 19.19
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -74,7 +74,7 @@ default-package-overrides:
- approximate-equality ==1.1.0.2
- app-settings ==0.2.0.12
- arbor-lru-cache ==0.1.1.1
- arithmoi ==0.12.0.1
- arithmoi ==0.12.0.2
- array-memoize ==0.6.0
- arrow-extras ==0.1.0.1
- arrows ==0.4.4.2
@ -141,7 +141,7 @@ default-package-overrides:
- base-compat ==0.11.2
- base-compat-batteries ==0.11.2
- basement ==0.0.14
- base-orphans ==0.8.6
- base-orphans ==0.8.7
- base-prelude ==1.6.1
- base-unicode-symbols ==0.2.4.2
- basic-prelude ==0.7.0
@ -156,7 +156,7 @@ default-package-overrides:
- bech32 ==1.1.2
- bech32-th ==1.1.1
- bench ==1.0.12
- benchpress ==0.2.2.20
- benchpress ==0.2.2.21
- bencode ==0.6.1.1
- bencoding ==0.4.5.4
- between ==0.11.0.0
@ -173,7 +173,7 @@ default-package-overrides:
- binary-ieee754 ==0.1.0.0
- binary-instances ==1.0.2
- binary-list ==1.1.1.2
- binary-orphans ==1.0.2
- binary-orphans ==1.0.3
- binary-parser ==0.5.7.2
- binary-parsers ==0.2.4.0
- binary-search ==2.0.0
@ -266,8 +266,8 @@ default-package-overrides:
- c14n ==0.1.0.2
- c2hs ==0.28.8
- cabal2spec ==2.6.2
- cabal-appimage ==0.3.0.4
- cabal-clean ==0.1.20210924
- cabal-appimage ==0.3.0.5
- cabal-clean ==0.1.20220814
- cabal-doctest ==1.0.9
- cabal-file ==0.1.1
- cabal-file-th ==0.2.7
@ -303,7 +303,7 @@ default-package-overrides:
- cborg-json ==0.2.4.0
- cdar-mBound ==0.1.0.4
- c-enum ==0.1.1.3
- cereal ==0.5.8.2
- cereal ==0.5.8.3
- cereal-conduit ==0.8.0
- cereal-text ==0.1.0.2
- cereal-vector ==0.2.0.1
@ -682,7 +682,7 @@ default-package-overrides:
- error-or-utils ==0.2.0
- errors ==2.3.0
- errors-ext ==0.4.2
- ersatz ==0.4.11
- ersatz ==0.4.12
- esqueleto ==3.5.6.1
- essence-of-live-coding ==0.2.6
- essence-of-live-coding-gloss ==0.2.6
@ -762,7 +762,7 @@ default-package-overrides:
- fixed-length ==0.2.3
- fixed-vector ==1.2.1.0
- fixed-vector-hetero ==0.6.1.1
- fix-whitespace ==0.0.8
- fix-whitespace ==0.0.9
- flac ==0.2.0
- flac-picture ==0.1.2
- flags-applicative ==0.1.0.3
@ -868,7 +868,7 @@ default-package-overrides:
- getopt-generics ==0.13.0.4
- ghc-bignum-orphans ==0.1.1
- ghc-byteorder ==4.11.0.0.10
- ghc-check ==0.5.0.6
- ghc-check ==0.5.0.8
- ghc-compact ==0.1.0.0
- ghc-core ==0.5.6
- ghc-events ==0.17.0.3
@ -886,7 +886,7 @@ default-package-overrides:
- ghc-source-gen ==0.4.3.0
- ghc-syntax-highlighter ==0.0.7.0
- ghc-tcplugins-extra ==0.4.2
- ghc-trace-events ==0.1.2.5
- ghc-trace-events ==0.1.2.6
- ghc-typelits-extra ==0.4.3
- ghc-typelits-knownnat ==0.7.6
- ghc-typelits-natnormalise ==0.7.6
@ -966,7 +966,7 @@ default-package-overrides:
- guarded-allocation ==0.0.1
- hackage-cli ==0.0.3.6
- hackage-db ==2.1.2
- hackage-security ==0.6.2.1
- hackage-security ==0.6.2.2
- haddock-library ==1.10.0
- hadoop-streaming ==0.2.0.3
- hakyll ==4.15.1.1
@ -1049,7 +1049,7 @@ default-package-overrides:
- hid ==0.2.2
- hidapi ==0.1.8
- hie-bios ==0.9.1
- hi-file-parser ==0.1.2.0
- hi-file-parser ==0.1.3.0
- higher-leveldb ==0.6.0.0
- highlighting-kate ==0.6.4
- hindent ==5.3.4
@ -1153,7 +1153,7 @@ default-package-overrides:
- hspec-need-env ==0.1.0.9
- hspec-parsec ==0
- hspec-smallcheck ==0.5.2
- hspec-tmp-proc ==0.5.0.1
- hspec-tmp-proc ==0.5.1.2
- hspec-wai ==0.11.1
- hs-php-session ==0.0.9.3
- hsshellscript ==3.5.0
@ -1265,7 +1265,7 @@ default-package-overrides:
- indexed-list-literals ==0.2.1.3
- indexed-profunctors ==0.1.1
- indexed-traversable ==0.1.2
- indexed-traversable-instances ==0.1.1
- indexed-traversable-instances ==0.1.1.1
- infer-license ==0.2.0
- inflections ==0.4.0.6
- influxdb ==1.9.2.2
@ -1405,7 +1405,7 @@ default-package-overrides:
- LetsBeRational ==1.0.0.0
- leveldb-haskell ==0.6.5
- lexer-applicative ==2.1.0.2
- libBF ==0.6.3
- libBF ==0.6.4
- libffi ==0.1
- libgit ==0.3.1
- libgraph ==1.14
@ -1413,7 +1413,7 @@ default-package-overrides:
- liboath-hs ==0.0.1.2
- libyaml ==0.1.2
- LibZip ==1.0.1
- lifted-async ==0.10.2.2
- lifted-async ==0.10.2.3
- lifted-base ==0.2.3.12
- lift-generics ==0.2.1
- lift-type ==0.1.0.1
@ -1524,7 +1524,7 @@ default-package-overrides:
- microlens-process ==0.2.0.2
- microlens-th ==0.4.3.10
- microspec ==0.2.1.3
- microstache ==1.0.2.1
- microstache ==1.0.2.2
- midair ==0.2.0.1
- midi ==0.2.2.3
- midi-alsa ==0.2.1
@ -1753,7 +1753,7 @@ default-package-overrides:
- pandoc-lua-marshal ==0.1.7
- pandoc-plot ==1.4.1
- pandoc-throw ==0.1.0.0
- pandoc-types ==1.22.2
- pandoc-types ==1.22.2.1
- pantry ==0.5.6
- parallel ==3.2.2.0
- parallel-io ==0.3.5
@ -1859,7 +1859,7 @@ default-package-overrides:
- polysemy-extra ==0.2.0.0
- polysemy-fs ==0.1.0.0
- polysemy-fskvstore ==0.1.1.0
- polysemy-kvstore ==0.1.2.0
- polysemy-kvstore ==0.1.3.0
- polysemy-methodology ==0.2.1.0
- polysemy-path ==0.2.1.0
- polysemy-plugin ==0.4.1.1
@ -1970,7 +1970,7 @@ default-package-overrides:
- quickcheck-classes ==0.6.5.0
- quickcheck-classes-base ==0.6.2.0
- quickcheck-higherorder ==0.1.0.1
- quickcheck-instances ==0.3.27
- quickcheck-instances ==0.3.28
- quickcheck-io ==0.2.0
- quickcheck-simple ==0.1.1.1
- quickcheck-special ==0.1.0.6
@ -1984,7 +1984,7 @@ default-package-overrides:
- rainbow ==0.34.2.2
- rainbox ==0.26.0.0
- ral ==0.2.1
- rampart ==2.0.0.1
- rampart ==2.0.0.2
- ramus ==0.1.2
- rando ==0.0.0.4
- random ==1.2.1.1
@ -2134,7 +2134,7 @@ default-package-overrides:
- scotty ==0.12
- scrypt ==0.5.0
- sdl2 ==2.5.3.0
- sdl2-ttf ==2.1.2
- sdl2-ttf ==2.1.3
- search-algorithms ==0.3.2
- secp256k1-haskell ==0.6.1
- securemem ==0.1.10
@ -2289,7 +2289,7 @@ default-package-overrides:
- Spintax ==0.3.6
- splice ==0.6.1.1
- splint ==1.0.2.0
- split ==0.2.3.4
- split ==0.2.3.5
- splitmix ==0.1.0.4
- splitmix-distributions ==0.9.0.0
- split-record ==0.1.1.4
@ -2326,7 +2326,7 @@ default-package-overrides:
- stm-containers ==1.2
- stm-delay ==0.1.1.1
- stm-extras ==0.1.0.3
- stm-hamt ==1.2.0.7
- stm-hamt ==1.2.0.8
- stm-lifted ==2.5.0.0
- STMonadTrans ==0.4.6
- stm-split ==0.0.2.1
@ -2353,7 +2353,7 @@ default-package-overrides:
- strict ==0.4.0.1
- strict-concurrency ==0.2.4.3
- strict-list ==0.1.7
- strict-tuple ==0.1.5
- strict-tuple ==0.1.5.1
- strict-tuple-lens ==0.2
- strict-wrapper ==0.0.0.0
- stringbuilder ==0.5.1
@ -2415,7 +2415,7 @@ default-package-overrides:
- tardis ==0.4.4.0
- tasty ==1.4.2.3
- tasty-ant-xml ==1.1.8
- tasty-bench ==0.3.1
- tasty-bench ==0.3.2
- tasty-dejafu ==2.0.0.8
- tasty-discover ==4.2.4
- tasty-expected-failure ==0.12.3
@ -2542,7 +2542,7 @@ default-package-overrides:
- tmapchan ==0.0.3
- tmapmvar ==0.0.4
- tmp-postgres ==1.34.1.0
- tmp-proc ==0.5.0.1
- tmp-proc ==0.5.1.2
- tophat ==1.0.5.1
- topograph ==1.0.0.1
- torsor ==0.1
@ -2598,7 +2598,7 @@ default-package-overrides:
- type-spec ==0.4.0.0
- typography-geometry ==1.0.1.0
- tz ==0.1.3.6
- tzdata ==0.2.20220315.0
- tzdata ==0.2.20220810.0
- ua-parser ==0.7.7.0
- uglymemo ==0.1.0.1
- unagi-chan ==0.4.1.4
@ -2725,7 +2725,7 @@ default-package-overrides:
- wai-middleware-caching-lru ==0.1.0.0
- wai-middleware-caching-redis ==0.2.0.0
- wai-middleware-clacks ==0.1.0.1
- wai-middleware-delegate ==0.1.2.4
- wai-middleware-delegate ==0.1.3.1
- wai-middleware-prometheus ==1.0.0.1
- wai-middleware-static ==0.9.2
- wai-rate-limit ==0.2.0.0

7
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
View File

@ -1391,6 +1391,7 @@ dont-distribute-packages:
- fbrnch
- fcd
- feature-flipper-postgres
- fedora-composes
- fedora-img-dl
- feed-gipeda
- feed-translator
@ -1575,6 +1576,7 @@ dont-distribute-packages:
- gloss-devil
- gloss-raster-accelerate
- gloss-sodium
- gltf-loader
- gmap
- gmndl
- gnome-desktop
@ -2278,6 +2280,7 @@ dont-distribute-packages:
- interpolatedstring-qq-mwotton
- introduction-test
- intset
- invertible-hxt
- ion
- ipatch
- ipc
@ -2663,6 +2666,7 @@ dont-distribute-packages:
- mmsyn7l
- mmsyn7s
- mmsyn7ukr
- mmsyn7ukr-array
- mmsyn7ukr-common
- mmtl-base
- moan
@ -2861,6 +2865,7 @@ dont-distribute-packages:
- openpgp-Crypto
- openpgp-crypto-api
- openssh-github-keys
- oplang
- optima-for-hasql
- optimal-blocks
- optimusprime
@ -3578,6 +3583,7 @@ dont-distribute-packages:
- stunts
- stutter
- stylist
- stylist-traits
- subhask
- substring-parser
- sugar-data
@ -3918,6 +3924,7 @@ dont-distribute-packages:
- warped
- wavesurfer
- wavy
- web-inv-route
- web-mongrel2
- web-page
- web-routes-regular

39
pkgs/development/haskell-modules/configuration-nix.nix
View File

@ -990,6 +990,42 @@ self: super: builtins.intersectAttrs super {
enableSeparateBinOutput = true;
}) super.nfc;
# Wants to execute cabal-install to (re-)build itself
hint = dontCheck super.hint;
# Make sure that Cabal 3.8.* can be built as-is
Cabal_3_8_1_0 = doDistribute (super.Cabal_3_8_1_0.override {
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
process = self.process_1_6_15_0;
});
# cabal-install switched to build type simple in 3.2.0.0
# as a result, the cabal(1) man page is no longer installed
# automatically. Instead we need to use the `cabal man`
# command which generates the man page on the fly and
# install it to $out/share/man/man1 ourselves in this
# override.
# The commit that introduced this change:
# https://github.com/haskell/cabal/commit/91ac075930c87712eeada4305727a4fa651726e7
# Since cabal-install 3.8, the cabal man (without the raw) command
# uses nroff(1) instead of man(1) for macOS/BSD compatibility. That utility
# is not commonly installed on systems, so we add it to PATH. Closure size
# penalty is about 10MB at the time of writing this (2022-08-20).
cabal-install = overrideCabal (old: {
executableToolDepends = [
pkgs.buildPackages.makeWrapper
] ++ old.buildToolDepends or [];
postInstall = old.postInstall + ''
mkdir -p "$out/share/man/man1"
"$out/bin/cabal" man --raw > "$out/share/man/man1/cabal.1"
wrapProgram "$out/bin/cabal" \
--prefix PATH : "${pkgs.lib.makeBinPath [ pkgs.groff ]}"
'';
hydraPlatforms = pkgs.lib.platforms.all;
broken = false;
}) super.cabal-install;
# haskell-language-server plugins all use the same test harness so we give them what we want in this loop.
} // pkgs.lib.mapAttrs
(_: overrideCabal (drv: {
@ -1021,7 +1057,4 @@ self: super: builtins.intersectAttrs super {
hls-call-hierarchy-plugin = dontCheck super.hls-call-hierarchy-plugin;
hls-selection-range-plugin = dontCheck super.hls-selection-range-plugin;
hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin;
# Wants to execute cabal-install to (re-)build itself
hint = dontCheck super.hint;
}

2590
pkgs/development/haskell-modules/hackage-packages.nix generated
View File

File diff suppressed because it is too large Load Diff

8
pkgs/development/haskell-modules/make-package-set.nix
View File

@ -565,7 +565,13 @@ in package-set { inherit pkgs lib callPackage; } self // {
pkgs.runCommandLocal name
{
inherit src;
nativeBuildInputs = [ buildHaskellPackages.cabal-install ];
nativeBuildInputs = [
buildHaskellPackages.cabal-install
# TODO after https://github.com/haskell/cabal/issues/8352
# remove ghc
self.ghc
];
dontUnpack = false;
} ''
unpackPhase

12
pkgs/top-level/haskell-packages.nix
View File

@ -16,14 +16,14 @@ let
"native-bignum"
"ghc902"
"ghc924"
"ghc941"
"ghc942"
"ghcHEAD"
];
nativeBignumIncludes = [
"ghc902"
"ghc924"
"ghc941"
"ghc942"
"ghcHEAD"
];
@ -155,7 +155,7 @@ in {
buildTargetLlvmPackages = pkgsBuildTarget.llvmPackages_12;
llvmPackages = pkgs.llvmPackages_12;
};
ghc941 = callPackage ../development/compilers/ghc/9.4.1.nix {
ghc942 = callPackage ../development/compilers/ghc/9.4.2.nix {
bootPkgs =
# Building with 9.2 is broken due to
# https://gitlab.haskell.org/ghc/ghc/-/issues/21914
@ -291,9 +291,9 @@ in {
ghc = bh.compiler.ghc924;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { };
};
ghc941 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc941;
ghc = bh.compiler.ghc941;
ghc942 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc942;
ghc = bh.compiler.ghc942;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.4.x.nix { };
};
ghcHEAD = callPackage ../development/haskell-modules {