Merge pull request #135453 from NixOS/haskell-updates

haskellPackages: update stackage and hackage
This commit is contained in:
Joe Hermaszewski 2021-09-03 15:02:58 +01:00 committed by GitHub
commit 5942b67b0c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
24 changed files with 1739 additions and 1422 deletions

View File

@ -1,7 +1,7 @@
{ stdenv, ghcWithPackages, makeWrapper, packages ? (pkgSet: []) }:
{ stdenv, haskellPackages, makeWrapper, packages ? (pkgSet: []) }:
let
termonadEnv = ghcWithPackages (self: [ self.termonad ] ++ packages self);
termonadEnv = haskellPackages.ghcWithPackages (self: [ self.termonad ] ++ packages self);
in stdenv.mkDerivation {
name = "termonad-with-packages-${termonadEnv.version}";
@ -16,4 +16,8 @@ in stdenv.mkDerivation {
# trivial derivation
preferLocalBuild = true;
allowSubstitutes = false;
meta = haskellPackages.termonad.meta // {
mainProgram = "termonad";
};
}

View File

@ -1,6 +1,6 @@
{
"commit": "23315eb3220b0748c3aa71a9027dc39e5416ce9e",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/23315eb3220b0748c3aa71a9027dc39e5416ce9e.tar.gz",
"sha256": "0pgcyfb3lnl7kxpj87sbj50ljlg2l05v4kgcdwy568pcf24bh764",
"msg": "Update from Hackage at 2021-08-17T22:21:14Z"
"commit": "193a13be44c51ebfc8e991b7bb53a4065129ff4d",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/193a13be44c51ebfc8e991b7bb53a4065129ff4d.tar.gz",
"sha256": "08j6qx3jqcw7ydwnpjr132l2mlpq6dqvwqgm3gq0ym4kjzrbdwsd",
"msg": "Update from Hackage at 2021-08-23T13:50:03Z"
}

View File

@ -374,6 +374,6 @@ stdenv.mkDerivation rec {
# `pkgsMusl`.
platforms = builtins.attrNames ghcBinDists.${distSetName};
hydraPlatforms = builtins.filter (p: minimal || p != "aarch64-linux") platforms;
maintainers = with lib.maintainers; [ lostnet ];
maintainers = with lib.maintainers; [ lostnet guibou ];
};
}

View File

@ -17,7 +17,8 @@ assert stdenv.targetPlatform == stdenv.hostPlatform;
let
downloadsUrl = "https://downloads.haskell.org/ghc";
version = "8.10.5";
# Copy sha256 from https://downloads.haskell.org/~ghc/8.10.7/SHA256SUMS
version = "8.10.7";
# Information about available bindists that we use in the build.
#
@ -42,7 +43,7 @@ let
i686-linux = {
src = {
url = "${downloadsUrl}/${version}/ghc-${version}-i386-deb9-linux.tar.xz";
sha256 = "17cwmhhyz952psmp4j3pkdj0yrfxah3l2dawg5s4hdr228n5pjqc";
sha256 = "fbfc1ef194f4e7a4c0da8c11cc69b17458a4b928b609b3622c97acc4acd5c5ab";
};
exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2";
archSpecificLibraries = [
@ -55,7 +56,7 @@ let
x86_64-linux = {
src = {
url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-deb10-linux.tar.xz";
sha256 = "11v76wgljyszc6mgz6r16i6wkifgl15a26q7ablihp2cr8h3qqmw";
sha256 = "a13719bca87a0d3ac0c7d4157a4e60887009a7f1a8dbe95c4759ec413e086d30";
};
exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2";
archSpecificLibraries = [
@ -65,7 +66,7 @@ let
armv7l-linux = {
src = {
url = "${downloadsUrl}/${version}/ghc-${version}-armv7-deb10-linux.tar.xz";
sha256 = "0v5bvhb2z9j26yr0n9gc4xdq2lm37mr98g62p5z8pqahhhd0s5sn";
sha256 = "3949c31bdf7d3b4afb765ea8246bca4ca9707c5d988d9961a244f0da100956a2";
};
exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2";
archSpecificLibraries = [
@ -75,7 +76,7 @@ let
aarch64-linux = {
src = {
url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-deb10-linux.tar.xz";
sha256 = "1p0dgyn1m2nd8ax1g25lchaz9z2nk9jvyzf63biarq7qlzc5q24s";
sha256 = "fad2417f9b295233bf8ade79c0e6140896359e87be46cb61cd1d35863d9d0e55";
};
exePathForLibraryCheck = "ghc/stage2/build/tmp/ghc-stage2";
archSpecificLibraries = [
@ -86,7 +87,7 @@ let
x86_64-darwin = {
src = {
url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-apple-darwin.tar.xz";
sha256 = "08javwfqd21kglbr1bnhnbjw2cggz1n668vi8kx5hbcnz3plf3zg";
sha256 = "287db0f9c338c9f53123bfa8731b0996803ee50f6ee847fe388092e5e5132047";
};
exePathForLibraryCheck = null; # we don't have a library check for darwin yet
archSpecificLibraries = [
@ -97,7 +98,7 @@ let
aarch64-darwin = {
src = {
url = "${downloadsUrl}/${version}/ghc-${version}-aarch64-apple-darwin.tar.xz";
sha256 = "02fbcrzcc6m25z3ji867isml38jkg4blry70ljwl3l03zxq4ws03";
sha256 = "dc469fc3c35fd2a33a5a575ffce87f13de7b98c2d349a41002e200a56d9bba1c";
};
exePathForLibraryCheck = null; # we don't have a library check for darwin yet
archSpecificLibraries = [
@ -111,7 +112,7 @@ let
x86_64-linux = {
src = {
url = "${downloadsUrl}/${version}/ghc-${version}-x86_64-alpine3.10-linux-integer-simple.tar.xz";
sha256 = "1ql2qxywbbv0b9syvrm9kyh5d8midnl676lw4698ajras6gcvmzl";
sha256 = "16903df850ef73d5246f2ff169cbf57ecab76c2ac5acfa9928934282cfad575c";
};
exePathForLibraryCheck = "bin/ghc";
archSpecificLibraries = [

View File

@ -136,12 +136,12 @@ let
in
stdenv.mkDerivation (rec {
version = "8.10.6";
version = "8.10.7";
name = "${targetPrefix}ghc-${version}";
src = fetchurl {
url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz";
sha256 = "43afba72a533408b42c1492bd047b5e37e5f7204e41a5cedd3182cc841610ce9";
sha256 = "e3eef6229ce9908dfe1ea41436befb0455fefb1932559e860ad4c606b0d03c9d";
};
enableParallelBuilding = true;
@ -284,6 +284,10 @@ stdenv.mkDerivation (rec {
# * https://gitlab.haskell.org/ghc/ghc/-/issues/19580
++ lib.optional stdenv.targetPlatform.isMusl "pie";
# big-parallel allows us to build with more than 2 cores on
# Hydra which already warrants a significant speedup
requiredSystemFeatures = [ "big-parallel" ];
postInstall = ''
# Install the bash completion file.
install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
@ -309,7 +313,7 @@ stdenv.mkDerivation (rec {
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = with lib.maintainers; [ marcweber andres peti ];
maintainers = with lib.maintainers; [ marcweber andres peti guibou ];
timeout = 24 * 3600;
inherit (ghc.meta) license platforms;

View File

@ -192,5 +192,6 @@ stdenv.mkDerivation rec {
hydraPlatforms = builtins.filter (p: p != "aarch64-linux") platforms;
# build segfaults, use ghc8102Binary which has proper musl support instead
broken = stdenv.hostPlatform.isMusl;
maintainers = with lib.maintainers; [ guibou ];
};
}

View File

@ -316,7 +316,7 @@ stdenv.mkDerivation (rec {
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = with lib.maintainers; [ marcweber andres peti ];
maintainers = with lib.maintainers; [ marcweber andres peti guibou ];
timeout = 24 * 3600;
inherit (ghc.meta) license platforms;

View File

@ -268,6 +268,10 @@ stdenv.mkDerivation (rec {
# * https://gitlab.haskell.org/ghc/ghc/-/issues/19580
++ lib.optional stdenv.targetPlatform.isMusl "pie";
# big-parallel allows us to build with more than 2 cores on
# Hydra which already warrants a significant speedup
requiredSystemFeatures = [ "big-parallel" ];
postInstall = ''
# Install the bash completion file.
install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
@ -293,7 +297,7 @@ stdenv.mkDerivation (rec {
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = with lib.maintainers; [ marcweber andres peti ];
maintainers = with lib.maintainers; [ marcweber andres peti guibou ];
timeout = 24 * 3600;
inherit (ghc.meta) license platforms;

View File

@ -0,0 +1,320 @@
{ lib, stdenv, pkgsBuildTarget, targetPackages
# build-tools
, bootPkgs
, autoconf, automake, coreutils, fetchurl, perl, python3, m4, sphinx, xattr
, bash
, libiconv ? null, ncurses
, glibcLocales ? null
, # GHC can be built with system libffi or a bundled one.
libffi ? null
, useLLVM ? !stdenv.targetPlatform.isx86
, # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a
# build-time dependency too.
buildLlvmPackages, llvmPackages
, # If enabled, GHC will be built with the GPL-free but slower integer-simple
# library instead of the faster but GPLed integer-gmp library.
enableIntegerSimple ? !(lib.meta.availableOn stdenv.hostPlatform gmp), gmp
, # If enabled, use -fPIC when compiling static libs.
enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform
# aarch64 outputs otherwise exceed 2GB limit
, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64
, # Whether to build dynamic libs for the standard library (on the target
# platform). Static libs are always built.
enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt
, # Whether to build terminfo.
enableTerminfo ? !stdenv.targetPlatform.isWindows
, # What flavour to build. An empty string indicates no
# specific flavour and falls back to ghc default values.
ghcFlavour ? lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform)
(if useLLVM then "perf-cross" else "perf-cross-ncg")
, # Whether to build sphinx documentation.
enableDocs ? (
# Docs disabled for musl and cross because it's a large task to keep
# all `sphinx` dependencies building in those environments.
# `sphinx` pullls in among others:
# Ruby, Python, Perl, Rust, OpenGL, Xorg, gtk, LLVM.
(stdenv.targetPlatform == stdenv.hostPlatform)
&& !stdenv.hostPlatform.isMusl
)
, enableHaddockProgram ?
# Disabled for cross; see note [HADDOCK_DOCS].
(stdenv.targetPlatform == stdenv.hostPlatform)
, # Whether to disable the large address space allocator
# necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/
disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64
}:
assert !enableIntegerSimple -> gmp != null;
# Cross cannot currently build the `haddock` program for silly reasons,
# see note [HADDOCK_DOCS].
assert (stdenv.targetPlatform != stdenv.hostPlatform) -> !enableHaddockProgram;
let
inherit (stdenv) buildPlatform hostPlatform targetPlatform;
inherit (bootPkgs) ghc;
# TODO(@Ericson2314) Make unconditional
targetPrefix = lib.optionalString
(targetPlatform != hostPlatform)
"${targetPlatform.config}-";
buildMK = ''
BuildFlavour = ${ghcFlavour}
ifneq \"\$(BuildFlavour)\" \"\"
include mk/flavours/\$(BuildFlavour).mk
endif
BUILD_SPHINX_HTML = ${if enableDocs then "YES" else "NO"}
BUILD_SPHINX_PDF = NO
'' +
# Note [HADDOCK_DOCS]:
# Unfortunately currently `HADDOCK_DOCS` controls both whether the `haddock`
# program is built (which we generally always want to have a complete GHC install)
# and whether it is run on the GHC sources to generate hyperlinked source code
# (which is impossible for cross-compilation); see:
# https://gitlab.haskell.org/ghc/ghc/-/issues/20077
# This implies that currently a cross-compiled GHC will never have a `haddock`
# program, so it can never generate haddocks for any packages.
# If this is solved in the future, we'd like to unconditionally
# build the haddock program (removing the `enableHaddockProgram` option).
''
HADDOCK_DOCS = ${if enableHaddockProgram then "YES" else "NO"}
DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"}
INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"}
'' + lib.optionalString (targetPlatform != hostPlatform) ''
Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"}
CrossCompilePrefix = ${targetPrefix}
'' + lib.optionalString (!enableProfiledLibs) ''
GhcLibWays = "v dyn"
'' + lib.optionalString enableRelocatedStaticLibs ''
GhcLibHcOpts += -fPIC
GhcRtsHcOpts += -fPIC
'' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
EXTRA_CC_OPTS += -std=gnu99
'';
# Splicer will pull out correct variations
libDeps = platform: lib.optional enableTerminfo ncurses
++ [libffi]
++ lib.optional (!enableIntegerSimple) gmp
++ lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
toolsForTarget = [
pkgsBuildTarget.targetPackages.stdenv.cc
] ++ lib.optional useLLVM buildLlvmPackages.llvm;
targetCC = builtins.head toolsForTarget;
# Use gold either following the default, or to avoid the BFD linker due to some bugs / perf issues.
# But we cannot avoid BFD when using musl libc due to https://sourceware.org/bugzilla/show_bug.cgi?id=23856
# see #84670 and #49071 for more background.
useLdGold = targetPlatform.linker == "gold" || (targetPlatform.linker == "bfd" && !targetPlatform.isMusl);
runtimeDeps = [
targetPackages.stdenv.cc.bintools
coreutils
]
# On darwin, we need unwrapped bintools as well (for otool)
++ lib.optionals (stdenv.targetPlatform.linker == "cctools") [
targetPackages.stdenv.cc.bintools.bintools
];
in
stdenv.mkDerivation (rec {
version = "9.2.0.20210821";
name = "${targetPrefix}ghc-${version}";
src = fetchurl {
url = "https://downloads.haskell.org/ghc/9.2.1-rc1/ghc-${version}-src.tar.xz";
sha256 = "1q2pppxv2avhykyxvyq72r5p97rkkiqp19b77yhp85ralbcp4ivw";
};
enableParallelBuilding = true;
outputs = [ "out" "doc" ];
postPatch = "patchShebangs .";
# GHC needs the locale configured during the Haddock phase.
LANG = "en_US.UTF-8";
# GHC is a bit confused on its cross terminology.
preConfigure = ''
for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do
export "''${env#TARGET_}=''${!env}"
done
# GHC is a bit confused on its cross terminology, as these would normally be
# the *host* tools.
export CC="${targetCC}/bin/${targetCC.targetPrefix}cc"
export CXX="${targetCC}/bin/${targetCC.targetPrefix}cxx"
# Use gold to work around https://sourceware.org/bugzilla/show_bug.cgi?id=16177
export LD="${targetCC.bintools}/bin/${targetCC.bintools.targetPrefix}ld${lib.optionalString useLdGold ".gold"}"
export AS="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}as"
export AR="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ar"
export NM="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}nm"
export RANLIB="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}ranlib"
export READELF="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}readelf"
export STRIP="${targetCC.bintools.bintools}/bin/${targetCC.bintools.targetPrefix}strip"
echo -n "${buildMK}" > mk/build.mk
sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure
'' + lib.optionalString (stdenv.isLinux && hostPlatform.libc == "glibc") ''
export LOCALE_ARCHIVE="${glibcLocales}/lib/locale/locale-archive"
'' + lib.optionalString (!stdenv.isDarwin) ''
export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}"
'' + lib.optionalString stdenv.isDarwin ''
export NIX_LDFLAGS+=" -no_dtrace_dof"
'' + lib.optionalString targetPlatform.useAndroidPrebuilt ''
sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets
'' + lib.optionalString targetPlatform.isMusl ''
echo "patching llvm-targets for musl targets..."
echo "Cloning these existing '*-linux-gnu*' targets:"
grep linux-gnu llvm-targets | sed 's/^/ /'
echo "(go go gadget sed)"
sed -i 's,\(^.*linux-\)gnu\(.*\)$,\0\n\1musl\2,' llvm-targets
echo "llvm-targets now contains these '*-linux-musl*' targets:"
grep linux-musl llvm-targets | sed 's/^/ /'
echo "And now patching to preserve '-musleabi' as done with '-gnueabi'"
# (aclocal.m4 is actual source, but patch configure as well since we don't re-gen)
for x in configure aclocal.m4; do
substituteInPlace $x \
--replace '*-android*|*-gnueabi*)' \
'*-android*|*-gnueabi*|*-musleabi*)'
done
'';
# TODO(@Ericson2314): Always pass "--target" and always prefix.
configurePlatforms = [ "build" "host" ]
++ lib.optional (targetPlatform != hostPlatform) "target";
# `--with` flags for libraries needed for RTS linker
configureFlags = [
"--datadir=$doc/share/doc/ghc"
"--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
] ++ lib.optionals (libffi != null) [
"--with-system-libffi"
"--with-ffi-includes=${targetPackages.libffi.dev}/include"
"--with-ffi-libraries=${targetPackages.libffi.out}/lib"
] ++ lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [
"--with-gmp-includes=${targetPackages.gmp.dev}/include"
"--with-gmp-libraries=${targetPackages.gmp.out}/lib"
] ++ lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [
"--with-iconv-includes=${libiconv}/include"
"--with-iconv-libraries=${libiconv}/lib"
] ++ lib.optionals (targetPlatform != hostPlatform) [
"--enable-bootstrap-with-devel-snapshot"
] ++ lib.optionals useLdGold [
"CFLAGS=-fuse-ld=gold"
"CONF_GCC_LINKER_OPTS_STAGE1=-fuse-ld=gold"
"CONF_GCC_LINKER_OPTS_STAGE2=-fuse-ld=gold"
] ++ lib.optionals (disableLargeAddressSpace) [
"--disable-large-address-space"
];
# Make sure we never relax`$PATH` and hooks support for compatibility.
strictDeps = true;
# Dont add -liconv to LDFLAGS automatically so that GHC will add it itself.
dontAddExtraLibs = true;
nativeBuildInputs = [
perl autoconf automake m4 python3
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
] ++ lib.optionals enableDocs [
sphinx
] ++ lib.optionals stdenv.isDarwin [
# TODO(@sternenseemann): use XATTR env var after backport of
# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6447
xattr
];
# For building runtime libs
depsBuildTarget = toolsForTarget;
buildInputs = [ perl bash ] ++ (libDeps hostPlatform);
propagatedBuildInputs = [ targetPackages.stdenv.cc ]
++ lib.optional useLLVM llvmPackages.llvm;
depsTargetTarget = map lib.getDev (libDeps targetPlatform);
depsTargetTargetPropagated = map (lib.getOutput "out") (libDeps targetPlatform);
# required, because otherwise all symbols from HSffi.o are stripped, and
# that in turn causes GHCi to abort
stripDebugFlags = [ "-S" ] ++ lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols";
checkTarget = "test";
hardeningDisable =
[ "format" ]
# In nixpkgs, musl based builds currently enable `pie` hardening by default
# (see `defaultHardeningFlags` in `make-derivation.nix`).
# But GHC cannot currently produce outputs that are ready for `-pie` linking.
# Thus, disable `pie` hardening, otherwise `recompile with -fPIE` errors appear.
# See:
# * https://github.com/NixOS/nixpkgs/issues/129247
# * https://gitlab.haskell.org/ghc/ghc/-/issues/19580
++ lib.optional stdenv.targetPlatform.isMusl "pie";
# big-parallel allows us to build with more than 2 cores on
# Hydra which already warrants a significant speedup
requiredSystemFeatures = [ "big-parallel" ];
postInstall = ''
# Install the bash completion file.
install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
# Patch scripts to include "readelf" and "cat" in $PATH.
for i in "$out/bin/"*; do
test ! -h $i || continue
egrep --quiet '^#!' <(head -n 1 $i) || continue
sed -i -e '2i export PATH="$PATH:${lib.makeBinPath runtimeDeps}"' $i
done
'';
passthru = {
inherit bootPkgs targetPrefix;
inherit llvmPackages;
inherit enableShared;
# Our Cabal compiler name
haskellCompilerName = "ghc-${version}";
};
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = with lib.maintainers; [ marcweber andres peti guibou ];
timeout = 24 * 3600;
inherit (ghc.meta) license platforms;
# integer-simple builds are broken when GHC links against musl.
# See https://github.com/NixOS/nixpkgs/pull/129606#issuecomment-881323743.
# Linker failure on macOS:
# https://gitlab.haskell.org/ghc/ghc/-/issues/19950#note_373726
broken = (enableIntegerSimple && hostPlatform.isMusl)
|| stdenv.hostPlatform.isDarwin;
};
} // lib.optionalAttrs targetPlatform.useAndroidPrebuilt {
dontStrip = true;
dontPatchELF = true;
noAuditTmpdir = true;
})

View File

@ -2,7 +2,7 @@
# build-tools
, bootPkgs
, autoconf, autoreconfHook, automake, coreutils, fetchgit, perl, python3, m4, sphinx
, autoconf, autoreconfHook, automake, coreutils, fetchgit, perl, python3, m4, sphinx, xattr
, bash
, libiconv ? null, ncurses
@ -255,6 +255,10 @@ stdenv.mkDerivation (rec {
ghc bootPkgs.alex bootPkgs.happy bootPkgs.hscolour
] ++ lib.optionals enableDocs [
sphinx
] ++ lib.optionals stdenv.isDarwin [
# TODO(@sternenseemann): use XATTR env var once we have
# https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6447
xattr
];
# For building runtime libs
@ -285,6 +289,10 @@ stdenv.mkDerivation (rec {
# * https://gitlab.haskell.org/ghc/ghc/-/issues/19580
++ lib.optional stdenv.targetPlatform.isMusl "pie";
# big-parallel allows us to build with more than 2 cores on
# Hydra which already warrants a significant speedup
requiredSystemFeatures = [ "big-parallel" ];
postInstall = ''
# Install the bash completion file.
install -D -m 444 utils/completion/ghc.bash $out/share/bash-completion/completions/${targetPrefix}ghc
@ -310,7 +318,7 @@ stdenv.mkDerivation (rec {
meta = {
homepage = "http://haskell.org/ghc";
description = "The Glasgow Haskell Compiler";
maintainers = with lib.maintainers; [ marcweber andres peti ];
maintainers = with lib.maintainers; [ marcweber andres peti guibou ];
timeout = 24 * 3600;
inherit (ghc.meta) license platforms;
# ghcHEAD times out on aarch64-linux on Hydra.

View File

@ -8,10 +8,10 @@
}:
mkDerivation {
pname = "cabal2nix";
version = "unstable-2021-08-21";
version = "unstable-2021-08-27";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/51a4082fefad4642af67a0ae4bf3bb3a7d9b45e0.tar.gz";
sha256 = "1qd991ziv54drb0n655dg4ymknlfa0ndx9nq9wb5v00a15i4c04x";
url = "https://github.com/NixOS/cabal2nix/archive/05b1b404e20eb6252f93c821d4d7974ab7277d90.tar.gz";
sha256 = "03zvp3wwqph9niadgbvkfcqabafgyhnw12r09cw23hm69hsb64d5";
};
isLibrary = true;
isExecutable = true;

View File

@ -120,14 +120,6 @@ self: super: {
# Jailbreak is necessary for QuickCheck dependency.
vector = doJailbreak (if pkgs.stdenv.isi686 then appendConfigureFlag super.vector "--ghc-options=-msse2" else super.vector);
# Test suite fails due golden tests checking text representation
# of normalized dhall expressions, and newer dhall versions format
# differently.
hpack-dhall =
if pkgs.lib.versionOlder "0.5.2" super.hpack-dhall.version
then throw "Drop dontCheck override for hpack-dhall > 0.5.2"
else dontCheck super.hpack-dhall;
inline-c-cpp = overrideCabal super.inline-c-cpp (drv: {
postPatch = (drv.postPatch or "") + ''
substituteInPlace inline-c-cpp.cabal --replace "-optc-std=c++11" ""
@ -1958,4 +1950,12 @@ EOT
# 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too.
streamly-posix = doJailbreak super.streamly-posix;
distribution-nixpkgs = assert super.distribution-nixpkgs.version == "1.6.0";
overrideCabal super.distribution-nixpkgs {
version = "1.6.1";
revision = null;
sha256 = "136q893in07iw53m9pqr65h3mrnpvfda272bl4rq1b0z3hzpyhkm";
editedCabalFile = null;
};
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

View File

@ -8,7 +8,7 @@ in
with haskellLib;
self: super: {
self: super: ({
# the tests for shell-conduit on Darwin illegitimatey assume non-GNU echo
# see: https://github.com/psibi/shell-conduit/issues/12
@ -196,6 +196,7 @@ self: super: {
hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin;
hls-pragmas-plugin = dontCheck super.hls-pragmas-plugin;
hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin;
hls-floskell-plugin = dontCheck super.hls-floskell-plugin;
# We are lacking pure pgrep at the moment for tests to work
tmp-postgres = dontCheck super.tmp-postgres;
@ -252,4 +253,11 @@ self: super: {
# Otherwise impure gcc is used, which is Apple's weird wrapper
c2hsc = addTestToolDepends super.c2hsc [ pkgs.gcc ];
}
} // lib.optionalAttrs pkgs.stdenv.isAarch64 { # aarch64-darwin
# https://github.com/fpco/unliftio/issues/87
unliftio = dontCheck super.unliftio;
# https://github.com/fpco/inline-c/issues/127
inline-c-cpp = dontCheck super.inline-c-cpp;
})

View File

@ -0,0 +1,115 @@
{ pkgs, haskellLib }:
with haskellLib;
self: super: {
# This compiler version needs llvm 10.x.
llvmPackages = pkgs.lib.dontRecurseIntoAttrs pkgs.llvmPackages_10;
# Disable GHC 9.2.x core libraries.
array = null;
base = null;
binary = null;
bytestring = null;
Cabal = null;
containers = null;
deepseq = null;
directory = null;
exceptions = null;
filepath = null;
ghc-bignum = null;
ghc-boot = null;
ghc-boot-th = null;
ghc-compact = null;
ghc-heap = null;
ghc-prim = null;
ghci = null;
haskeline = null;
hpc = null;
integer-gmp = null;
libiserv = null;
mtl = null;
parsec = null;
pretty = null;
process = null;
rts = null;
stm = null;
template-haskell = null;
terminfo = null;
text = null;
time = null;
transformers = null;
unix = null;
xhtml = null;
# cabal-install needs more recent versions of Cabal and base16-bytestring.
cabal-install = (doJailbreak super.cabal-install).overrideScope (self: super: {
Cabal = null;
base16-bytestring = self.base16-bytestring_0_1_1_7;
});
# Jailbreaks & Version Updates
async = doJailbreak super.async;
ChasingBottoms = markBrokenVersion "1.3.1.9" super.ChasingBottoms;
data-fix = doJailbreak super.data-fix;
dec = doJailbreak super.dec;
ed25519 = doJailbreak super.ed25519;
hackage-security = doJailbreak super.hackage-security;
hashable = overrideCabal (doJailbreak (dontCheck super.hashable)) (drv: { postPatch = "sed -i -e 's,integer-gmp .*<1.1,integer-gmp < 2,' hashable.cabal"; });
hashable-time = doJailbreak super.hashable-time;
HTTP = overrideCabal (doJailbreak super.HTTP) (drv: { postPatch = "sed -i -e 's,! Socket,!Socket,' Network/TCP.hs"; });
integer-logarithms = overrideCabal (doJailbreak super.integer-logarithms) (drv: { postPatch = "sed -i -e 's,integer-gmp <1.1,integer-gmp < 2,' integer-logarithms.cabal"; });
lukko = doJailbreak super.lukko;
parallel = doJailbreak super.parallel;
primitive = doJailbreak (dontCheck super.primitive);
regex-posix = doJailbreak super.regex-posix;
resolv = doJailbreak super.resolv;
singleton-bool = doJailbreak super.singleton-bool;
split = doJailbreak super.split;
tar = doJailbreak super.tar;
time-compat = doJailbreak super.time-compat;
vector = doJailbreak (dontCheck super.vector);
vector-binary-instances = doJailbreak super.vector-binary-instances;
vector-th-unbox = doJailbreak super.vector-th-unbox;
zlib = doJailbreak super.zlib;
# Apply patches from head.hackage.
alex = appendPatch (dontCheck super.alex) (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/fe192e12b88b09499d4aff0e562713e820544bd6/patches/alex-3.2.6.patch";
sha256 = "1rzs764a0nhx002v4fadbys98s6qblw4kx4g46galzjf5f7n2dn4";
});
doctest = dontCheck (doJailbreak super.doctest_0_18_1);
language-haskell-extract = appendPatch (doJailbreak super.language-haskell-extract) (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/language-haskell-extract-0.2.4.patch";
sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f";
});
# The test suite depends on ChasingBottoms, which is broken with ghc-9.0.x.
unordered-containers = dontCheck super.unordered-containers;
# The test suite seems pretty broken.
base64-bytestring = dontCheck super.base64-bytestring;
# 5 introduced support for GHC 9.0.x, but hasn't landed in stackage yet
lens = super.lens_5_0_1;
# 0.16.0 introduced support for GHC 9.0.x, stackage has 0.15.0
memory = super.memory_0_16_0;
# GHC 9.0.x doesn't like `import Spec (main)` in Main.hs
# https://github.com/snoyberg/mono-traversable/issues/192
mono-traversable = dontCheck super.mono-traversable;
# Disable tests pending resolution of
# https://github.com/Soostone/retry/issues/71
retry = dontCheck super.retry;
# hlint 3.3 needs a ghc-lib-parser newer than the one from stackage
hlint = super.hlint_3_3_1.overrideScope (self: super: {
ghc-lib-parser = overrideCabal self.ghc-lib-parser_9_0_1_20210324 {
doHaddock = false;
};
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_0_0_4;
});
}

View File

@ -632,7 +632,6 @@ broken-packages:
- cio
- cipher-blowfish
- circlehs
- circular
- citeproc-hs
- cjk
- cj-token
@ -1021,9 +1020,11 @@ broken-packages:
- dgim
- dgs
- dhall-check
- dhall-csv
- dhall-fly
- dhall-text
- dhall-to-cabal
- dhall-toml
- dhcp-lease-parser
- dhrun
- dia-base
@ -2535,6 +2536,7 @@ broken-packages:
- IsNull
- iso8601-duration
- isobmff
- isocline
- isotope
- itcli
- itemfield
@ -3194,7 +3196,6 @@ broken-packages:
- nanomsg-haskell
- nanoparsec
- NanoProlog
- nanovg
- nanq
- naperian
- naqsha
@ -4802,6 +4803,7 @@ broken-packages:
- th-traced
- thumbnail-plus
- tianbar
- ticket-management
- TicTacToe
- tictactoe3d
- tidal-midi
@ -5329,6 +5331,7 @@ broken-packages:
- yandex-translate
- yaop
- yap
- yapb
- yarr
- yaya-test
- yaya-unsafe-test

View File

@ -63,10 +63,9 @@ core-packages:
# available on Hackage, `hackage2nix` would generate two packages, `aeson`
# at version 1.4.6.0 and `aeson_1_5_0_0` at version 1.5.0.0.
#
# WARNING: This list is generated semiautomatically based on the most recent
# LTS package set. If you want to add entries to it, you must do so before the
# comment saying "# LTS Haskell x.y". Any changes after that comment will be
# lost the next time `update-stackage.sh` runs.
# WARNING: We import a list of default-package-overrides from stackage which is
# tracked in stackage.yaml. Adding conflicting overrides with stackage here will
# not work.
default-package-overrides:
# This was only intended for ghc-7.0.4, and has very old deps, one hidden behind a flag
- MissingH ==1.4.2.0
@ -91,6 +90,8 @@ default-package-overrides:
- streamly-bytestring < 0.1.3
- streamly-lmdb < 0.3.0
- streamly-process
# dhall-nix is not part of stackage, remove if dhall >= 1.40
- dhall-nix < 1.1.22
extra-packages:
- base16-bytestring < 1 # required for cabal-install etc.
@ -337,130 +338,130 @@ package-maintainers:
- nix-tree
unsupported-platforms:
Allure: [ x86_64-darwin ]
alsa-mixer: [ x86_64-darwin ]
alsa-pcm: [ x86_64-darwin ]
alsa-seq: [ x86_64-darwin ]
AWin32Console: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
Allure: [ x86_64-darwin, aarch64-darwin ]
alsa-mixer: [ x86_64-darwin, aarch64-darwin ]
alsa-pcm: [ x86_64-darwin, aarch64-darwin ]
alsa-seq: [ x86_64-darwin, aarch64-darwin ]
AWin32Console: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
barbly: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ]
bdcs-api: [ x86_64-darwin ]
bindings-directfb: [ x86_64-darwin ]
bindings-parport: [ x86_64-darwin ] # parport is a linux kernel component
bindings-sane: [ x86_64-darwin ]
btrfs: [ x86_64-darwin ] # depends on linux
bustle: [ x86_64-darwin ] # uses glibc-specific ptsname_r
bdcs-api: [ x86_64-darwin, aarch64-darwin ]
bindings-directfb: [ x86_64-darwin, aarch64-darwin ]
bindings-parport: [ x86_64-darwin, aarch64-darwin ] # parport is a linux kernel component
bindings-sane: [ x86_64-darwin, aarch64-darwin ]
btrfs: [ x86_64-darwin, aarch64-darwin ] # depends on linux
bustle: [ x86_64-darwin, aarch64-darwin ] # uses glibc-specific ptsname_r
charsetdetect: [ aarch64-linux ] # not supported by vendored lib / not configured properly https://github.com/batterseapower/libcharsetdetect/issues/3
crackNum: [ aarch64-linux ] # depends on sbv, which is not supported on aarch64-linux
cut-the-crap: [ x86_64-darwin ]
d3d11binding: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
DirectSound: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
dx9base: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
dx9d3d: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
dx9d3dx: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
Euterpea: [ x86_64-darwin ]
follow-file: [ x86_64-darwin ]
freenect: [ x86_64-darwin ]
FTGL: [ x86_64-darwin ]
fuzzytime: [ x86_64-darwin ] # https://github.com/kamwitsta/fuzzytime/issues/2
ghcjs-dom-hello: [ x86_64-darwin ]
gi-dbusmenugtk3: [ x86_64-darwin ]
gi-dbusmenu: [ x86_64-darwin ]
gi-ggit: [ x86_64-darwin ]
gi-ibus: [ x86_64-darwin ]
gi-ostree: [ x86_64-darwin ]
gi-vte: [ x86_64-darwin ]
gi-wnck: [ x86_64-darwin ]
gnome-keyring: [ x86_64-darwin ]
cut-the-crap: [ x86_64-darwin, aarch64-darwin ]
d3d11binding: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
DirectSound: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
dx9base: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
dx9d3d: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
dx9d3dx: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Euterpea: [ x86_64-darwin, aarch64-darwin ]
follow-file: [ x86_64-darwin, aarch64-darwin ]
freenect: [ x86_64-darwin, aarch64-darwin ]
FTGL: [ x86_64-darwin, aarch64-darwin ]
fuzzytime: [ x86_64-darwin, aarch64-darwin ] # https://github.com/kamwitsta/fuzzytime/issues/2
ghcjs-dom-hello: [ x86_64-darwin, aarch64-darwin ]
gi-dbusmenugtk3: [ x86_64-darwin, aarch64-darwin ]
gi-dbusmenu: [ x86_64-darwin, aarch64-darwin ]
gi-ggit: [ x86_64-darwin, aarch64-darwin ]
gi-ibus: [ x86_64-darwin, aarch64-darwin ]
gi-ostree: [ x86_64-darwin, aarch64-darwin ]
gi-vte: [ x86_64-darwin, aarch64-darwin ]
gi-wnck: [ x86_64-darwin, aarch64-darwin ]
gnome-keyring: [ x86_64-darwin, aarch64-darwin ]
gtk-mac-integration: [ i686-linux, x86_64-linux, aarch64-linux, armv7l-linux ]
gtk-sni-tray: [ x86_64-darwin ]
haskell-snake: [ x86_64-darwin ]
hcwiid: [ x86_64-darwin ]
gtk-sni-tray: [ x86_64-darwin, aarch64-darwin ]
haskell-snake: [ x86_64-darwin, aarch64-darwin ]
hcwiid: [ x86_64-darwin, aarch64-darwin ]
hevm: [ aarch64-linux ] # depends on sbv, which is not supported on aarch64-linux
HFuse: [ x86_64-darwin ]
hidapi: [ x86_64-darwin ]
hinotify-bytestring: [ x86_64-darwin ]
hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
honk: [ x86_64-darwin ]
hpapi: [ x86_64-darwin ]
HFuse: [ x86_64-darwin, aarch64-darwin ]
hidapi: [ x86_64-darwin, aarch64-darwin ]
hinotify-bytestring: [ x86_64-darwin, aarch64-darwin ]
hommage-ds: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
honk: [ x86_64-darwin, aarch64-darwin ]
hpapi: [ x86_64-darwin, aarch64-darwin ]
HQu: [ aarch64-linux, armv7l-linux ] # unsupported by vendored C++ library, TODO: explicitly list supported platforms
HSoM: [ x86_64-darwin ]
iwlib: [ x86_64-darwin ]
jsaddle-webkit2gtk: [ x86_64-darwin ]
HSoM: [ x86_64-darwin, aarch64-darwin ]
iwlib: [ x86_64-darwin, aarch64-darwin ]
jsaddle-webkit2gtk: [ x86_64-darwin, aarch64-darwin ]
kqueue: [ x86_64-linux, aarch64-linux, i686-linux, armv7l-linux ] # BSD / Darwin only API
LambdaHack: [ x86_64-darwin ]
LambdaHack: [ x86_64-darwin, aarch64-darwin ]
large-hashable: [ aarch64-linux ] # https://github.com/factisresearch/large-hashable/issues/17
libmodbus: [ x86_64-darwin ]
libsystemd-journal: [ x86_64-darwin ]
libtelnet: [ x86_64-darwin ]
libzfs: [ x86_64-darwin ]
libmodbus: [ x86_64-darwin, aarch64-darwin ]
libsystemd-journal: [ x86_64-darwin, aarch64-darwin ]
libtelnet: [ x86_64-darwin, aarch64-darwin ]
libzfs: [ x86_64-darwin, aarch64-darwin ]
linearEqSolver: [ aarch64-linux ]
linux-evdev: [ x86_64-darwin ]
linux-file-extents: [ x86_64-darwin ]
linux-inotify: [ x86_64-darwin ]
linux-mount: [ x86_64-darwin ]
linux-namespaces: [ x86_64-darwin ]
lio-fs: [ x86_64-darwin ]
logging-facade-journald: [ x86_64-darwin ]
midi-alsa: [ x86_64-darwin ]
mpi-hs: [ aarch64-linux, x86_64-darwin ]
mpi-hs-binary: [ aarch64-linux, x86_64-darwin ]
mpi-hs-cereal: [ aarch64-linux, x86_64-darwin ]
mpi-hs-store: [ aarch64-linux, x86_64-darwin ]
linux-evdev: [ x86_64-darwin, aarch64-darwin ]
linux-file-extents: [ x86_64-darwin, aarch64-darwin ]
linux-inotify: [ x86_64-darwin, aarch64-darwin ]
linux-mount: [ x86_64-darwin, aarch64-darwin ]
linux-namespaces: [ x86_64-darwin, aarch64-darwin ]
lio-fs: [ x86_64-darwin, aarch64-darwin ]
logging-facade-journald: [ x86_64-darwin, aarch64-darwin ]
midi-alsa: [ x86_64-darwin, aarch64-darwin ]
mpi-hs: [ aarch64-linux, x86_64-darwin, aarch64-darwin ]
mpi-hs-binary: [ aarch64-linux, x86_64-darwin, aarch64-darwin ]
mpi-hs-cereal: [ aarch64-linux, x86_64-darwin, aarch64-darwin ]
mpi-hs-store: [ aarch64-linux, x86_64-darwin, aarch64-darwin ]
mplayer-spot: [ aarch64-linux ]
mptcp-pm: [ x86_64-darwin ]
netlink: [ x86_64-darwin ]
notifications-tray-icon: [ x86_64-darwin ] # depends on gi-dbusmenu
oculus: [ x86_64-darwin ]
pam: [ x86_64-darwin ]
parport: [ x86_64-darwin ]
mptcp-pm: [ x86_64-darwin, aarch64-darwin ]
netlink: [ x86_64-darwin, aarch64-darwin ]
notifications-tray-icon: [ x86_64-darwin, aarch64-darwin ] # depends on gi-dbusmenu
oculus: [ x86_64-darwin, aarch64-darwin ]
pam: [ x86_64-darwin, aarch64-darwin ]
parport: [ x86_64-darwin, aarch64-darwin ]
password: [ aarch64-linux, armv7l-linux ] # uses scrypt, which requries x86
password-instances: [ aarch64-linux, armv7l-linux ] # uses scrypt, which requries x86
persist-state: [ aarch64-linux, armv7l-linux ] # https://github.com/minad/persist-state/blob/6fd68c0b8b93dec78218f6d5a1f4fa06ced4e896/src/Data/PersistState.hs#L122-L128
piyo: [ x86_64-darwin ]
PortMidi-simple: [ x86_64-darwin ]
PortMidi: [ x86_64-darwin ]
posix-api: [ x86_64-darwin ]
Raincat: [ x86_64-darwin ]
reactive-balsa: [ x86_64-darwin ] # depends on alsa-core
reactivity: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
reflex-dom-fragment-shader-canvas: [ x86_64-darwin, aarch64-linux ]
reflex-dom: [ x86_64-darwin, aarch64-linux ]
reflex-localize-dom: [ x86_64-darwin, aarch64-linux ]
rtlsdr: [ x86_64-darwin ]
rubberband: [ x86_64-darwin ]
piyo: [ x86_64-darwin, aarch64-darwin ]
PortMidi-simple: [ x86_64-darwin, aarch64-darwin ]
PortMidi: [ x86_64-darwin, aarch64-darwin ]
posix-api: [ x86_64-darwin, aarch64-darwin ]
Raincat: [ x86_64-darwin, aarch64-darwin ]
reactive-balsa: [ x86_64-darwin, aarch64-darwin ] # depends on alsa-core
reactivity: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
reflex-dom-fragment-shader-canvas: [ x86_64-darwin, aarch64-darwin, aarch64-linux ]
reflex-dom: [ x86_64-darwin, aarch64-darwin, aarch64-linux ]
reflex-localize-dom: [ x86_64-darwin, aarch64-darwin, aarch64-linux ]
rtlsdr: [ x86_64-darwin, aarch64-darwin ]
rubberband: [ x86_64-darwin, aarch64-darwin ]
sbv: [ aarch64-linux ]
scat: [ aarch64-linux, armv7l-linux ] # uses scrypt, which requries x86
scrypt: [ aarch64-linux, armv7l-linux ] # https://github.com/informatikr/scrypt/issues/8
sdl2-mixer: [ x86_64-darwin ]
sdl2-ttf: [ x86_64-darwin ]
synthesizer-alsa: [ x86_64-darwin ]
taffybar: [ x86_64-darwin ]
termonad: [ x86_64-darwin ]
tokyotyrant-haskell: [ x86_64-darwin ]
udev: [ x86_64-darwin ]
Unixutils-shadow: [ x86_64-darwin ]
sdl2-mixer: [ x86_64-darwin, aarch64-darwin ]
sdl2-ttf: [ x86_64-darwin, aarch64-darwin ]
synthesizer-alsa: [ x86_64-darwin, aarch64-darwin ]
taffybar: [ x86_64-darwin, aarch64-darwin ]
termonad: [ x86_64-darwin, aarch64-darwin ]
tokyotyrant-haskell: [ x86_64-darwin, aarch64-darwin ]
udev: [ x86_64-darwin, aarch64-darwin ]
Unixutils-shadow: [ x86_64-darwin, aarch64-darwin ]
verifiable-expressions: [ aarch64-linux ]
vrpn: [ x86_64-darwin ]
vulkan: [ i686-linux, armv7l-linux, x86_64-darwin ]
VulkanMemoryAllocator: [ i686-linux, armv7l-linux, x86_64-darwin ]
vulkan-utils: [ x86_64-darwin ]
webkit2gtk3-javascriptcore: [ x86_64-darwin ]
Win32-console: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
Win32-dhcp-server: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
Win32-errors: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
Win32-extras: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
Win32: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
Win32-junction-point: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
Win32-notify: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
Win32-security: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
Win32-services: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
Win32-services-wrapper: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
xattr: [ x86_64-darwin ]
vrpn: [ x86_64-darwin, aarch64-darwin ]
vulkan: [ i686-linux, armv7l-linux, x86_64-darwin, aarch64-darwin ]
VulkanMemoryAllocator: [ i686-linux, armv7l-linux, x86_64-darwin, aarch64-darwin ]
vulkan-utils: [ x86_64-darwin, aarch64-darwin ]
webkit2gtk3-javascriptcore: [ x86_64-darwin, aarch64-darwin ]
Win32-console: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Win32-dhcp-server: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Win32-errors: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Win32-extras: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Win32: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Win32-junction-point: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Win32-notify: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Win32-security: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Win32-services: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
Win32-services-wrapper: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
xattr: [ x86_64-darwin, aarch64-darwin ]
xgboost-haskell: [ aarch64-linux, armv7l-linux ]
XInput: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-linux, armv7l-linux ]
xmobar: [ x86_64-darwin ]
xmonad-extras: [ x86_64-darwin ]
xmonad-volume: [ x86_64-darwin ]
XInput: [ i686-linux, x86_64-linux, x86_64-darwin, aarch64-darwin, aarch64-linux, armv7l-linux ]
xmobar: [ x86_64-darwin, aarch64-darwin ]
xmonad-extras: [ x86_64-darwin, aarch64-darwin ]
xmonad-volume: [ x86_64-darwin, aarch64-darwin ]
dont-distribute-packages:
# Depends on shine, which is a ghcjs project.

View File

@ -1,4 +1,4 @@
# Stackage LTS 18.5
# Stackage LTS 18.7
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -11,8 +11,8 @@ default-package-overrides:
- ad ==4.4.1
- adjunctions ==4.4
- adler32 ==0.1.2.0
- aern2-mp ==0.2.7.0
- aern2-real ==0.2.7.0
- aern2-mp ==0.2.8.0
- aern2-real ==0.2.8.0
- aeson ==1.5.6.0
- aeson-attoparsec ==0.0.0
- aeson-better-errors ==0.9.1.0
@ -145,7 +145,7 @@ default-package-overrides:
- ansi-terminal ==0.11
- ansi-wl-pprint ==0.6.9
- ANum ==0.2.0.2
- apecs ==0.9.2
- apecs ==0.9.3
- apecs-gloss ==0.2.4
- apecs-physics ==0.4.5
- api-field-json-th ==0.1.0.2
@ -269,7 +269,7 @@ default-package-overrides:
- blake2 ==0.3.0
- blanks ==0.5.0
- blas-carray ==0.1.0.1
- blas-comfort-array ==0.0.0.2
- blas-comfort-array ==0.0.0.3
- blas-ffi ==0.1
- blaze-bootstrap ==0.1.0.1
- blaze-builder ==0.4.2.1
@ -288,7 +288,7 @@ default-package-overrides:
- boots ==0.2.0.1
- bordacount ==0.1.0.0
- boring ==0.2
- both ==0.1.1.1
- both ==0.1.1.2
- bound ==2.0.3
- BoundedChan ==1.0.3.0
- bounded-queue ==1.0.0
@ -311,7 +311,7 @@ default-package-overrides:
- bv ==0.5
- bv-little ==1.1.1
- byteable ==0.1.1
- byte-count-reader ==0.10.1.3
- byte-count-reader ==0.10.1.5
- bytedump ==1.0
- byte-order ==0.1.2.0
- byteorder ==1.0.4
@ -331,13 +331,15 @@ default-package-overrides:
- c2hs ==0.28.8
- cabal2spec ==2.6.2
- cabal-appimage ==0.3.0.2
- cabal-clean ==0.1.20210815
- cabal-debian ==5.1
- cabal-doctest ==1.0.8
- cabal-file ==0.1.1
- cabal-flatpak ==0.1.0.2
- cabal-plan ==0.7.2.0
- cabal-rpm ==2.0.9
- cabal-rpm ==2.0.10
- cache ==0.1.3.0
- cached-json-file ==0.1.0
- cacophony ==0.10.1
- calendar-recycling ==0.0.0.1
- call-stack ==0.3.0
@ -381,7 +383,7 @@ default-package-overrides:
- cheapskate-lucid ==0.1.0.0
- checkers ==0.5.6
- checksum ==0.0
- chimera ==0.3.1.0
- chimera ==0.3.2.0
- chiphunk ==0.1.4.0
- choice ==0.2.2
- chronologique ==0.3.1.3
@ -395,9 +397,9 @@ default-package-overrides:
- circle-packing ==0.1.0.6
- circular ==0.4.0.0
- citeproc ==0.4.0.1
- clash-ghc ==1.4.2
- clash-lib ==1.4.2
- clash-prelude ==1.4.2
- clash-ghc ==1.4.3
- clash-lib ==1.4.3
- clash-prelude ==1.4.3
- classy-prelude ==1.5.0
- classy-prelude-conduit ==1.5.0
- clay ==0.13.3
@ -415,7 +417,7 @@ default-package-overrides:
- codec-beam ==0.2.0
- code-page ==0.2.1
- collect-errors ==0.1.5.0
- co-log-concurrent ==0.5.0.0
- co-log-concurrent ==0.5.1.0
- co-log-core ==0.2.1.1
- Color ==0.3.2
- colorful-monoids ==0.2.1.3
@ -439,7 +441,7 @@ default-package-overrides:
- composition ==1.0.2.2
- composition-extra ==2.0.0
- concise ==0.1.0.1
- concurrency ==1.11.0.1
- concurrency ==1.11.0.2
- concurrent-extra ==0.7.0.12
- concurrent-output ==1.10.12
- concurrent-split ==0.0.1.1
@ -579,7 +581,7 @@ default-package-overrides:
- deepseq-generics ==0.2.0.0
- deepseq-instances ==0.1.0.1
- deferred-folds ==0.9.17
- dejafu ==2.4.0.2
- dejafu ==2.4.0.3
- dense-linear-algebra ==0.1.0.0
- dependent-map ==0.4.0.0
- dependent-sum ==0.7.1.0
@ -743,7 +745,7 @@ default-package-overrides:
- fakefs ==0.3.0.2
- fakepull ==0.3.0.2
- faktory ==1.0.3.1
- fast-digits ==0.3.0.0
- fast-digits ==0.3.1.0
- fast-logger ==3.0.5
- fast-math ==1.0.2
- fb ==2.1.1
@ -759,7 +761,7 @@ default-package-overrides:
- file-embed-lzma ==0
- filelock ==0.1.1.5
- filemanip ==0.3.6.3
- filepath-bytestring ==1.4.2.1.7
- filepath-bytestring ==1.4.2.1.8
- file-path-th ==0.1.0.0
- filepattern ==0.1.2
- fileplow ==0.1.0.0
@ -890,9 +892,9 @@ default-package-overrides:
- ghcid ==0.8.7
- ghci-hexcalc ==0.1.1.0
- ghcjs-codemirror ==0.0.0.2
- ghc-lib ==8.10.5.20210606
- ghc-lib-parser ==8.10.5.20210606
- ghc-lib-parser-ex ==8.10.0.21
- ghc-lib ==8.10.6.20210814
- ghc-lib-parser ==8.10.6.20210814
- ghc-lib-parser-ex ==8.10.0.22
- ghc-parser ==0.2.3.0
- ghc-paths ==0.1.0.12
- ghc-prof ==1.4.1.9
@ -985,7 +987,7 @@ default-package-overrides:
- hashing ==0.1.0.1
- hashmap ==1.3.3
- hashtables ==1.2.4.1
- haskeline ==0.8.1.2
- haskeline ==0.8.2
- haskell-awk ==1.2.0.1
- haskell-gi ==0.25.0
- haskell-gi-base ==0.25.0
@ -1081,7 +1083,7 @@ default-package-overrides:
- hourglass-orphans ==0.1.0.0
- hp2pretty ==0.10
- hpack ==0.34.4
- hpack-dhall ==0.5.2
- hpack-dhall ==0.5.3
- hpc-codecov ==0.3.0.0
- hpc-lcov ==1.0.1
- hprotoc ==2.4.17
@ -1134,7 +1136,7 @@ default-package-overrides:
- hs-php-session ==0.0.9.3
- hsshellscript ==3.5.0
- hs-tags ==0.1.5
- HStringTemplate ==0.8.7
- HStringTemplate ==0.8.8
- HSvm ==0.1.1.3.22
- HsYAML ==0.2.1.0
- HsYAML-aeson ==0.2.0.0
@ -1142,7 +1144,7 @@ default-package-overrides:
- htaglib ==1.2.0
- HTF ==0.14.0.6
- html ==1.0.1.2
- html-conduit ==1.3.2.1
- html-conduit ==1.3.2.2
- html-entities ==1.1.4.5
- html-entity-map ==0.1.0.0
- htoml ==1.0.0.3
@ -1168,7 +1170,7 @@ default-package-overrides:
- human-readable-duration ==0.2.1.4
- HUnit ==1.6.2.0
- HUnit-approx ==1.1.1.1
- hunit-dejafu ==2.0.0.4
- hunit-dejafu ==2.0.0.5
- hvect ==0.4.0.0
- hvega ==0.11.0.1
- hw-balancedparens ==0.4.1.1
@ -1255,7 +1257,7 @@ default-package-overrides:
- intern ==0.9.4
- interpolate ==0.2.1
- interpolatedstring-perl6 ==1.0.2
- interpolation ==0.1.1.1
- interpolation ==0.1.1.2
- interpolator ==1.1.0.2
- IntervalMap ==0.6.1.2
- intervals ==0.9.2
@ -1278,9 +1280,9 @@ default-package-overrides:
- ipynb ==0.1.0.1
- ipython-kernel ==0.10.2.1
- irc ==0.6.1.0
- irc-client ==1.1.2.1
- irc-conduit ==0.3.0.4
- irc-ctcp ==0.1.3.0
- irc-client ==1.1.2.2
- irc-conduit ==0.3.0.5
- irc-ctcp ==0.1.3.1
- isbn ==1.1.0.2
- islink ==0.1.0.0
- iso3166-country-codes ==0.20140203.8
@ -1294,6 +1296,7 @@ default-package-overrides:
- ix-shapable ==0.1.0
- jack ==0.7.2
- jalaali ==1.0.0.0
- java-adt ==0.2018.11.4
- jira-wiki-markup ==1.4.0
- jose ==0.8.4
- jose-jwt ==0.9.2
@ -1335,14 +1338,14 @@ default-package-overrides:
- l10n ==0.1.0.1
- labels ==0.3.3
- lackey ==1.0.15
- lambdabot-core ==5.3.0.1
- lambdabot-core ==5.3.0.2
- LambdaHack ==0.10.2.0
- lame ==0.2.0
- language-avro ==0.1.3.1
- language-bash ==0.9.2
- language-c ==0.9.0.1
- language-c-quote ==0.13
- language-docker ==10.0.1
- language-docker ==10.0.2
- language-java ==0.2.9
- language-javascript ==0.7.1.0
- language-protobuf ==1.0.1
@ -1350,7 +1353,7 @@ default-package-overrides:
- language-thrift ==0.12.0.0
- lapack ==0.3.2
- lapack-carray ==0.0.3
- lapack-comfort-array ==0.0.0.1
- lapack-comfort-array ==0.0.1
- lapack-ffi ==0.0.3
- lapack-ffi-tools ==0.1.2.1
- largeword ==1.2.5
@ -1510,7 +1513,7 @@ default-package-overrides:
- min-max-pqueue ==0.1.0.2
- mintty ==0.1.2
- missing-foreign ==0.1.1
- mixed-types-num ==0.5.8.0
- mixed-types-num ==0.5.9.1
- mltool ==0.2.0.1
- mmap ==0.5.9
- mmark ==0.0.7.2
@ -1526,9 +1529,9 @@ default-package-overrides:
- modern-uri ==0.3.4.1
- modular ==0.1.0.8
- monad-chronicle ==1.0.0.1
- monad-control ==1.0.3
- monad-control ==1.0.3.1
- monad-control-aligned ==0.0.1.1
- monad-coroutine ==0.9.1.2
- monad-coroutine ==0.9.1.3
- monad-extras ==0.6.0
- monadic-arrays ==0.2.2
- monad-journal ==0.8.1
@ -1541,7 +1544,7 @@ default-package-overrides:
- monad-memo ==0.5.3
- monad-metrics ==0.2.2.0
- monad-par ==0.3.5
- monad-parallel ==0.7.2.4
- monad-parallel ==0.7.2.5
- monad-par-extras ==0.3.3
- monad-peel ==0.2.1.2
- monad-primitive ==0.1
@ -1586,7 +1589,7 @@ default-package-overrides:
- mustache ==2.3.1
- mutable-containers ==0.3.4
- mwc-probability ==2.3.1
- mwc-random ==0.15.0.1
- mwc-random ==0.15.0.2
- mwc-random-monad ==0.7.3.1
- mx-state-codes ==1.0.0.0
- mysql ==0.2.0.1
@ -1604,7 +1607,7 @@ default-package-overrides:
- neat-interpolation ==0.5.1.2
- netcode-io ==0.0.2
- netlib-carray ==0.1
- netlib-comfort-array ==0.0.0.1
- netlib-comfort-array ==0.0.0.2
- netlib-ffi ==0.1.1
- net-mqtt ==0.7.1.1
- net-mqtt-lens ==0.1.1.0
@ -1674,7 +1677,7 @@ default-package-overrides:
- OneTuple ==0.2.2.1
- Only ==0.1
- oo-prototypes ==0.1.0.0
- opaleye ==0.7.3.0
- opaleye ==0.7.4.0
- OpenAL ==1.7.0.5
- openapi3 ==3.1.0
- open-browser ==0.2.1.0
@ -1803,6 +1806,7 @@ default-package-overrides:
- pointedlist ==0.6.1
- pointless-fun ==1.1.0.6
- poll ==0.0.0.2
- polling-cache ==0.1.1.0
- poly ==0.5.0.0
- poly-arity ==0.1.0
- polynomials-bernstein ==1.1.2
@ -1844,7 +1848,7 @@ default-package-overrides:
- pretty-sop ==0.2.0.3
- pretty-terminal ==0.1.0.0
- primes ==0.2.1.0
- primitive ==0.7.1.0
- primitive ==0.7.2.0
- primitive-addr ==0.1.0.2
- primitive-extras ==0.10.1
- primitive-unaligned ==0.1.1.1
@ -1971,6 +1975,7 @@ default-package-overrides:
- regex-pcre ==0.95.0.0
- regex-pcre-builtin ==0.95.2.3.8.43
- regex-posix ==0.96.0.1
- regex-posix-clib ==2.7
- regex-tdfa ==1.3.1.1
- regex-with-pcre ==1.1.0.0
- registry ==0.2.0.3
@ -1983,17 +1988,17 @@ default-package-overrides:
- reliable-io ==0.0.1
- relude ==0.7.0.0
- renderable ==0.2.0.1
- replace-attoparsec ==1.4.4.0
- replace-attoparsec ==1.4.5.0
- replace-megaparsec ==1.4.4.0
- repline ==0.4.0.0
- req ==3.9.0
- req-conduit ==1.0.0
- req-conduit ==1.0.1
- rerebase ==1.13.0.1
- rescue ==0.4.2.1
- resistor-cube ==0.0.1.2
- resolv ==0.1.2.0
- resource-pool ==0.2.3.2
- resourcet ==1.2.4.2
- resourcet ==1.2.4.3
- result ==0.2.6.0
- rethinkdb-client-driver ==0.0.25
- retry ==0.8.1.2
@ -2004,7 +2009,7 @@ default-package-overrides:
- rhine ==0.7.0
- rhine-gloss ==0.7.0
- rigel-viz ==0.2.0.0
- rio ==0.1.20.0
- rio ==0.1.21.0
- rio-orphans ==0.1.2.0
- rio-prettyprint ==0.1.1.0
- roc-id ==0.1.0.0
@ -2158,6 +2163,7 @@ default-package-overrides:
- singletons ==2.7
- singletons-presburger ==0.6.0.0
- siphash ==1.0.3
- Sit ==0.2021.1.18
- sitemap-gen ==0.1.0.0
- sized ==1.0.0.0
- skein ==1.0.9.4
@ -2239,7 +2245,7 @@ default-package-overrides:
- storable-record ==0.0.5
- storable-tuple ==0.0.3.3
- storablevector ==0.2.13.1
- store ==0.7.11
- store ==0.7.12
- store-core ==0.4.4.4
- store-streaming ==0.2.0.3
- stratosphere ==0.59.1
@ -2315,7 +2321,7 @@ default-package-overrides:
- tasty ==1.4.1
- tasty-ant-xml ==1.1.8
- tasty-bench ==0.2.5
- tasty-dejafu ==2.0.0.7
- tasty-dejafu ==2.0.0.8
- tasty-discover ==4.2.2
- tasty-expected-failure ==0.12.3
- tasty-focus ==1.0.1
@ -2356,7 +2362,7 @@ default-package-overrides:
- test-framework-smallcheck ==0.2
- test-fun ==0.1.0.0
- testing-type-modifiers ==0.1.0.1
- texmath ==0.12.3
- texmath ==0.12.3.1
- text-ansi ==0.1.1
- text-binary ==0.2.1.1
- text-builder ==0.6.6.2
@ -2427,7 +2433,7 @@ default-package-overrides:
- timezone-series ==0.1.9
- tinylog ==0.15.0
- titlecase ==1.0.1
- tldr ==0.9.0
- tldr ==0.9.1
- tls ==1.5.5
- tls-debug ==0.4.8
- tls-session-manager ==0.0.4
@ -2441,7 +2447,7 @@ default-package-overrides:
- torsor ==0.1
- tostring ==0.2.1.1
- transaction ==0.1.1.3
- transformers-base ==0.4.5.2
- transformers-base ==0.4.6
- transformers-bifunctors ==0.1
- transformers-compat ==0.6.6
- transformers-fix ==1.0
@ -2463,11 +2469,11 @@ default-package-overrides:
- turtle ==1.5.22
- typecheck-plugin-nat-simple ==0.1.0.2
- TypeCompose ==0.9.14
- typed-process ==0.2.6.0
- typed-process ==0.2.6.1
- typed-uuid ==0.1.0.0
- type-equality ==1
- type-errors ==0.2.0.0
- type-errors-pretty ==0.0.1.1
- type-errors-pretty ==0.0.1.2
- type-hint ==0.1
- type-level-integers ==0.0.1
- type-level-kv-list ==1.1.0
@ -2593,7 +2599,7 @@ default-package-overrides:
- wai-feature-flags ==0.1.0.1
- wai-handler-launch ==3.0.3.1
- wai-logger ==2.3.6
- wai-middleware-auth ==0.2.5.0
- wai-middleware-auth ==0.2.5.1
- wai-middleware-caching ==0.1.0.2
- wai-middleware-clacks ==0.1.0.1
- wai-middleware-prometheus ==1.0.0
@ -2649,7 +2655,7 @@ default-package-overrides:
- writer-cps-transformers ==0.5.6.1
- wss-client ==0.3.0.0
- wuss ==1.1.18
- X11 ==1.10
- X11 ==1.10.1
- X11-xft ==0.3.1
- x11-xim ==0.0.9.0
- x509 ==1.7.5

View File

@ -391,7 +391,6 @@ dont-distribute-packages:
- adict
- adp-multi-monadiccp
- aern2-real
- aern2-real_0_2_8_0
- aeson-native
- afv
- agda-server
@ -712,14 +711,14 @@ dont-distribute-packages:
- claferwiki
- clash
- clash-ghc
- clash-ghc_1_4_3
- clash-lib
- clash-lib_1_4_3
- clash-multisignal
- clash-prelude-quickcheck
- clash-shake
- clash-systemverilog
- clash-verilog
- clash-vhdl
- clashilator
- classify-frog
- classy-miso
- clckwrks
@ -1063,7 +1062,6 @@ dont-distribute-packages:
- falling-turnip
- fallingblocks
- family-tree
- fast-digits
- fastirc
- fault-tree
- fbrnch
@ -1131,6 +1129,7 @@ dont-distribute-packages:
- fplll
- fpnla-examples
- frame-markdown
- freckle-app
- free-theorems-counterexamples
- free-theorems-seq
- free-theorems-seq-webui
@ -1855,7 +1854,6 @@ dont-distribute-packages:
- knots
- korfu
- ks-test
- kubernetes-client
- kurita
- laborantin-hs
- labsat
@ -1895,7 +1893,6 @@ dont-distribute-packages:
- lapack
- lapack-carray
- lapack-comfort-array
- lapack-comfort-array_0_0_1
- lapack-hmatrix
- lapack_0_4
- lat
@ -2006,7 +2003,6 @@ dont-distribute-packages:
- loup
- ls-usb
- lsystem
- lti13
- luachunk
- lucid-colonnade
- lucienne
@ -2064,7 +2060,6 @@ dont-distribute-packages:
- maxent
- maxent-learner-hw-gui
- maxsharing
- mcmc
- mcmc-samplers
- mealy
- mediabus-fdk-aac
@ -2114,7 +2109,6 @@ dont-distribute-packages:
- monetdb-mapi
- mongrel2-handler
- monky
- monomer
- monte-carlo
- moo
- moo-nad
@ -2172,7 +2166,6 @@ dont-distribute-packages:
- mywatch
- n2o-web
- nakadi-client
- nanovg-simple
- nats-queue
- natural-number
- nemesis-titan
@ -2591,6 +2584,8 @@ dont-distribute-packages:
- restful-snap
- restricted-workers
- rethinkdb-model
- retroclash-lib
- retroclash-sim
- rewrite
- rewriting
- rezoom
@ -3270,7 +3265,6 @@ dont-distribute-packages:
- yeshql
- yesod-articles
- yesod-auth-ldap
- yesod-auth-lti13
- yesod-colonnade
- yesod-continuations
- yesod-examples

View File

@ -223,7 +223,11 @@ self: super: builtins.intersectAttrs super {
wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK30; };
# Test suite wants to connect to $DISPLAY.
bindings-GLFW = dontCheck super.bindings-GLFW;
gi-gtk-declarative = dontCheck super.gi-gtk-declarative;
gi-gtk-declarative-app-simple = dontCheck super.gi-gtk-declarative-app-simple;
hsqml = dontCheck (addExtraLibraries (super.hsqml.override { qt5 = pkgs.qt5Full; }) [pkgs.libGLU pkgs.libGL]);
monomer = dontCheck super.monomer;
# Wants to check against a real DB, Needs freetds
odbc = dontCheck (addExtraLibraries super.odbc [ pkgs.freetds ]);
@ -352,13 +356,6 @@ self: super: builtins.intersectAttrs super {
# Looks like Avahi provides the missing library
dnssd = super.dnssd.override { dns_sd = pkgs.avahi.override { withLibdnssdCompat = true; }; };
# requires an X11 display
bindings-GLFW = dontCheck super.bindings-GLFW;
# requires an X11 display in test suite
gi-gtk-declarative = dontCheck super.gi-gtk-declarative;
gi-gtk-declarative-app-simple = dontCheck super.gi-gtk-declarative-app-simple;
# tests depend on executable
ghcide = overrideCabal super.ghcide (drv: {
preCheck = ''export PATH="$PWD/dist/build/ghcide:$PATH"'';

File diff suppressed because it is too large Load Diff

View File

@ -1,4 +1,4 @@
{ lib, supportedGhcVersions ? [ "884" "8106" ], stdenv, haskellPackages
{ lib, supportedGhcVersions ? [ "884" "8107" ], stdenv, haskellPackages
, haskell }:
#
# The recommended way to override this package is

View File

@ -1029,9 +1029,9 @@ with pkgs;
};
termite-unwrapped = callPackage ../applications/terminal-emulators/termite { };
termonad-with-packages = callPackage ../applications/terminal-emulators/termonad {
inherit (haskellPackages) ghcWithPackages;
};
termonad-with-packages = callPackage ../applications/terminal-emulators/termonad { };
termonad = termonad-with-packages;
termsyn = callPackage ../data/fonts/termsyn { };
@ -11480,7 +11480,7 @@ with pkgs;
# Please update doc/languages-frameworks/haskell.section.md, “Our
# current default compiler is”, if you bump this:
haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8106;
haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8107;
inherit (haskellPackages) ghc;

View File

@ -6,8 +6,8 @@ let
"ghc865Binary"
"ghc8102Binary"
"ghc8102BinaryMinimal"
"ghc8105Binary"
"ghc8105BinaryMinimal"
"ghc8107Binary"
"ghc8107BinaryMinimal"
"integer-simple"
"native-bignum"
"ghcHEAD"
@ -59,11 +59,11 @@ in {
minimal = true;
};
ghc8105Binary = callPackage ../development/compilers/ghc/8.10.5-binary.nix {
ghc8107Binary = callPackage ../development/compilers/ghc/8.10.7-binary.nix {
llvmPackages = pkgs.llvmPackages_11;
};
ghc8105BinaryMinimal = callPackage ../development/compilers/ghc/8.10.5-binary.nix {
ghc8107BinaryMinimal = callPackage ../development/compilers/ghc/8.10.7-binary.nix {
llvmPackages = pkgs.llvmPackages_11;
minimal = true;
};
@ -71,7 +71,7 @@ in {
ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix {
# the oldest ghc with aarch64-darwin support is 8.10.5
bootPkgs = if stdenv.isDarwin && stdenv.isAarch64 then
packages.ghc8105BinaryMinimal
packages.ghc8107BinaryMinimal
# aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar
# Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them
else if stdenv.isAarch64 || stdenv.targetPlatform.isMusl then
@ -82,10 +82,10 @@ in {
buildLlvmPackages = buildPackages.llvmPackages_7;
llvmPackages = pkgs.llvmPackages_7;
};
ghc8106 = callPackage ../development/compilers/ghc/8.10.6.nix {
ghc8107 = callPackage ../development/compilers/ghc/8.10.7.nix {
# the oldest ghc with aarch64-darwin support is 8.10.5
bootPkgs = if stdenv.isDarwin && stdenv.isAarch64 then
packages.ghc8105BinaryMinimal
packages.ghc8107BinaryMinimal
# aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar
# Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them
else if stdenv.isAarch64 || stdenv.isAarch32 || stdenv.targetPlatform.isMusl then
@ -103,7 +103,7 @@ in {
ghc901 = callPackage ../development/compilers/ghc/9.0.1.nix {
# the oldest ghc with aarch64-darwin support is 8.10.5
bootPkgs = if stdenv.isDarwin && stdenv.isAarch64 then
packages.ghc8105BinaryMinimal
packages.ghc8107BinaryMinimal
# aarch64 ghc8102Binary exceeds max output size on hydra
else if stdenv.isAarch64 || stdenv.isAarch32 then
packages.ghc8102BinaryMinimal
@ -113,9 +113,27 @@ in {
buildLlvmPackages = buildPackages.llvmPackages_10;
llvmPackages = pkgs.llvmPackages_10;
};
ghc921 = callPackage ../development/compilers/ghc/9.2.1.nix {
# aarch64 ghc8102Binary exceeds max output size on hydra
bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 then
packages.ghc8102BinaryMinimal
else
packages.ghc8102Binary;
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;
buildLlvmPackages = buildPackages.llvmPackages_10;
llvmPackages = pkgs.llvmPackages_10;
};
ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
bootPkgs = packages.ghc901; # no binary yet
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;
buildLlvmPackages = buildPackages.llvmPackages_10;
llvmPackages = pkgs.llvmPackages_10;
libffi = pkgs.libffi;
@ -166,15 +184,15 @@ in {
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
packageSetConfig = bootstrapPackageSet;
};
ghc8105Binary = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc8105Binary;
ghc = bh.compiler.ghc8105Binary;
ghc8107Binary = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc8107Binary;
ghc = bh.compiler.ghc8107Binary;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
packageSetConfig = bootstrapPackageSet;
};
ghc8105BinaryMinimal = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc8105BinaryMinimal;
ghc = bh.compiler.ghc8105BinaryMinimal;
ghc8107BinaryMinimal = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc8107BinaryMinimal;
ghc = bh.compiler.ghc8107BinaryMinimal;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
packageSetConfig = bootstrapPackageSet;
};
@ -183,9 +201,9 @@ in {
ghc = bh.compiler.ghc884;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { };
};
ghc8106 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc8106;
ghc = bh.compiler.ghc8106;
ghc8107 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc8107;
ghc = bh.compiler.ghc8107;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { };
};
ghc901 = callPackage ../development/haskell-modules {
@ -193,6 +211,11 @@ in {
ghc = bh.compiler.ghc901;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.0.x.nix { };
};
ghc921 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc921;
ghc = bh.compiler.ghc921;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.2.x.nix { };
};
ghcHEAD = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghcHEAD;
ghc = bh.compiler.ghcHEAD;

View File

@ -50,7 +50,7 @@ let
# list of all compilers to test specific packages on
all = with compilerNames; [
ghc884
ghc8106
ghc8107
ghc901
];
@ -278,14 +278,14 @@ let
# Test some statically linked packages to catch regressions
# and get some cache going for static compilation with GHC.
# Use integer-simple to avoid GMP linking problems (LGPL)
pkgsStatic.haskell.packages.integer-simple.ghc8106 =
pkgsStatic.haskell.packages.integer-simple.ghc8107 =
removePlatforms
[
"aarch64-linux" # times out on Hydra
"x86_64-darwin" # TODO: reenable when static libiconv works on darwin
]
{
inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.integer-simple.ghc8106)
inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.integer-simple.ghc8107)
hello
lens
random
@ -300,12 +300,12 @@ let
# package sets (like Cabal, jailbreak-cabal) are
# working as expected.
cabal-install = all;
Cabal_3_6_0_0 = with compilerNames; [ ghc884 ghc8106 ];
Cabal_3_6_0_0 = with compilerNames; [ ghc884 ghc8107 ];
cabal2nix-unstable = all;
funcmp = all;
# Doesn't currently work on ghc-9.0:
# https://github.com/haskell/haskell-language-server/issues/297
haskell-language-server = with compilerNames; [ ghc884 ghc8106 ];
haskell-language-server = with compilerNames; [ ghc884 ghc8107 ];
hoogle = all;
hsdns = all;
jailbreak-cabal = all;
@ -379,7 +379,7 @@ let
constituents = accumulateDerivations [
jobs.pkgsMusl.haskell.compiler.ghc8102Binary
jobs.pkgsMusl.haskell.compiler.ghc884
jobs.pkgsMusl.haskell.compiler.ghc8106
jobs.pkgsMusl.haskell.compiler.ghc8107
jobs.pkgsMusl.haskell.compiler.ghc901
];
};
@ -394,9 +394,9 @@ let
];
};
constituents = accumulateDerivations [
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8106.hello
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8106.lens
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8106.random
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8107.hello
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8107.lens
jobs.pkgsStatic.haskell.packages.integer-simple.ghc8107.random
];
};
}