Compare commits

..

2 Commits

Author SHA1 Message Date
nixpkgs-ci[bot]
2d20de34e5 Merge master into staging-nixos 2026-09-15 00:26:24 +00:00
nixpkgs-ci[bot]
673028b7b1 Merge master into staging-nixos 2026-09-14 18:11:25 +00:00
45 changed files with 23402 additions and 30653 deletions

View File

@@ -1,39 +0,0 @@
#!/usr/bin/env nix-shell
#!nix-shell -i bash
#!nix-shell -p jq git
# shellcheck shell=bash
#
# Usage: eval-pkg-sets.sh [extra flags for nix-* commands ...]
#
# Must be executed in a git checkout of Nixpkgs.
set -euo pipefail
NIXPKGS="$(git rev-parse --show-toplevel)"
PKGSETS="$(nix-env --readonly-mode --json --drv-path -f "$NIXPKGS" -qaP -A haskell.compiler "$@" \
| jq -r 'to_entries | unique_by(.value.drvPath) .[] .key | sub("^haskell.compiler";"haskell.packages")')"
trap 'exit 1' SIGINT SIGTERM
set +e
badsets=""
for set in $PKGSETS; do
# Confirm an equivalent package set to haskell.compiler.$entry exists and is usable
if ! nix-instantiate --readonly-mode -A "$set.ghc" "$@" > /dev/null 2>&1; then
echo "Skipping $set... ($set.ghc does not evaluate)"
else
echo "Evaluating $set..."
if ! nix-env --readonly-mode -f "$NIXPKGS" -qaP --drv-path -A "$set" "$@" > /dev/null; then
badsets+="$set "
fi
fi
done
if [ -n "$badsets" ]; then
echo "Found potential eval issues in the following sets:" >&2
# shellcheck disable=SC2086
printf '%s\n' $badsets
exit 1
fi

View File

@@ -6,7 +6,7 @@
# Attention: For unknown reasons, the script can't be easily cancelled and needs to be killed manually if it shouldn't run to completion.
use std/log
use std log
let broken_config = "pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml"

View File

@@ -33,7 +33,7 @@ fi
# Stackage solver to use, LTS or Nightly
# (should be capitalized like the display name)
SOLVER=Nightly
SOLVER=LTS
# Stackage solver version, if any. Use latest if empty
VERSION=
TMP_TEMPLATE=update-stackage.XXXXXXX
@@ -105,7 +105,6 @@ sed -r \
-e '/ hledger-ui /d' \
-e '/ hledger-web /d' \
-e '/ spacecookie /d' \
-e '/ hnix-store-core /d' \
< "${tmpfile_new}" >> $stackage_config
# Explanations:
# cabal2nix, distribution-nixpkgs, jailbreak-cabal, language-nix: These are our packages and we know what we are doing.

View File

@@ -68,7 +68,7 @@ haskellPackages.mkDerivation {
hashable
isocline
lens
lsp
lsp_2_8_0_0
mtl
network
network-simple

View File

@@ -1,7 +1,7 @@
{
mkDerivation,
lib,
fetchFromCodeberg,
fetchFromGitHub,
aeson,
base,
bytestring,
@@ -26,7 +26,7 @@
mkDerivation rec {
pname = "mkjson";
version = "0.4.0";
src = fetchFromCodeberg {
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "mkjson";
rev = "${version}";

View File

@@ -1,19 +1,2 @@
{
haskell,
haskellPackages,
lib,
}:
let
inherit (haskell.lib.compose) justStaticExecutables overrideCabal;
# The mkjson-doctest suite depends on specific RNG results not provided by the
# GHC in Nixpkgs as of this writing.
overrides = {
testTargets = [ "mkjson-test" ];
};
raw-pkg = haskellPackages.callPackage ./generated.nix { };
in
lib.pipe raw-pkg [
(overrideCabal overrides)
justStaticExecutables
]
{ haskell, haskellPackages }:
haskell.lib.justStaticExecutables (haskellPackages.callPackage ./generated.nix { })

View File

@@ -35,7 +35,7 @@ let
license = lib.licenses.gpl3;
homepage = "https://tamarin-prover.github.io";
description = "Security protocol verification in the symbolic model";
maintainers = [ ];
maintainers = [ lib.maintainers.thoughtpolice ];
hydraPlatforms = lib.platforms.linux; # maude is broken on darwin
};

View File

@@ -1,6 +1,6 @@
{
"commit": "16fcaf02df20067273e11bf29e352900483d788c",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/16fcaf02df20067273e11bf29e352900483d788c.tar.gz",
"sha256": "0rm971hmbb2r57yh7spdncdjdwx7f6q6c4qzqg8v5xsrd18qimc7",
"msg": "Update from Hackage at 2026-09-13T08:29:18Z"
"commit": "3a3b69bdd8114e4503dc8cb9909a3b0ea32e6be6",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3a3b69bdd8114e4503dc8cb9909a3b0ea32e6be6.tar.gz",
"sha256": "1qjd5gp9d4r4y6qjf52m7w9dzy9nq622aqv72ma8d4xlrxrrachp",
"msg": "Update from Hackage at 2026-04-24T19:35:23Z"
}

View File

@@ -51,11 +51,6 @@ pkgs.haskell.packages.ghc98.override {
# https://github.com/avh4/elm-format/blob/e7e5da37716acbfb4954a88128b5cc72b2c911d9/package/nix/generate_derivation.sh
elm-format = justStaticExecutables (
overrideCabal (drv: {
# jailbreak required due to optparse-applicative bounds
# optparse-applicative >=0.17.0.0 && <0.19
# upstream PR https://github.com/avh4/elm-format/pull/841
jailbreak = true;
postPatch = ''
mkdir -p ./generated
cat <<EOHS > ./generated/Build_elm_format.hs
@@ -82,14 +77,8 @@ pkgs.haskell.packages.ghc98.override {
inherit elmPkgs;
# Needed for elm-format
avh4-lib = self.callPackage ./elm-format/avh4-lib.nix { };
# jailbreak required due to optparse-applicative bounds
# optparse-applicative >=0.17.0.0 && <0.19
# upstream PR https://github.com/avh4/elm-format/pull/841
elm-format-lib = pkgs.haskell.lib.doJailbreak (
self.callPackage ./elm-format/elm-format-lib.nix { }
);
elm-format-lib = self.callPackage ./elm-format/elm-format-lib.nix { };
elm-format-test-lib = self.callPackage ./elm-format/elm-format-test-lib.nix { };
elm-format-markdown = self.callPackage ./elm-format/elm-format-markdown.nix { };
};

View File

@@ -1,5 +0,0 @@
import ./common-hadrian.nix {
version = "9.12.4.20260713";
url = "https://downloads.haskell.org/~ghc/9.12.5-rc3/ghc-9.12.4.20260713-src.tar.gz";
sha256 = "cc77cff2014dd99c16c9f311f7558d9a11aa3c3a2dee47425b109c3dac35338c";
}

View File

@@ -1,5 +0,0 @@
import ./common-hadrian.nix {
url = "https://downloads.haskell.org/~ghc/9.14.2-rc1/ghc-9.14.1.20260728-src.tar.xz";
version = "9.14.1.20260728";
sha256 = "015543170af3ca4bf3b2c4112a207b4738be72243883cb0dbbe673bcc316a04f";
}

View File

@@ -118,7 +118,6 @@
# While split sections are now enabled by default in ghc 8.8 for windows,
# they seem to lead to `too many sections` errors when building base for
# profiling.
# TODO(@alexfmpe): test split sections again with GHC 9.14.2
++ (if stdenv.targetPlatform.isWindows then [ "no_split_sections" ] else [ "split_sections" ]);
in
baseFlavour + lib.concatMapStrings (t: "+${t}") transformers,
@@ -325,21 +324,34 @@
]
# Fix docs build with Sphinx >= 9 https://gitlab.haskell.org/ghc/ghc/-/issues/26810
++ lib.optionals (lib.versionOlder version "9.12.4" || version == "9.14.1") [
./ghc-9.6-or-later-docs-sphinx-9.patch
]
++
lib.optionals
(
lib.versionOlder version "9.12.4"
|| (lib.versionAtLeast version "9.14" && lib.versionOlder version "9.15.20260129")
)
[
./ghc-9.6-or-later-docs-sphinx-9.patch
]
# Fixes rts/Types.h missing from the install when targeting javascript
# See https://gitlab.haskell.org/ghc/ghc/-/merge_requests/15740, krank:ignore-line
# https://gitlab.haskell.org/ghc/ghc/-/issues/27033. krank:ignore-line
++ lib.optionals (version == "9.12.3" || version == "9.14.1") [
(fetchpatch {
name = "ghc-9.12.3-ghcjs-install-rts-types.h.patch";
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/5b1be555be4f0989d78c274991c5046d7ac6d25e.patch";
hash = "sha256-pv4NDyQ6FlZgmTYZ4Ghis4qggt7nCDMhqGaFxTxVPac=";
includes = [ "rts/rts.cabal" ];
})
]
++
lib.optionals
(
version == "9.12.3"
# TODO(@sternenseemann): 9.14.2 will likely also have this patch
|| (lib.versionAtLeast version "9.14" && lib.versionOlder version "9.15.20260127")
)
[
(fetchpatch {
name = "ghc-9.12.3-ghcjs-install-rts-types.h.patch";
url = "https://gitlab.haskell.org/ghc/ghc/-/commit/5b1be555be4f0989d78c274991c5046d7ac6d25e.patch";
hash = "sha256-pv4NDyQ6FlZgmTYZ4Ghis4qggt7nCDMhqGaFxTxVPac=";
includes = [ "rts/rts.cabal" ];
})
]
# Enable GHCi on LoongArch64 (not in upstream's hardcoded platform list)
++ lib.optionals stdenv.targetPlatform.isLoongArch64 [
@@ -872,6 +884,16 @@ stdenv.mkDerivation (
preInstall = ''
pushd _build/bindist/*
''
# the bindist configure script uses different env variables than the GHC configure script
# see https://github.com/NixOS/nixpkgs/issues/267250 krank:ignore-line
# https://gitlab.haskell.org/ghc/ghc/-/issues/24211 krank:ignore-line
+ lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
export InstallNameToolCmd=$INSTALL_NAME_TOOL
export OtoolCmd=$OTOOL
''
# Replicate configurePhase
+ ''
$configureScript "''${configureFlags[@]}"
'';

View File

@@ -1,5 +1,5 @@
import ./common-hadrian.nix {
version = "10.1.20260810";
rev = "556db2f32f59ec2d3b1c225d24d677c60a695e3f";
sha256 = "sha256-lB4udTc9hQZEnldmvpllDkCtUVte65/ZMhZd7rf5xOY=";
version = "9.15.20260322";
rev = "44f118f09dcde49f64d03e427312df4732f2d4a4";
sha256 = "sha256-xby7HKyK5P1Y5DjKbVe62piDCY4Ujb4pbv8AJ7sQ0HI=";
}

View File

@@ -35,10 +35,10 @@
}:
mkDerivation {
pname = "cabal2nix";
version = "2.21.3-unstable-2026-08-21";
version = "2.21.3-unstable-2026-03-30";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/b9ef7e13a1eebdf9cb56518b5010befa1ca505af.tar.gz";
sha256 = "052kdc9rli92pyk45p3ly2xgvhm312ik7d22khxw9rsphpsr4n8d";
url = "https://github.com/NixOS/cabal2nix/archive/41239bcc0622a0975c6705a03a44dfeffeb56f23.tar.gz";
sha256 = "01qj6cvaif0810v83r6izcj1bbfpcqqxw4wybq04qsq92sqybpw2";
};
postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
isLibrary = true;
@@ -106,5 +106,5 @@ mkDerivation {
'';
homepage = "https://github.com/nixos/cabal2nix#readme";
description = "Convert Cabal files into Nix build instructions";
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
license = lib.licensesSpdx."BSD-3-Clause";
}

View File

@@ -18,10 +18,10 @@
}:
mkDerivation {
pname = "distribution-nixpkgs";
version = "1.7.1.1-unstable-2026-08-21";
version = "1.7.1.1-unstable-2026-03-30";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/b9ef7e13a1eebdf9cb56518b5010befa1ca505af.tar.gz";
sha256 = "052kdc9rli92pyk45p3ly2xgvhm312ik7d22khxw9rsphpsr4n8d";
url = "https://github.com/NixOS/cabal2nix/archive/41239bcc0622a0975c6705a03a44dfeffeb56f23.tar.gz";
sha256 = "01qj6cvaif0810v83r6izcj1bbfpcqqxw4wybq04qsq92sqybpw2";
};
postUnpack = "sourceRoot+=/distribution-nixpkgs; echo source root reset to $sourceRoot";
enableSeparateDataOutput = true;
@@ -49,5 +49,5 @@ mkDerivation {
];
homepage = "https://github.com/NixOS/cabal2nix/tree/master/distribution-nixpkgs#readme";
description = "Types and functions to manipulate the Nixpkgs distribution";
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
license = lib.licensesSpdx."BSD-3-Clause";
}

View File

@@ -16,10 +16,10 @@
}:
mkDerivation {
pname = "hackage-db";
version = "2.1.3-unstable-2026-08-21";
version = "2.1.3-unstable-2026-03-30";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/b9ef7e13a1eebdf9cb56518b5010befa1ca505af.tar.gz";
sha256 = "052kdc9rli92pyk45p3ly2xgvhm312ik7d22khxw9rsphpsr4n8d";
url = "https://github.com/NixOS/cabal2nix/archive/41239bcc0622a0975c6705a03a44dfeffeb56f23.tar.gz";
sha256 = "01qj6cvaif0810v83r6izcj1bbfpcqqxw4wybq04qsq92sqybpw2";
};
postUnpack = "sourceRoot+=/hackage-db; echo source root reset to $sourceRoot";
isLibrary = true;
@@ -38,5 +38,5 @@ mkDerivation {
];
homepage = "https://github.com/NixOS/cabal2nix/tree/master/hackage-db#readme";
description = "Access cabal-install's Hackage database via Data.Map";
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
license = lib.licensesSpdx."BSD-3-Clause";
}

View File

@@ -14,10 +14,10 @@
}:
mkDerivation {
pname = "language-nix";
version = "2.3.0-unstable-2026-08-21";
version = "2.3.0-unstable-2026-03-30";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/b9ef7e13a1eebdf9cb56518b5010befa1ca505af.tar.gz";
sha256 = "052kdc9rli92pyk45p3ly2xgvhm312ik7d22khxw9rsphpsr4n8d";
url = "https://github.com/NixOS/cabal2nix/archive/41239bcc0622a0975c6705a03a44dfeffeb56f23.tar.gz";
sha256 = "01qj6cvaif0810v83r6izcj1bbfpcqqxw4wybq04qsq92sqybpw2";
};
postUnpack = "sourceRoot+=/language-nix; echo source root reset to $sourceRoot";
libraryHaskellDepends = [
@@ -39,5 +39,5 @@ mkDerivation {
];
homepage = "https://github.com/NixOS/cabal2nix/tree/master/language-nix#readme";
description = "Data types and functions to represent the Nix language";
license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause";
license = lib.licensesSpdx."BSD-3-Clause";
}

File diff suppressed because it is too large Load Diff

View File

@@ -37,21 +37,4 @@ self: super: {
unix = null;
xhtml = null;
Win32 = null;
# core pkgs on later GHCs that we can reasonably provide a stub
# or Hackage released version for (though they may not build).
Cabal-syntax = self.Cabal-syntax_3_6_0_0;
semaphore-compat = self.semaphore-compat_2_0_1;
os-string = self.os-string_2_0_11;
file-io = self.file-io_0_2_0;
# Would need 2.25.*, but let's not bother
haddock-api = self.haddock-api_2_29_1;
haddock-library = self.haddock-library_1_11_0;
# core pkgs on later GHCs we can't provide at all
system-cxx-std-lib = null;
ghc-experimental = null;
ghc-internal = null;
ghc-platform = null;
ghc-toolchain = null;
}

View File

@@ -65,16 +65,54 @@ in
xhtml = null;
Win32 = null;
# Become core packages in GHC >= 9.12
file-io = doDistribute self.file-io_0_2_0;
haddock-api = markBroken self.haddock-api_2_29_1; # no compatible release available
haddock-library = doJailbreak (doDistribute self.haddock-library_1_11_0);
ghc-exactprint = doDistribute self.ghc-exactprint_1_10_0_0;
# “Unfortunately we are unable to support GHC 9.10.”
apply-refact = dontDistribute (markBroken super.apply-refact);
stack =
# Setup.hs depends on Cabal-syntax >= 3.14
overrideCabal
(drv: {
setupHaskellDepends = drv.setupHaskellDepends or [ ] ++ [
self.Cabal-syntax_3_14_2_0
self.Cabal_3_14_2_0
];
# We need to tell GHC to ignore the Cabal core libraries while
# compiling Setup.hs since it depends on Cabal >= 3.14.
# ATTN: This override assumes we are using GHC 9.10.3 since we need
# to give an exact Cabal version at the GHC (!) command line.
# FIXME(@sternenseemann): make direct argument to generic-builder.nix
env = drv.env or { } // {
setupCompileFlags = lib.concatStringsSep " " [
"-hide-package"
"Cabal-syntax-3.12.1.0"
"-hide-package"
"Cabal-3.12.1.0"
];
};
})
# Stack itself depends on Cabal >= 3.14 which also needs to be updated for deps
(
super.stack.overrideScope (
sself: ssuper:
let
upgradeCabal =
drv:
lib.pipe drv [
(addBuildDepends [ sself.Cabal_3_14_2_0 ])
(appendConfigureFlags [ "--constraint=Cabal>=3.14" ])
];
in
{
pantry = upgradeCabal ssuper.pantry_0_11_2;
rio-prettyprint = upgradeCabal ssuper.rio-prettyprint;
hackage-security = upgradeCabal ssuper.hackage-security;
hpack = upgradeCabal sself.hpack_0_39_1;
stack = upgradeCabal ssuper.stack;
}
)
);
#
# Version upgrades
#
@@ -86,6 +124,10 @@ in
# Jailbreaks
#
floskell = doJailbreak super.floskell; # base <4.20
# 2025-04-09: filepath <1.5
haddock-library =
assert super.haddock-library.version == "1.11.0";
doJailbreak super.haddock-library;
tree-sitter = doJailbreak super.tree-sitter; # containers <0.7, filepath <1.5
#
@@ -94,22 +136,6 @@ in
monad-dijkstra = dontCheck super.monad-dijkstra; # needs hlint 3.10
# Workaround https://github.com/haskell/haskell-language-server/issues/4674
haskell-language-server = lib.pipe super.haskell-language-server [
(disableCabalFlag "hlint")
(addBuildDepends [
self.stan
self.trial
])
(
hls:
hls.override {
apply-refact = null;
hlint = null;
refact = null;
}
)
];
haskell-language-server = haskellLib.disableCabalFlag "hlint" super.haskell-language-server;
# test-suite uses MultilineStrings, which is only available in GHC 9.12+
cabal-add = dontCheck super.cabal-add;
}

View File

@@ -60,7 +60,7 @@ with haskellLib;
if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then
null
else
doDistribute self.terminfo_0_4_1_7;
haskellLib.doDistribute self.terminfo_0_4_1_7;
text = null;
time = null;
transformers = null;
@@ -68,10 +68,65 @@ with haskellLib;
xhtml = null;
Win32 = null;
#
# Hand pick versions that are compatible with ghc 9.12 and base 4.21
#
extensions = doDistribute self.extensions_0_1_1_0;
ghc-exactprint = doDistribute self.ghc-exactprint_1_12_0_0;
#
# Jailbreaks
#
large-generics = doJailbreak super.large-generics; # base <4.20
cpphs = overrideCabal (drv: {
# jail break manually the conditional dependencies
postPatch = ''
sed -i 's/time >=1.5 \&\& <1.13/time >=1.5 \&\& <=1.14/g' cpphs.cabal
'';
}) super.cpphs;
cabal-install-parsers = doJailbreak super.cabal-install-parsers; # base, Cabal-syntax, etc.
ghc-exactprint_1_12_0_0 = addBuildDepends [
# cabal2nix drops conditional block: impl (ghc >= 9.12)
self.Diff
self.extra
self.ghc-paths
self.silently
self.syb
self.HUnit
] super.ghc-exactprint_1_12_0_0;
timezone-series = doJailbreak super.timezone-series; # time <1.14
timezone-olson = doJailbreak super.timezone-olson; # time <1.14
cabal-plan = doJailbreak super.cabal-plan; # base <4.21
decimal-literals = doJailbreak super.decimal-literals; # base <4.21
matrix-client = doJailbreak super.matrix-client; # time <1.13
patat = doJailbreak super.patat; # time <1.13
puresat = doJailbreak super.puresat; # base <4.21
dbus = doJailbreak super.dbus; # template-haskell <2.23
xmobar = doJailbreak super.xmobar; # base <4.21
#
# Test suite issues
#
relude = dontCheck super.relude;
# https://gitlab.haskell.org/ghc/ghc/-/issues/25930
generic-lens = dontCheck super.generic-lens;
# Cabal 3.14 regression (incorrect datadir in tests): https://github.com/haskell/cabal/issues/10717
alex = overrideCabal (drv: {
preCheck = drv.preCheck or "" + ''
export alex_datadir="$(pwd)/data"
'';
}) super.alex;
# https://github.com/sjakobi/newtype-generics/pull/28/files
newtype-generics = warnAfterVersion "0.6.2" (doJailbreak super.newtype-generics);
# Test failure because of GHC bug:
# https://gitlab.haskell.org/ghc/ghc/-/issues/25937
# https://github.com/sol/interpolate/issues/20
interpolate = dontCheckIf (lib.versionOlder self.ghc.version "9.12.3") super.interpolate;
}

View File

@@ -62,7 +62,7 @@ with haskellLib;
if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then
null
else
doDistribute self.terminfo_0_4_1_7;
haskellLib.doDistribute self.terminfo_0_4_1_7;
text = null;
time = null;
transformers = null;
@@ -76,71 +76,49 @@ with haskellLib;
scrod = doDistribute (unmarkBroken super.scrod);
# haskell-debugger only works with ghc 9.14+
haskell-debugger-view = doDistribute (unmarkBroken super.haskell-debugger-view);
haskell-debugger = doDistribute (doJailbreak super.haskell-debugger); # hie-bios < 0.18, random >=1.3.1
#
# Version upgrades
#
ghc-exactprint_1_14_1_0 = addBuildDepends [
# cabal2nix drops conditional block: impl (ghc >= 9.14)
self.containers
self.Diff
self.directory
self.filepath
self.ghc-paths
self.silently
self.syb
self.HUnit
] super.ghc-exactprint_1_14_1_0;
ghc-exactprint = doDistribute self.ghc-exactprint_1_14_1_0;
ghc-lib = doDistribute self.ghc-lib_9_14_1_20251220;
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_14_1_20251220;
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_14_2_0;
ormolu = doDistribute self.ormolu_0_9_0_0;
fourmolu = doDistribute self.fourmolu_0_20_1_0;
inherit
(
let
hls_overlay = lself: lsuper: {
Cabal-syntax = lself.Cabal-syntax_3_16_1_0;
Cabal = lself.Cabal_3_16_1_0;
cabal-install = lself.cabal-install_3_16_1_0;
# hlint does not support GHC 3.14, yet:
# https://github.com/ndmitchell/hlint/issues/1672
apply-refact = null;
hlint = null;
refact = null;
# stylish-haskell does not support GHC 9.14, yet:
# https://github.com/haskell/haskell-language-server/blob/5ce2a847d255ce6f420da49771711a89eee78541/haskell-language-server.cabal#L1544-L1546
stylish-haskell = null;
};
in
lib.mapAttrs (_: pkg: doDistribute (pkg.overrideScope hls_overlay)) {
ghcide = super.ghcide;
haskell-language-server = lib.pipe super.haskell-language-server [
(disableCabalFlag "hlint")
(disableCabalFlag "stylishHaskell")
];
hls-plugin-api = super.hls-plugin-api;
}
)
ghcide
haskell-language-server
hls-plugin-api
;
ghc-exactprint = doDistribute self.ghc-exactprint_1_14_0_0;
hedgehog = doDistribute self.hedgehog_1_7;
hie-bios = doDistribute (dontCheck self.hie-bios_0_19_0); # Tests access homeless-shelter.
lifted-async = doDistribute self.lifted-async_0_11_0;
parallel = doDistribute self.parallel_3_3_0_0;
tagged = doDistribute self.tagged_0_8_10;
unordered-containers = doDistribute self.unordered-containers_0_2_21;
HTTP = doDistribute self.HTTP_4000_5_0;
#
# Jailbreaks
#
primitive = doJailbreak (dontCheck super.primitive); # base <4.22 and a lot of dependencies on packages not yet working.
splitmix = doJailbreak super.splitmix; # base <4.22
# https://github.com/phadej/boring/issues/48
boring = doJailbreak super.boring;
# https://github.com/haskellari/indexed-traversable/issues/49
indexed-traversable = doJailbreak super.indexed-traversable;
# https://github.com/haskellari/indexed-traversable/issues/50
indexed-traversable-instances = doJailbreak super.indexed-traversable-instances;
# https://github.com/haskellari/these/issues/211
these = doJailbreak super.these;
# https://github.com/haskellari/these/issues/207
semialign = doJailbreak super.semialign;
# https://github.com/haskellari/time-compat/issues/48
time-compat = doJailbreak super.time-compat;
# https://github.com/haskell-hvr/uuid/issues/95
uuid-types = doJailbreak super.uuid-types;
# https://github.com/haskellari/qc-instances/issues/110
quickcheck-instances = doJailbreak super.quickcheck-instances;
# https://github.com/haskell/aeson/issues/1155
text-iso8601 = doJailbreak super.text-iso8601;
aeson = doJailbreak super.aeson;
# https://github.com/haskell-party/feed/issues/76
feed = doJailbreak super.feed; # time<1.15, base<4.22
# https://github.com/well-typed/cborg/issues/373
cborg = doJailbreak super.cborg;
serialise = doJailbreak (
@@ -156,30 +134,22 @@ with haskellLib;
] super.serialise
);
# https://github.com/maoe/ghc-trace-events/pull/17
ghc-trace-events = doJailbreak super.ghc-trace-events; # base < 4.22
# HLS, for some reason, decided to remove the hie-compat library from its tree
# in https://github.com/haskell/haskell-language-server/pull/4613
# even though hiedb (a dependency of HLS) unconditionally depends on it
# for all GHC versions. As a result, no one has updated the base bound
# of hie-compat to allow building it with GHC 9.14 neither in tree
# (which no longer exists) nor on Hackage. Instead, HLS is updating their
# cabal.project: https://github.com/haskell/haskell-language-server/blob/a4cfaa80ca94beded6f01547a161b37be7b33558/cabal.project#L78
hie-compat = doJailbreak super.hie-compat; # base < 4.22
# https://github.com/sjakobi/newtype-generics/pull/28/files
newtype-generics = warnAfterVersion "0.6.2" (doJailbreak super.newtype-generics);
# Too strict bound on containers in test suite
# https://github.com/jaspervdj/blaze-markup/issues/69
blaze-markup = doJailbreak super.blaze-markup;
# https://github.com/jaspervdj/blaze-html/issues/151
blaze-html = doJailbreak super.blaze-html;
# haskell-debugger only works with ghc 9.14+
haskell-debugger-view = doDistribute (unmarkBroken super.haskell-debugger-view);
haskell-debugger = doDistribute (doJailbreak super.haskell-debugger); # hie-bios < 0.18, random >=1.3.1
# 2026-09-05: base <4.22
# https://github.com/mitchellwrosen/tasty-hspec/pull/38
tasty-hspec = doJailbreak super.tasty-hspec;
# 2026-09-05: containers <0.8
# https://github.com/obsidiansystems/dependent-map/issues/59
dependent-map = doJailbreak super.dependent-map;
ghc-exactprint_1_14_0_0 = addBuildDepends [
# cabal2nix drops conditional block: impl (ghc >= 9.14)
self.Diff
self.extra
self.ghc-paths
self.silently
self.syb
self.HUnit
] super.ghc-exactprint_1_14_0_0;
#
# Test suite issues
@@ -187,13 +157,11 @@ with haskellLib;
# Fails to compile with GHC 9.14 https://github.com/snoyberg/mono-traversable/pull/261
mono-traversable = dontCheck super.mono-traversable;
# doctests broke with GHC 9.14, something to do with error messages
# https://github.com/kcsongor/generic-lens/issues/174
generic-lens = overrideCabal {
testTargets = [
"generic-lens-bifunctor"
"inspection-tests"
"generic-lens-syb-tree"
];
} super.generic-lens;
# Too strict bound on containers in test suite
# https://github.com/jaspervdj/blaze-markup/issues/69
blaze-markup = doJailbreak super.blaze-markup;
# https://github.com/jaspervdj/blaze-html/issues/151
blaze-html = doJailbreak super.blaze-html;
}

View File

@@ -49,21 +49,14 @@ self: super: {
unix = null;
# GHC only bundles the xhtml library if haddock is enabled, check if this is
# 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 doDistribute self.xhtml_3000_4_1_0;
xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_4_0_0;
Win32 = null;
# Becomes a core package in GHC >= 9.8
semaphore-compat = doDistribute self.semaphore-compat_2_0_1;
semaphore-compat = doDistribute self.semaphore-compat_1_0_0;
# Becomes a core package in GHC >= 9.10
os-string = doDistribute self.os-string_2_0_11;
# Become core packages in GHC >= 9.12
haddock-library = doDistribute (doJailbreak self.haddock-library_1_11_0);
haddock-api = doDistribute (doJailbreak self.haddock-api_2_27_0);
# Becomes a core package in GHC >= 9.12, but needs unix >= 2.8
file-io = null;
os-string = doDistribute self.os-string_2_0_10;
# Become core packages in GHC >= 9.10, no release compatible with GHC < 9.10 is available
ghc-experimental = null;
@@ -104,6 +97,9 @@ self: super: {
++ drv.testFlags or [ ];
}) (doJailbreak super.hpack);
# Later versions require unix >= 2.8 which is tricky to provide with GHC 9.4
crypton-x509-store = doDistribute self.crypton-x509-store_1_6_11;
# 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46
hiedb = dontCheck super.hiedb;
@@ -142,6 +138,9 @@ self: super: {
# https://github.com/kowainik/relude/issues/436
relude = dontCheck super.relude;
haddock-library = doJailbreak super.haddock-library;
path = self.path_0_9_5;
haskell-language-server =
lib.throwIf pkgs.config.allowAliases
"haskell-language-server has dropped support for ghc 9.4 in version 2.12.0.0, please use a newer ghc version or an older nixpkgs"
@@ -171,5 +170,4 @@ self: super: {
# Too strict lower bound on base
primitive-addr = doJailbreak super.primitive-addr;
base64 = doJailbreak super.base64;
}

View File

@@ -64,10 +64,10 @@ in
iserv-proxy = addBuildDepend self.libiserv super.iserv-proxy;
# Becomes a core package in GHC >= 9.8
semaphore-compat = doDistribute self.semaphore-compat_2_0_1;
semaphore-compat = doDistribute self.semaphore-compat_1_0_0;
# Becomes a core package in GHC >= 9.10
os-string = doDistribute self.os-string_2_0_11;
os-string = doDistribute self.os-string_2_0_10;
# Become core packages in GHC >= 9.10, no release compatible with GHC < 9.10 is available
ghc-experimental = null;
@@ -76,11 +76,6 @@ in
ghc-toolchain = null;
ghc-platform = null;
# Become core packages in GHC >= 9.12
file-io = doDistribute self.file-io_0_2_0;
haddock-api = doDistribute (doJailbreak self.haddock-api_2_29_1);
haddock-library = doJailbreak (doDistribute self.haddock-library_1_11_0);
# Needs base-orphans for GHC < 9.8 / base < 4.19
some = addBuildDepend self.base-orphans super.some;
@@ -110,6 +105,9 @@ in
cabal-install-solver = doJailbreak super.cabal-install-solver;
cabal-install = doJailbreak super.cabal-install;
# Forbids base >= 4.18, fix proposed: https://github.com/sjakobi/newtype-generics/pull/25
newtype-generics = warnAfterVersion "0.6.2" (doJailbreak super.newtype-generics);
# Jailbreaks for servant <0.20
servant-lucid = doJailbreak super.servant-lucid;
@@ -210,14 +208,13 @@ in
ghc-lib = doDistribute self.ghc-lib_9_8_5_20250214;
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_5_20250214;
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2;
haddock-library = doJailbreak super.haddock-library;
inherit
(
let
hls_overlay = lself: lsuper: {
Cabal-syntax = lself.Cabal-syntax_3_10_3_0;
Cabal = lself.Cabal_3_10_3_0;
# Test suite can't find executable due to https://github.com/haskell/cabal/issues/11598
cabal-add = dontCheck lsuper.cabal-add_0_2_0_1;
extensions = dontCheck (doJailbreak lself.extensions_0_1_0_1);
};
in
@@ -230,16 +227,13 @@ in
self.retrie
self.floskell
self.markdown-unlit
self.stan
self.trial
] super.haskell-language-server;
hls-plugin-api = super.hls-plugin-api;
hlint = self.hlint_3_8;
lsp-types = super.lsp-types;
ormolu = doJailbreak self.ormolu_0_7_4_0;
ormolu = self.ormolu_0_7_4_0;
retrie = doJailbreak (unmarkBroken super.retrie);
stan = super.stan;
stylish-haskell = doJailbreak self.stylish-haskell_0_14_6_0;
stylish-haskell = self.stylish-haskell_0_14_6_0;
}
)
apply-refact
@@ -252,7 +246,6 @@ in
lsp-types
ormolu
retrie
stan
stylish-haskell
;
}

View File

@@ -64,7 +64,7 @@ in
Win32 = null;
# Becomes a core package in GHC >= 9.10
os-string = doDistribute self.os-string_2_0_11;
os-string = doDistribute self.os-string_2_0_10;
# Become core packages in GHC >= 9.10, no release compatible with GHC < 9.10 is available
ghc-experimental = null;
@@ -73,11 +73,6 @@ in
ghc-toolchain = null;
ghc-platform = null;
# Become core packages in GHC >= 9.12
file-io = doDistribute self.file-io_0_2_0;
haddock-api = markBroken self.haddock-api_2_29_1; # no compatible release available
haddock-library = doJailbreak (doDistribute self.haddock-library_1_11_0);
#
# Version upgrades
#
@@ -111,6 +106,7 @@ in
# A given major version of ghc-exactprint only supports one version of GHC.
ghc-exactprint = doDistribute super.ghc-exactprint_1_8_0_0;
haddock-library = doJailbreak super.haddock-library;
ghc-lib = doDistribute self.ghc-lib_9_8_5_20250214;
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_8_5_20250214;
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_8_0_2;
@@ -120,8 +116,6 @@ in
hls_overlay = lself: lsuper: {
Cabal-syntax = lself.Cabal-syntax_3_10_3_0;
Cabal = lself.Cabal_3_10_3_0;
# Test suite can't find executable due to https://github.com/haskell/cabal/issues/11598
cabal-add = dontCheck lsuper.cabal-add_0_2_0_1;
extensions = dontCheck (doJailbreak lself.extensions_0_1_0_1);
};
in
@@ -134,16 +128,13 @@ in
self.retrie
self.floskell
self.markdown-unlit
self.stan
self.trial
] super.haskell-language-server;
hls-plugin-api = super.hls-plugin-api;
hlint = self.hlint_3_8;
lsp-types = super.lsp-types;
ormolu = doJailbreak self.ormolu_0_7_4_0;
ormolu = self.ormolu_0_7_4_0;
retrie = doJailbreak (unmarkBroken super.retrie);
stan = super.stan;
stylish-haskell = doJailbreak self.stylish-haskell_0_14_6_0;
stylish-haskell = self.stylish-haskell_0_14_6_0;
}
)
apply-refact
@@ -156,7 +147,6 @@ in
lsp-types
ormolu
retrie
stan
stylish-haskell
;
}

View File

@@ -32,8 +32,8 @@ with haskellLib;
entropy = addBuildDepend self.ghcjs-dom super.entropy;
# https://gitlab.haskell.org/ghc/ghc/-/issues/25083#note_578275
patch = disableParallelBuilding super.patch;
reflex-dom-core = disableParallelBuilding super.reflex-dom-core;
patch = haskellLib.disableParallelBuilding super.patch;
reflex-dom-core = haskellLib.disableParallelBuilding super.reflex-dom-core;
# Marked as dontDistribute in -common because of jsaddle-webkit2gtk
# which requires an unmaintained version of libsoup. Since this dep
@@ -66,5 +66,5 @@ with haskellLib;
}) super.splitmix;
# See https://gitlab.haskell.org/ghc/ghc/-/issues/26019#note_621324, without this flag the build OOMs
SHA = appendConfigureFlag "--ghc-option=-fignore-interface-pragmas" super.SHA;
SHA = haskellLib.appendConfigureFlag "--ghc-option=-fignore-interface-pragmas" super.SHA;
})

View File

@@ -25,53 +25,71 @@
# not work.
# keep-sorted start skip_lines=1 case=no numeric=yes
default-package-overrides:
- chs-cabal == 0.1.1.2 # matches Cabal 3.12 (GHC 9.10)
- clash-lib-hedgehog < 1.9 # needs to match clash-lib from Stackage
# 2025-12-26: Needs to match egison-pattern-src from Stackage
# 2026-01-23: dataframe >= 0.3.3.7 uses random-1.3, which breaks dependency coherence on 25.11, whose default version is random-1.2
# TODO: when (likely in 25.x) Stackage bumps random to 1.3, review
- dataframe == 0.3.3.6
# 2025-12-26: Needs to match egison-pattern-src from Stackage LTS
- egison-pattern-src-th-mode < 0.2.2
- extensions == 0.1.0.2 # matches Cabal 3.12 (GHC 9.10)
# 2026-01-30: Needs to match hasql from Stackage LTS 24
- hasql-notifications < 0.2.5.0
# 2026-02-04: as requested by ghcide >= 2.13
- hie-bios < 0.18.0
- hiedb < 0.8.0
# 2025-09-13: hnix 0.17.0 doesn't support hnix-store-core >= 0.8
# https://github.com/haskell-nix/hnix/pull/1112
# Note: When removing this, also remove hnix-store-core from maintainers/scripts/haskell/update-stackage.sh
- hnix-store-core < 0.7
- hnix-store-remote < 0.7
# 2025-08-03: need to match stackage version of hosc
- hsc3 >= 0.21 && < 0.22
# 2026-04-19: needs to match tls and crypton-x509-store from Stackage LTS 24
- http2-tls < 0.4.6
# liquidhaskell-boot 0.9.10.1.2 requires this specific version of liquid-fixpoint
- liquid-fixpoint == 0.9.6.3.2
# liquidhaskell(-boot) support one GHC at a time, so we choose the one matching the current GHC (9.10)
- liquidhaskell == 0.9.10.*
- liquidhaskell-boot == 0.9.10.*
# Needs to match microlens == 0.4.* in Stackage
# 2025-03-07: HLS and many other pkgs don't support lsp >= 2.8 (yet)
- lsp < 2.8
- lsp-test < 0.18
- lsp-types < 2.4
# Needs to match microlens == 0.4.* in Stackage LTS 24
- microlens-pro < 0.2.0.4
# 2026-04-06: 4.0.10 merely adjusts to dependencies that are incompatible with our LTS
- mighttpd2 < 4.0.10
# We currently use pandoc-crossref with a patch to revert it to pandoc == 3.7.*,
# this no longer works with later versions.
- pandoc-crossref == 0.3.21
# 2025-12-19: Needs to match Stackage version of rhine
- rhine-bayes < 1.6
# 2026-02-08: compatibility with crypton-x509* in Stackage LTS 24
- x509-ocsp < 0.4.1.0
# keep-sorted end
# keep-sorted start skip_lines=1 case=no numeric=yes
extra-packages:
- ansi-wl-pprint >= 0.6 && < 0.7 # 2025-07-07: used by gren <= 0.5.4
- attoparsec == 0.13.* # 2022-02-23: Needed to compile elm for now
- Cabal == 3.10.*
- Cabal == 3.12.*
- Cabal == 3.14.*
- Cabal == 3.16.* # version required for cabal-install and other packages
- cabal-add < 0.2.1 # 2026-09-05: required for HLS with GHC <= 9.8
- cabal-install == 3.14.* # 2026-07-26: required to match Cabal used when building HLS
- cabal-install == 3.16.* # 2026-09-05: required to match Cabal used when building HLS
- cabal-install-solver == 3.14.* # 2026-07-26: required to build cabal-install 3.14
- cabal-install-solver == 3.16.* # 2026-09-05: required to build cabal-install 3.16
- Cabal-syntax == 3.6.* # required for the GHC 9.0.2 package set
- cabal-add == 0.1 # 2025-09-09: Only needed for hls 2.11 can be removed once we are past it.
- Cabal-syntax == 3.10.*
- Cabal-syntax == 3.12.*
- Cabal-syntax == 3.14.*
- Cabal-syntax == 3.16.* # version required for cabal-install and other packages
- crypton-x509-store < 1.6.12 # 2025-11-22: requires unix >= 2.8 which isn't available for GHC < 9.6
- extensions == 0.1.0.1 # 2025-09-21: needed for Cabal 3.10 (fourmolo/ormolu with ghc 9.8)
- fourmolu == 0.14.0.0 # 2023-11-13: for ghc-lib-parser 9.6 compat
- fourmolu == 0.15.0.0 # 2025-09-21: for ghc-lib-parser 9.8 compat
- fuzzyset == 0.2.4 # 2023-12-20: Needed for building postgrest > 10
- ghc-exactprint == 1.6.* # 2023-03-30: needed for GHC == 9.4
- ghc-exactprint == 1.7.* # 2025-03-09: needed for GHC == 9.6
- ghc-exactprint == 1.8.* # 2024-05-20: needed for GHC == 9.8
- ghc-exactprint == 1.10.* # 2024-08-27: needed for GHC == 9.10
- ghc-exactprint == 1.9.* # 2024-08-27: needed for GHC == 9.10
- ghc-exactprint == 1.12.* # 2025-10-15: needed for GHC == 9.12
- ghc-lib == 9.6.* # 2022-02-17: preserve for GHC 9.4
- ghc-lib == 9.8.* # 2025-12-11: preserve for GHC 9.6, 9.8
@@ -82,30 +100,33 @@ extra-packages:
- ghc-lib-parser-ex == 9.8.* # 2024-12-26: preserve for GHC 9.6, 9.8
- ghc-tags == 1.7.* # 2023-02-18: preserve for ghc-lib == 9.6.*
- ghc-tags == 1.8.* # 2023-02-18: preserve for ghc-lib == 9.8.*
- haddock-api == 2.27.* # 2026-05-22: latest version compatible with GHC 9.4
- ghc-typelits-natnormalise < 0.8 # 2025-09-15: Stackage is stuck at 0.7.10
- happy == 1.20.* # for ghc-lib-parser == 9.6.*
- hashable < 1.5 # 2025-07-30: hashable >= 1.5 requires GHC >= 9.6
- hasql == 1.9.3.1 # 2026-09-05: Needed for building postgrest
- hasql-dynamic-statements == 0.3.1.8 # 2026-09-05: Needed for building postgrest
- hasql-implicits == 0.2.0.1 # 2026-09-05: Needed for building postgrest
- hasql-notifications == 0.2.4.0 # 2026-09-05: Needed for building postgrest
- hasql-pool == 1.3.0.4 # 2026-09-05: Needed for building postgrest
- hasql-transaction == 1.2.1 # 2026-09-05: Needed for building postgrest
- hasql < 1.7 # 2025-01-19: Needed for building postgrest
- hasql-dynamic-statements < 0.3.1.6 # 2025-01-19: Needed for building postgrest
- hasql-implicits < 0.2 # 2025-01-19: Needed for building postgrest
- hasql-notifications < 0.2.3 # 2025-01-19: Needed for building postgrest
- hasql-pool < 1.1 # 2025-01-19: Needed for building postgrest
- hasql-transaction < 1.1.1 # 2025-01-19: Needed for building postgrest
- hlint == 3.6.* # 2025-04-14: needed for hls with ghc-lib-parser 9.6
- hlint == 3.8.* # 2025-09-21: needed for hls with ghc-lib-parser 9.8
- insert-ordered-containers < 0.3 # 2026-05-25: Needed for building postgrest
- hpack == 0.39.1 # 2026-03-15: to match upstream stack-3.9.3
- language-javascript == 0.7.0.0 # required by purescript
- magic <= 1.1 # 2026-09-10: Needed for building git-annex
- network-run == 0.4.0 # 2024-10-20: for GHC 9.10/network == 3.1.*
- ormolu == 0.7.2.0 # 2023-11-13: for ghc-lib-parser 9.6 compat
- ormolu == 0.7.4.0 # 2023-09-21: for ghc-lib-parser 9.8 compat
- postgresql-binary < 0.15 # 2026-09-05: Needed for building postgrest
- semaphore-compat == 1.0.* # 2026-07-26: required to build cabal-install 3.14
- ShellCheck == 0.10.0 # 2026-05-30: pinned by haskell-ci
- path == 0.9.5 # 2025-09-21: Pin for hls on ghc 9.4
- postgresql-binary < 0.14 # 2025-01-19: Needed for building postgrest
- shake-cabal < 0.2.2.3 # 2023-07-01: last version to support Cabal 3.6.*
- ShellCheck == 0.9.0 # 2024-03-21: pinned by haskell-ci
- simple-get-opt < 0.5 # 2025-05-01: for crux-0.7.2
- stylish-haskell == 0.14.5.0 # 2025-04-14: needed for hls with ghc-lib 9.6
- stylish-haskell == 0.14.6.0 # 2025-09-21: needed for hls with ghc-lib 9.8
- stylish-haskell == 0.15.0.1 # 2025-04-14: needed for hls with ghc-lib 9.10
- swagger2 < 2.9 # 2026-05-25: Needed for building postgrest
- tar == 0.6.3.0 # 2025-08-17: last version to not require file-io and directory-ospath-streaming (for GHC < 9.6)
- validation == 1.1.5 # 2026-06-10: Needed for building geojson 4.1
- text-builder < 1 # 2025-08-27: Needed for building postgrest
- text-builder-dev < 0.4 # 2025-08-27: Needed for building postgrest
# keep-sorted end
# keep-sorted start skip_lines=1 case=no
@@ -120,14 +141,11 @@ package-maintainers:
- basic-sop
- commutative-semigroups
- generics-sop
- ghcide
- ghcjs-base
- ghcjs-dom
- ghcjs-dom-javascript
- ghcjs-dom-jsaddle
- haskell-debugger
- hie-bios
- hiedb
- jsaddle
- jsaddle-clib
- jsaddle-dom
@@ -138,9 +156,6 @@ package-maintainers:
- large-records
- lens-sop
- linux-namespaces
- lsp
- lsp-test
- lsp-types
- monoidal-containers
- proto-lens-arbitrary
- proto3-suite
@@ -150,6 +165,10 @@ package-maintainers:
- universe
- universe-some
- warp
Anton-Latukha:
- hnix
- hnix-store-core
- hnix-store-remote
artem:
- BNFC-meta
- alex-meta
@@ -161,6 +180,8 @@ package-maintainers:
- smtlib-backends-process
- smtlib-backends-tests
- vector-hashtables
arturcygan:
- hevm
athas:
- futhark
auscyber:
@@ -172,9 +193,19 @@ package-maintainers:
- arch-web
- uusi
cdepillabout:
- cloudy
- password
- password-instances
- pretty-simple
- stack
- termonad
centromere:
- nfc
dalpd:
- dhall-lsp-server
- ghc-vis
- patat
- svgcairo
danielrolls:
- aws-spend-summary
- byte-count-reader
@@ -193,18 +224,64 @@ package-maintainers:
- elynx-seq
- elynx-tools
- elynx-tree
- glasso
- mcmc
- pava
- slynx
- tlynx
- xmonad
- xmonad-contrib
erictapen:
- hakyll
Gabriella439:
- annah
- bench
- break
- dhall-bash
- dhall-docs
- dhall-json
- dhall-lsp-server
- dhall-nix
- dhall-nixpkgs
- dhall-openapi
- dhall-text
- dhall-yaml
- dhall
- dirstream
- errors
- foldl
- index-core
- lens-tutorial
- list-transformer
- managed
- mmorph
- morte
- mvc-updates
- mvc
- nix-derivation
- nix-diff
- optional-args
- optparse-generic
- pipes-bytestring
- pipes-concurrency
- pipes-csv
- pipes-extras
- pipes-group
- pipes-http
- pipes-parse
- pipes-safe
- pipes
- server-generic
- total
- turtle
- typed-spreadsheet
gridaphobe:
- located-base
iblech:
- Agda
ilkecan:
- enummapset
ivanbrennan:
- xmonad
- xmonad-contrib
jb55:
# - bson-lens
- cased
@@ -300,9 +377,32 @@ package-maintainers:
- Agda
- agda2hs
- irc-client
- lambdabot
- shake
nomeata:
- cabal-plan-bounds
- lhs2tex
- rec-def
- tasty-expected-failure
peti:
- cabal2spec
- funcmp
- git-annex
- hledger-interest
- hopenssl
- hsdns
- hsemail
- hsyslog
- logging-facade-syslog
- nix-paths
- structured-haskell-mode
- titlecase
- xmonad
- xmonad-contrib
phijor:
- cornelis
poscat:
- hinit
psibi:
- path-pieces
- persistent
@@ -556,6 +656,7 @@ package-maintainers:
- finite-typelits
- has-transformers
- monad-bayes
- monad-schedule
- pulse-simple
- openapi3-code-generator
- rhine

View File

@@ -5,6 +5,7 @@
dont-distribute-packages:
- 4Blocks
- a-piece-of-flake
- a50
- abcBridge
- AbortT-monadstf
@@ -39,11 +40,14 @@ dont-distribute-packages:
- afv
- agda-server
- agda-snippets-hakyll
- age
- agentx
- aip
- alg
- algebra-checkers
- algebra-driven-design
- algebra-sql
- algebraic-graph-duoids
- algolia
- AlgoRhythm
- algorithmic-composition-additional
@@ -132,8 +136,6 @@ dont-distribute-packages:
- ast-monad-json
- astview
- async-ajax
- atelier-db
- atelier-testing
- aterm-utils
- atlassian-connect-core
- atmos-dimensional-tf
@@ -143,6 +145,7 @@ dont-distribute-packages:
- attenuation-profunctors
- AttoJson
- attoparsec-enumerator
- attoparsec-isotropic
- attoparsec-iteratee
- attoparsec-text-enumerator
- atuin
@@ -186,13 +189,6 @@ dont-distribute-packages:
- babylon
- backblaze-b2-hs
- backdropper
- baikai
- baikai-agent
- baikai-claude
- baikai-effectful
- baikai-kit
- baikai-openai
- baikai-trace-otel
- balkon
- ballast
- bamboo
@@ -217,11 +213,11 @@ dont-distribute-packages:
- battleships
- bayes-stack
- bbi
- bcp47-orphans
- bdcs
- bdcs-api
- beam-th
- beautifHOL
- bech32-th
- bein
- belka
- BerlekampAlgorithm
@@ -378,6 +374,7 @@ dont-distribute-packages:
- captcha-core
- car-pool
- carboncopy
- cardano-addresses
- CarneadesIntoDung
- cartel
- cas-hashable-s3
@@ -423,6 +420,7 @@ dont-distribute-packages:
- chart-svg-various
- chart-unit
- chassis
- chatty
- cheapskate-highlight
- cheapskate-terminal
- check-pvp
@@ -450,16 +448,6 @@ dont-distribute-packages:
- claferIG
- claferwiki
- clash
- clash-ghc
- clash-lib
- clash-lib-hedgehog
- clash-prelude
- clash-prelude-hedgehog
- clash-protocols
- clash-protocols-base
- clash-shake
- clash-shockwaves
- clash-vexriscv
- classify-frog
- classy-effects
- classy-effects-th
@@ -631,6 +619,7 @@ dont-distribute-packages:
- cryptocipher
- cryptoids
- cryptoids-class
- cryptol
- cryptonite-cd
- crystalfontz
- CSPM-cspm
@@ -638,6 +627,7 @@ dont-distribute-packages:
- CSPM-Interpreter
- CSPM-ToProlog
- cspmchecker
- css-class-bindings
- csv-enumerator
- ctpl
- cube
@@ -649,7 +639,6 @@ dont-distribute-packages:
- dahdit-network
- dahdit-test
- daino
- danecheck
- Dangerous
- dapi
- darcs-benchmark
@@ -660,6 +649,7 @@ dont-distribute-packages:
- darcswatch
- darkplaces-demo
- darkplaces-rcon-util
- dash-haskell
- data-basic
- data-cycle
- data-default-extra
@@ -683,10 +673,17 @@ dont-distribute-packages:
- dbus-client
- ddate
- ddc-build
- ddc-core
- ddc-core-babel
- ddc-core-eval
- ddc-core-flow
- ddc-core-llvm
- ddc-core-salt
- ddc-core-simpl
- ddc-core-tetra
- ddc-driver
- ddc-interface
- ddc-source-tetra
- ddc-tools
- ddc-war
- ddci-core
@@ -703,6 +700,7 @@ dont-distribute-packages:
- definitive-parser
- definitive-reactive
- definitive-sound
- defun
- deka-tests
- delicious
- delimited-text
@@ -727,6 +725,7 @@ dont-distribute-packages:
- dewdrop
- dfinity-radix-tree
- dhall-lex
- dhall-secret
- dhscanner-kbapi
- dhscanner-kbgen
- dia-functions
@@ -763,7 +762,6 @@ dont-distribute-packages:
- DMuCheck
- DnaProteinAlignment
- dnf-repo
- dnsbase
- dobutokO-poetry
- dobutokO-poetry-general
- dobutokO-poetry-general-languages
@@ -797,6 +795,8 @@ dont-distribute-packages:
- dsmc-tools
- DSTM
- dtd
- duoidal-transformers
- duoids-hedgehog
- Dust
- Dust-crypto
- Dust-tools
@@ -821,7 +821,6 @@ dont-distribute-packages:
- EditTimeReport
- effect-monad
- effective-aspects-mzv
- eigen-hhlo
- ekg-carbon
- elasticsearch-interchange
- electrs-client
@@ -854,9 +853,6 @@ dont-distribute-packages:
- ersatz-viz
- esotericbot
- EsounD
- esqueleto
- esqueleto-compat
- esqueleto-postgis
- esqueleto-streaming
- estreps
- Etage-Graph
@@ -884,9 +880,6 @@ dont-distribute-packages:
- eventium-memory
- eventium-postgresql
- eventium-sqlite
- eventlog-live
- eventlog-live-influxdb
- eventlog-live-otelcol
- EventSocket
- eventsource-geteventstore-store
- eventsource-store-specs
@@ -919,6 +912,7 @@ dont-distribute-packages:
- fallingblocks
- family-tree
- fast-arithmetic
- fast-bech32
- fastcdc
- fastirc
- fault-tree
@@ -939,6 +933,7 @@ dont-distribute-packages:
- feature-flipper-postgres
- fedora-composes
- fedora-img-dl
- feed-gipeda
- feed-translator
- feed2lj
- feed2twitter
@@ -993,8 +988,10 @@ dont-distribute-packages:
- fluid-idl-scotty
- FM-SBLEX
- fmt-for-rio
- fnotation
- foldl-transduce-attoparsec
- follower
- fontwhich
- foo
- Forestry
- FormalGrammars
@@ -1097,6 +1094,7 @@ dont-distribute-packages:
- GenussFold
- geodetic
- geolite-csv
- geomancy-layout
- getemx
- ghc-dump-util
- ghc-imported-from
@@ -1245,6 +1243,8 @@ dont-distribute-packages:
- guarded-rewriting
- GuiHaskell
- GuiTV
- h3spec
- haal-models
- habit
- hablo
- Hach
@@ -1265,6 +1265,7 @@ dont-distribute-packages:
- hackage2twitter
- hackmanager
- haddock
- haddocset
- hadoop-tools
- haggis
- hails-bin
@@ -1328,6 +1329,7 @@ dont-distribute-packages:
- haskell-aliyun
- haskell-bitmex-client
- haskell-debugger
- haskell-docs
- haskell-eigen-util
- haskell-ftp
- haskell-lsp
@@ -1382,7 +1384,6 @@ dont-distribute-packages:
- haskoin-crypto
- haskoin-protocol
- haskoin-script
- haskoin-wallet
- haskoon
- haskoon-httpspec
- haskoon-salvia
@@ -1401,6 +1402,7 @@ dont-distribute-packages:
- hasloGUI
- hasql-postgres
- hasql-postgres-options
- hasql-postgresql-types
- hasql-queue
- hasql-streams-core
- hasql-streams-example
@@ -1421,7 +1423,6 @@ dont-distribute-packages:
- Hayoo
- hback
- hbayes
- hbayesian
- hbb
- hbf
- hbro
@@ -1437,6 +1438,7 @@ dont-distribute-packages:
- hdbi-tests
- hdiff
- hdirect
- hdocs
- hdph
- heart-app
- heatitup
@@ -1548,8 +1550,9 @@ dont-distribute-packages:
- hmeap
- hmeap-utils
- hmep
- HMock
- hMPC
- hmt-diagrams
- hnix-store-db
- HNM
- hnormalise
- hob
@@ -1577,6 +1580,7 @@ dont-distribute-packages:
- hoppy-docs
- hoppy-runtime
- hoppy-std
- horde-ad
- hotswap
- hp2any-graph
- hp2any-manager
@@ -1653,7 +1657,6 @@ dont-distribute-packages:
- hspec-pg-transact
- hspec-setup
- hspec-shouldbe
- hspec-webdriver
- hspecVariant
- hsprocess
- hsql-mysql
@@ -1664,7 +1667,6 @@ dont-distribute-packages:
- hsqml-demo-morris
- hsqml-morris
- hsreadability
- hsrs
- hssourceinfo
- hssqlppp-th
- hstar
@@ -1688,9 +1690,9 @@ dont-distribute-packages:
- http-response-decoder
- http-tower-hs
- http2-client-grpc
- http2-client-grpc-effectful
- http2-grpc-proto-lens
- http2-grpc-proto3-wire
- http3
- https-everywhere-rules
- https-everywhere-rules-raw
- httpspec
@@ -1746,7 +1748,6 @@ dont-distribute-packages:
- hylotab
- hyloutils
- hyperbole
- hyperbole-oauth2
- hyperpublic
- ide-backend
- ide-backend-server
@@ -1774,7 +1775,6 @@ dont-distribute-packages:
- importify
- imprevu-happstack
- improve
- imsos-monad
- INblobs
- inch
- incremental-computing
@@ -1811,7 +1811,6 @@ dont-distribute-packages:
- IORefCAS
- ipatch
- ipc
- ipedb
- ipld-cid
- ipprint
- iptadmin
@@ -1910,7 +1909,6 @@ dont-distribute-packages:
- kansas-lava-shake
- karakuri
- katip-rollbar
- kb-text-layout
- keelung
- keera-hails-mvc-environment-gtk
- keera-hails-mvc-model-lightmodel
@@ -1932,17 +1930,11 @@ dont-distribute-packages:
- keid-geometry
- keid-resource-gltf
- keid-sound-openal
- keiro
- keiro-core
- keiro-dsl
- keiro-migrations
- keiro-ops
- keiro-pgmq
- keiro-test-support
- kerry
- kevin
- key-vault
- keyring
- keystore
- keyvaluehash
- keyword-args
- kicad-data
@@ -1950,11 +1942,6 @@ dont-distribute-packages:
- KiCS-debugger
- KiCS-prophecy
- kif-parser
- kioku-cli
- kioku-core
- kioku-migrate
- kioku-migrations
- kiroku-store-migrations
- kit
- kmeans-par
- kmeans-vector
@@ -2020,6 +2007,7 @@ dont-distribute-packages:
- layered-state
- layouting
- lazy-hash-cache
- lazy-scope
- lda
- ldap-scim-bridge
- ldapply
@@ -2171,7 +2159,6 @@ dont-distribute-packages:
- manifold-random
- Map
- marionetta
- marionette-effectful
- markdown-pap
- markdown2svg
- markov-processes
@@ -2181,6 +2168,7 @@ dont-distribute-packages:
- marvin
- marxup
- masakazu-bot
- massiv-persist
- matchers
- math-programming-glpk
- math-programming-tests
@@ -2209,6 +2197,8 @@ dont-distribute-packages:
- meta-par-accelerate
- MetaObject
- metaplug
- metar
- metar-http
- Metrics
- metro
- metro-socket
@@ -2217,6 +2207,7 @@ dont-distribute-packages:
- metro-transport-xor
- metronome
- MFlow
- mfmts
- Mhailist
- Michelangelo
- micro-gateway
@@ -2399,6 +2390,7 @@ dont-distribute-packages:
- network-rpca
- network-stream
- network-topic-models
- network-transport-quic
- network-websocket
- neuron
- newsletter-mailgun
@@ -2425,7 +2417,6 @@ dont-distribute-packages:
- nonlinear-optimization-ad
- nonlinear-optimization-backprop
- NoSlow
- nostr
- not-gloss
- not-gloss-examples
- notmuch-web
@@ -2471,7 +2462,6 @@ dont-distribute-packages:
- ogma-language-fret-cs
- ogma-language-fret-reqs
- ois-input-manager
- okf-cli
- olwrapper
- om-kubernetes
- online-csv
@@ -2487,6 +2477,8 @@ dont-distribute-packages:
- openssh-github-keys
- opentelemetry-lightstep
- opentok
- opentracing-jaeger
- opentracing-zipkin-v1
- OpenVG
- optimal-blocks
- optimusprime
@@ -2529,6 +2521,7 @@ dont-distribute-packages:
- parco-attoparsec
- parco-parsec
- parconc-examples
- parquet-haskell
- parquet-hs
- parse-help
- parsestar
@@ -2568,20 +2561,16 @@ dont-distribute-packages:
- persistent-hssqlppp
- persistent-iproute
- persistent-map
- persistent-pagination
- persistent-postgresql
- persistent-protobuf
- persistent-sql-lifted
- persistent-typed-db
- persona-idp
- peyotls
- peyotls-codec
- pg-entity
- pg-migrate-test-support
- pgmq-config
- pgmq-effectful
- pgmq-hasql
- pgmq-migration
- phatsort
- phladiprelio-general-shared
- phladiprelio-general-simple
- phladiprelio-ukrainian-shared
@@ -2630,6 +2619,18 @@ dont-distribute-packages:
- Plot-ho-matic
- PlslTools
- plugins-auto
- pms-application-service
- pms-domain-service
- pms-infra-cmdrun
- pms-infra-filesystem
- pms-infra-procspawn
- pms-infra-serial
- pms-infra-socket
- pms-infra-watch
- pms-infrastructure
- pms-ui-notification
- pms-ui-request
- pms-ui-response
- png-file
- pngload
- pointless-lenses
@@ -2671,7 +2672,6 @@ dont-distribute-packages:
- poseidon
- poseidon-postgis
- postgresql-common-persistent
- postgresql-migration-persistent
- postgresql-pure
- postgresql-simple-ltree
- postgresql-simple-queue
@@ -2739,6 +2739,7 @@ dont-distribute-packages:
- psql
- ptera
- ptera-th
- pty-mcp-server
- publicsuffixlist
- puffytools
- Pugs
@@ -2775,6 +2776,8 @@ dont-distribute-packages:
- queryparser-presto
- queryparser-vertica
- queuelike
- quic-simple
- quick-process
- quickcheck-poly
- quickcheck-regex
- quickcheck-relaxng
@@ -2880,8 +2883,6 @@ dont-distribute-packages:
- reheat
- rel8
- relative-date
- relay-pagination-conformance
- relay-pagination-hasql
- remote-json
- remote-json-client
- remote-json-server
@@ -2960,6 +2961,7 @@ dont-distribute-packages:
- rose-trie
- roshask
- rosmsg-bin
- rounded
- roundtrip-xml
- route-generator
- route-planning
@@ -3051,7 +3053,6 @@ dont-distribute-packages:
- secret-sharing
- secrm
- sednaDBXML
- seihou-cli
- seitz-symbol
- SelectSequencesFromMSA
- selenium-server
@@ -3094,6 +3095,7 @@ dont-distribute-packages:
- servant-rate-limit
- servant-reason
- servant-routes-golden
- servant-serialization
- servant-server-namedargs
- servant-snap
- servant-streaming-client
@@ -3131,20 +3133,7 @@ dont-distribute-packages:
- shibuya-kafka-adapter
- shibuya-metrics
- shibuya-pgmq-adapter
- shikumi
- shikumi-cache
- shikumi-cache-postgres
- shikumi-cache-redis
- shikumi-compile
- shikumi-eval
- shikumi-okf
- shikumi-optimize
- shikumi-tools
- shikumi-trace
- shikumi-trace-otel
- shine-varying
- shomei-migrations
- shomei-postgres
- short-vec
- short-vec-lens
- ShortestPathProblems
@@ -3167,6 +3156,7 @@ dont-distribute-packages:
- sibe
- sigma-ij
- signals
- signify-hs
- silvi
- simgi
- simple-c-value
@@ -3306,6 +3296,7 @@ dont-distribute-packages:
- statistics-dirichlet
- statsd-client
- statsdi
- steeloverseer
- stern-brocot
- STLinkUSB
- stm-sbchan
@@ -3365,9 +3356,6 @@ dont-distribute-packages:
- syb-with-class-instances-text
- SybWidget
- sydtest-amqp
- sydtest-mutation-plugin
- sydtest-sqitch-postgres
- sydtest-sqitch-postgres-persistent
- sydtest-webdriver-screenshot
- sydtest-webdriver-yesod
- sylvia
@@ -3493,7 +3481,7 @@ dont-distribute-packages:
- toxcore-c
- toysolver
- tpb
- tpdb
- trace-embrace
- tracing-control
- trajectory
- trans-fx-data
@@ -3523,6 +3511,7 @@ dont-distribute-packages:
- trurl
- tsession-happstack
- tsweb
- tui-launcher
- tuntap-simple
- tup-functor
- tuple-gen
@@ -3666,6 +3655,7 @@ dont-distribute-packages:
- vocoder-dunai
- voicebase
- vorbiscomment
- vpn-router
- vty-ui-extras
- waargonaut
- wahsp
@@ -3686,7 +3676,7 @@ dont-distribute-packages:
- wai-thrift
- waldo
- warp-grpc
- warp-s2n-tls
- warp-quic
- warped
- warpZ-tls
- WashNGo
@@ -3705,9 +3695,7 @@ dont-distribute-packages:
- WebBits-multiplate
- WebCont
- webcrank-wai
- webdriver
- webdriver-w3c
- webdriver-wrapper
- webify
- webserver
- websnap
@@ -3817,6 +3805,7 @@ dont-distribute-packages:
- ycextra
- yeamer
- yeshql
- yesod-alerts
- yesod-articles
- yesod-auth-ldap
- yesod-auth-lti13

View File

@@ -38,7 +38,6 @@ self: super: {
Cabal-syntax = doDistribute self.Cabal-syntax_3_16_1_0;
containers = doDistribute self.containers_0_8;
exceptions = doDistribute self.exceptions_0_10_12;
file-io = markBroken self.file-io_0_2_0;
filepath = doDistribute self.filepath_1_5_5_0;
ghc-bignum = null;
ghc-boot = null;
@@ -50,14 +49,12 @@ self: super: {
ghc-platform = null;
ghc-prim = null;
ghci = null;
haddock-api = markBroken self.haddock-api_2_29_1; # depends on ghc
haddock-library = markBroken self.haddock-library_1_11_0; # depends on ghc
haskeline = doDistribute self.haskeline_0_8_5_0;
haskeline = doDistribute self.haskeline_0_8_4_1;
hpc = markBroken self.hpc_0_7_0_2;
integer-gmp = markBroken self.integer-gmp_1_1;
libiserv = null;
mtl = doDistribute self.mtl_2_3_2;
os-string = doDistribute self.os-string_2_0_11;
os-string = doDistribute self.os-string_2_0_10;
parsec = doDistribute self.parsec_3_1_18_0;
pretty = markBroken self.pretty_1_1_3_6;
rts = null;
@@ -66,10 +63,10 @@ self: super: {
system-cxx-std-lib = null;
template-haskell = null;
terminfo = doDistribute self.terminfo_0_4_1_7;
time = doDistribute self.time_1_16_0_1;
time = doDistribute self.time_1_15;
transformers = doDistribute self.transformers_0_6_3_0;
unix = markBroken self.unix_2_8_8_0;
xhtml = markBroken self.xhtml_3000_4_1_0;
xhtml = markBroken self.xhtml_3000_4_0_0;
# MicroHs replacements for widely used libraries
array = self.array-mhs;

View File

@@ -130,10 +130,6 @@ builtins.intersectAttrs super {
# Tests access homeless-shelter.
hie-bios = dontCheck super.hie-bios;
# The test suite depends on an impure cabal-install installation in
# $HOME, which we don't have in our build sandbox.
cabal-install-parsers = dontCheck super.cabal-install-parsers;
###########################################
### END HASKELL-LANGUAGE-SERVER SECTION ###
###########################################
@@ -628,6 +624,17 @@ builtins.intersectAttrs super {
'';
}) super.cryptol;
# Some test cases require network access
hpack_0_39_1 = doDistribute (
overrideCabal (drv: {
testFlags = drv.testFlags or [ ] ++ [
"--skip=/EndToEnd/hpack/defaults/fails if defaults don't exist/"
"--skip=/Hpack.Defaults/ensureFile/downloads file if missing/"
"--skip=/Hpack.Defaults/ensureFile/with 404/does not create any files/"
];
}) super.hpack_0_39_1
);
# Tries accessing the GitHub API
github-app-token = dontCheck super.github-app-token;
@@ -773,13 +780,9 @@ builtins.intersectAttrs super {
# Wants to check against a real DB, Needs freetds
odbc = dontCheck (addExtraLibraries [ pkgs.freetds ] super.odbc);
purescript = lib.pipe super.purescript [
# Tests attempt to use npm to install from the network into
# /homeless-shelter. Disabled.
dontCheck
# Generate shell completions
(self.generateOptparseApplicativeCompletions [ "purs" ])
];
# Tests attempt to use npm to install from the network into
# /homeless-shelter. Disabled.
purescript = dontCheck super.purescript;
# Hardcoded include path
poppler = overrideCabal (drv: {
@@ -1012,11 +1015,6 @@ builtins.intersectAttrs super {
# https://github.com/plow-technologies/servant-streaming/issues/12
servant-streaming-server = dontCheck super.servant-streaming-server;
# testsuite (namely Tasty tests) uses built package as a GHC plugin
# which does not work on Nix
# since the path hasn't been established yet
ghc-typelits-extra = dontCheck super.ghc-typelits-extra;
reanimate = overrideCabal (drv: {
buildTools = (drv.buildTools or [ ]) ++ [
# needed for testsuite
@@ -1085,9 +1083,6 @@ builtins.intersectAttrs super {
# Break dependency cycle between hedgehog, tasty-hedgehog and lifted-async
lifted-async = dontCheck super.lifted-async;
# Break infinite recursion yesod-test → yesod-form → yesod-test
yesod-test = dontCheck super.yesod-test;
# loc and loc-test depend on each other for testing. Break that infinite cycle:
loc-test = super.loc-test.override { loc = dontCheck self.loc; };
@@ -1140,6 +1135,13 @@ builtins.intersectAttrs super {
];
}) super.lsp-test;
lsp_2_8_0_0 = doDistribute (
super.lsp_2_8_0_0.override {
lsp-types = self.lsp-types_2_4_0_0;
}
);
lsp-types_2_4_0_0 = doDistribute super.lsp-types_2_4_0_0;
# the test suite attempts to run the binaries built in this package
# through $PATH but they aren't in $PATH
dhall-lsp-server = dontCheck super.dhall-lsp-server;
@@ -1280,8 +1282,6 @@ builtins.intersectAttrs super {
ln -sf git-annex git-remote-tor-annex
PATH+=":$PWD"
checkFlagsArray+=("-J$NIX_BUILD_CORES")
echo checkFlags: $checkFlags ''${checkFlagsArray:+"''${checkFlagsArray[@]}"}
# Doesn't use Cabal's test mechanism
@@ -1667,15 +1667,6 @@ builtins.intersectAttrs super {
(disableCabalFlag "icu")
];
# Tests spawn ghc with -fplugin and need this package's in-place package db.
# The trailing colon keeps GHC's default package db in the package path.
# https://hydra.nixos.org/build/329190094
ghc-typelits-natnormalise = overrideCabal (drv: {
preCheck = (drv.preCheck or "") + ''
export NIX_GHC_PACKAGE_PATH_FOR_TEST=$PWD/dist/package.conf.inplace/:$packageConfDir:
'';
}) super.ghc-typelits-natnormalise;
# based on https://github.com/gibiansky/IHaskell/blob/aafeabef786154d81ab7d9d1882bbcd06fc8c6c4/release.nix
ihaskell = overrideCabal (drv: {
# ihaskell's cabal file forces building a shared executable, which we need
@@ -1856,11 +1847,9 @@ builtins.intersectAttrs super {
enableSeparateBinOutput super.cachix
);
hercules-ci-agent = self.generateOptparseApplicativeCompletions [ "hercules-ci-agent" ] (
super.hercules-ci-agent.override {
nix = self.hercules-ci-cnix-store.passthru.nixPackage;
}
);
hercules-ci-agent = super.hercules-ci-agent.override {
nix = self.hercules-ci-cnix-store.passthru.nixPackage;
};
hercules-ci-cnix-expr = addTestToolDepend pkgs.git (
super.hercules-ci-cnix-expr.override { nix = self.hercules-ci-cnix-store.passthru.nixPackage; }
);
@@ -1991,6 +1980,9 @@ builtins.intersectAttrs super {
builtins.mapAttrs (_: fourmoluTestFix) super
)
fourmolu
fourmolu_0_14_0_0
fourmolu_0_16_0_0
fourmolu_0_18_0_0
;
# Test suite needs to execute 'disco' binary
@@ -2308,6 +2300,7 @@ builtins.intersectAttrs super {
})
) super)
hpack
hpack_0_38_1
;
doctest = overrideCabal (drv: {
@@ -2365,31 +2358,6 @@ builtins.intersectAttrs super {
# Workaround for flaky test: https://github.com/basvandijk/threads/issues/10
threads = appendPatch ./patches/threads-flaky-test.patch super.threads;
idris = (self.generateOptparseApplicativeCompletions [ "idris" ]) super.idris;
# Generate cli completions for dhall.
dhall = self.generateOptparseApplicativeCompletions [ "dhall" ] super.dhall;
dhall-json = self.generateOptparseApplicativeCompletions [
"dhall-to-json"
"dhall-to-yaml"
] super.dhall-json;
dhall-nix = self.generateOptparseApplicativeCompletions [ "dhall-to-nix" ] super.dhall-nix;
dhall-nixpkgs = self.generateOptparseApplicativeCompletions [
"dhall-to-nixpkgs"
] super.dhall-nixpkgs;
dhall-yaml = self.generateOptparseApplicativeCompletions [
"dhall-to-yaml-ng"
"yaml-to-dhall"
] super.dhall-yaml;
update-nix-fetchgit = self.generateOptparseApplicativeCompletions [
"update-nix-fetchgit"
] super.update-nix-fetchgit;
hinit = self.generateOptparseApplicativeCompletions [ "hi" ] super.hinit;
hercules-ci-cli = self.generateOptparseApplicativeCompletions [ "hci" ] super.hercules-ci-cli;
}
// lib.optionalAttrs pkgs.config.allowAliases (

File diff suppressed because it is too large Load Diff

View File

@@ -1,85 +0,0 @@
diff -rN -u old-darcs.net/darcs.cabal new-darcs.net/darcs.cabal
--- old-darcs.net/darcs.cabal 2025-09-13 02:45:32.790227974 +0200
+++ new-darcs.net/darcs.cabal 2025-09-13 02:45:32.791227985 +0200
@@ -124,7 +124,7 @@
custom-setup
setup-depends: base >= 4.10 && < 4.21,
- Cabal >= 2.4 && < 3.13,
+ Cabal >= 2.4 && < 3.15,
process >= 1.2.3.0 && < 1.7,
filepath >= 1.4.1 && < 1.5.0.0,
directory >= 1.2.7 && < 1.4
--- old-darcs.net/Setup.hs 2026-06-22 14:55:26.775706597 +0200
+++ new-darcs.net/Setup.hs 2026-06-22 14:56:31.996746207 +0200
--- tmp2.hs 2026-06-22 14:55:26.775706597 +0200
+++ /home/lukas/tmp.hs 2026-06-22 15:25:23.957579360 +0200
--- tmp2.hs 2026-06-22 14:55:26.775706597 +0200
+++ /home/lukas/tmp.hs 2026-06-22 15:28:17.448848236 +0200
@@ -2,6 +2,7 @@
-- portions copyright (c) 2008 David Roundy
-- portions copyright (c) 2007-2009 Judah Jacobson
{-# OPTIONS_GHC -Wall #-}
+{-# LANGUAGE CPP #-}
import Distribution.Simple
( defaultMainWithHooks, UserHooks(..), simpleUserHooks )
import Distribution.PackageDescription ( PackageDescription )
@@ -25,8 +26,17 @@
import System.IO ( openFile, IOMode(..) )
import System.Process (callProcess, runProcess)
import Data.List( isInfixOf )
+#if MIN_VERSION_Cabal_syntax(3,14,0)
+import Distribution.Utils.Path ( (</>), interpretSymbolicPathCWD, makeRelativePathEx )
+#else
import System.FilePath ( (</>) )
+-- Shims so we can use the Cabal >= 3.14 API
+interpretSymbolicPathCWD, makeRelativePathEx :: FilePath -> FilePath
+interpretSymbolicPathCWD = id
+makeRelativePathEx = id
+#endif
+
import qualified Control.Exception as Exception
catchAny :: IO a -> (Exception.SomeException -> IO a) -> IO a
@@ -73,22 +83,26 @@
buildManpage :: LocalBuildInfo -> IO ()
buildManpage lbi = do
- have_darcs_exe_dir <- doesDirectoryExist (buildDir lbi </> "darcs")
+ have_darcs_exe_dir <- doesDirectoryExist
+ $ interpretSymbolicPathCWD (buildDir lbi </> makeRelativePathEx "darcs")
when have_darcs_exe_dir $ do
- let darcs = buildDir lbi </> "darcs/darcs"
- manpage = buildDir lbi </> "darcs/darcs.1"
+ let darcs = interpretSymbolicPathCWD
+ $ buildDir lbi </> makeRelativePathEx "darcs/darcs"
+ manpage = interpretSymbolicPathCWD
+ $ buildDir lbi </> makeRelativePathEx "darcs/darcs.1"
manpageHandle <- openFile manpage WriteMode
void $ runProcess darcs ["help","manpage"]
Nothing Nothing Nothing (Just manpageHandle) Nothing
installManpage :: PackageDescription -> LocalBuildInfo -> Verbosity -> CopyDest -> IO ()
installManpage pkg lbi verbosity copy = do
- have_manpage <- doesFileExist (buildDir lbi </> "darcs" </> "darcs.1")
+ have_manpage <- doesFileExist
+ $ interpretSymbolicPathCWD (buildDir lbi </> makeRelativePathEx "darcs/darcs.1")
when have_manpage $
copyFiles
verbosity
(mandir (absoluteInstallDirs pkg lbi copy) </> "man1")
- [(buildDir lbi </> "darcs", "darcs.1")]
+ [(interpretSymbolicPathCWD (buildDir lbi </> makeRelativePathEx "darcs"), "darcs.1")]
-- ---------------------------------------------------------------------
-- version module
@@ -124,7 +138,7 @@
generateVersionModule :: Verbosity -> LocalBuildInfo -> String -> String -> IO ()
generateVersionModule verbosity lbi version state = do
- let dir = autogenPackageModulesDir lbi
+ let dir = interpretSymbolicPathCWD (autogenPackageModulesDir lbi)
createDirectoryIfMissingVerbose verbosity True dir
ctx <- context verbosity
hash <- weakhash verbosity

View File

@@ -1,13 +0,0 @@
Remove unused dependency.
--- old/darcs.cabal 1970-01-01 01:00:01.000000000 +0100
+++ new/darcs.cabal 2026-08-13 14:15:19.498074382 +0200
@@ -427,7 +427,7 @@
mtl >= 2.2.1 && < 2.4,
transformers >= 0.4.2.0 && < 0.7,
parsec >= 3.1.9 && < 3.2,
- fgl >= 5.5.2.3 && < 5.9,
+
html >= 1.0.1.2 && < 1.1,
filepath >= 1.4.1 && < 1.6,
haskeline >= 0.7.2 && < 0.9,

View File

@@ -1,29 +0,0 @@
--- old-darcs.net/darcs.cabal 1970-01-01 01:00:01.000000000 +0100
+++ new-darcs.net/darcs.cabal 2026-06-22 16:10:41.137461887 +0200
@@ -416,7 +416,7 @@
build-depends: unix >= 2.7.1.0 && < 2.9,
directory >= 1.2.7 && < 1.4
- build-depends: base >= 4.10 && < 4.21,
+ build-depends: base >= 4.10 && < 4.22,
safe >= 0.3.20 && < 0.4,
stm >= 2.1 && < 2.6,
binary >= 0.5 && < 0.11,
@@ -436,7 +436,7 @@
base16-bytestring >= 1.0 && < 1.1,
utf8-string >= 1 && < 1.1,
vector >= 0.11 && < 0.14,
- tar >= 0.5 && < 0.7,
+ tar >= 0.5 && < 0.8,
data-ordlist == 0.4.*
if impl(ghc < 8.10)
@@ -462,7 +462,7 @@
network >= 2.6 && < 3.3,
conduit >= 1.3.0 && < 1.4,
http-conduit >= 2.3 && < 2.4,
- http-types >= 0.12.1 && < 0.12.5,
+ http-types >= 0.12.1 && < 0.13,
exceptions >= 0.6 && < 0.11,
terminal-size >= 0.3.4 && < 0.4

View File

@@ -1,15 +0,0 @@
Based on https://hub.darcs.net/darcs/darcs-screened/patch/523d0a3a5480024ea35fd5d17b35a05e9d3334a0
--- old/darcs.cabal 1970-01-01 01:00:01.000000000 +0100
+++ new/darcs.cabal 2026-08-13 14:18:55.376292224 +0200
@@ -470,8 +470,8 @@
cpp-options: -DHAVE_CRYPTON_CONNECTION
build-depends: crypton-connection >= 0.4 && < 0.5,
data-default >= 0.7.1.3 && < 0.9,
- http-client-tls >= 0.3.5 && < 0.4,
- tls >= 2.0.6 && < 2.2
+ http-client-tls >= 0.3.5 && < 0.5,
+ tls >= 2.0.6 && < 2.5
else
-- cannot use crypton-connection >= 0.4, so
-- constraining indirect dependency to work around problems

View File

@@ -1,64 +0,0 @@
From 7ec76d40250b1762f28adf34c38ece382bf52340 Mon Sep 17 00:00:00 2001
From: sterni <sternenseemann@systemli.org>
Date: Thu, 10 Sep 2026 12:18:13 +0200
Subject: [PATCH] Use ram when interacting with crypton (>= 1.1)
This is a very simple patch for use in Nixpkgs which ships crypton >= 1.1
and thus requires packages to use ram over memory when interacting with
crypton. It makes no effort to preserve compat with older versions of
crypton nor tries to eliminate the dependency on memory for simplicity's
sake.
Joey Hess plans to add support for crypton >= 1.1 soon, but is waiting
on fixes in other dependencies so it can actually be used with unmodified
Hackage dependencies. Since we've already patched those issues, we
can implement this stop gap solution.
---
Annex/Balanced.hs | 2 +-
Utility/Hash/Crypton.hs | 2 +-
git-annex.cabal | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/Annex/Balanced.hs b/Annex/Balanced.hs
index 9005440ad6..5c085ea186 100644
--- a/Annex/Balanced.hs
+++ b/Annex/Balanced.hs
@@ -17,7 +17,7 @@ import Data.Maybe
import qualified Data.List as L
import Data.Bits (shiftL)
import qualified Data.Set as S
-import qualified "memory" Data.ByteArray as BA
+import qualified "ram" Data.ByteArray as BA
-- The Int is how many UUIDs to pick.
type BalancedPicker = S.Set UUID -> Key -> Int -> [UUID]
diff --git a/Utility/Hash/Crypton.hs b/Utility/Hash/Crypton.hs
index 4d290d0150..07e5351cfa 100644
--- a/Utility/Hash/Crypton.hs
+++ b/Utility/Hash/Crypton.hs
@@ -69,7 +69,7 @@ module Utility.Hash.Crypton (
import qualified Data.ByteString as S
import qualified Data.ByteString.Lazy as L
import Data.IORef
-import qualified "memory" Data.ByteArray as BA
+import qualified "ram" Data.ByteArray as BA
import "crypton" Crypto.Hash
import Utility.Hash.Types
diff --git a/git-annex.cabal b/git-annex.cabal
index 270541a008..c649a50972 100644
--- a/git-annex.cabal
+++ b/git-annex.cabal
@@ -289,7 +289,8 @@ Executable git-annex
servant-client-core,
warp (>= 3.2.8),
warp-tls (>= 3.2.2),
- crypton,
+ crypton (>= 1.1),
+ ram,
crypton-connection (>= 0.4.3),
crypton-x509-store,
tls,
--
2.55.0

View File

@@ -1,20 +0,0 @@
From f5a907574e3d77e1eb4768f4cc9807efcc753071 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 2 Oct 2025 04:02:54 +0000
Subject: [PATCH] Fix test failure for small inputs by adding precondition
Co-authored-by: NathanHowell <170829+NathanHowell@users.noreply.github.com>
---
diff --git a/tests/Main.hs b/tests/Main.hs
index 140c942..7a69a72 100644
--- a/tests/Main.hs
+++ b/tests/Main.hs
@@ -52,6 +52,7 @@ prop_compressAndDiscard = monadicIO . forAllM someBigString $ \ str -> do
prop_compressAndCheckLength :: Property
prop_compressAndCheckLength = monadicIO . forAllM someBigString $ \ str -> do
+ pre $ B.length str > 64
len <- run . runResourceT $ Cl.sourceList [str] C.$$ compress Nothing C.=$= Cl.fold (\ acc el -> acc + B.length el) 0
-- random strings don't compress very well
assert (len > B.length str `div` 2)

View File

@@ -1,26 +0,0 @@
Compare https://github.com/yesodweb/yesod/pull/1916
---
diff --git a/yesod-static/yesod-static.cabal b/yesod-static/yesod-static.cabal
index f91c905c..50881677 100644
--- a/yesod-static.cabal
+++ b/yesod-static.cabal
@@ -45,7 +45,7 @@ library
, hashable >= 1.1
, hjsmin
, http-types >= 0.7
- , memory
+ , ram >= 0.21 && < 0.23
, mime-types >= 0.1
, process
, template-haskell
@@ -106,7 +106,7 @@ test-suite tests
, filepath
, hjsmin
, http-types
- , memory
+ , ram
, mime-types
, process
, template-haskell

View File

@@ -15,8 +15,8 @@ mkDerivation {
version = "0.19.0.0";
src = fetchgit {
url = "https://github.com/hercules-ci/optparse-applicative.git";
sha256 = "sha256-tO0V+TKS+ng6OJ8BztKwmV0tV4TnUXOD01ocTyO0sq0=";
rev = "0.19.0.0-fork-1";
sha256 = "068rsq9j0afrywbcqf6vg4ivfxbb68ab7f0lvg1na81mfn7sfakk";
rev = "b55bb38a2aea0cf776aec707cdce7c7418146077";
fetchSubmodules = true;
};
libraryHaskellDepends = [

View File

@@ -149,6 +149,7 @@ stdenv.mkDerivation {
meta = {
description = "Test that the stack in Nixpkgs uses the same version of Hpack as the upstream stack release";
maintainers = with lib.maintainers; [ cdepillabout ];
# This derivation internally runs a statically-linked version of stack from
# upstream. This statically-linked version of stack is only available for

View File

@@ -3625,13 +3625,14 @@ with pkgs;
haskellPackages = recurseIntoAttrs (
# Prefer native-bignum to avoid linking issues with gmp;
# GHC 9.10 doesn't work too well with iserv-proxy.
if stdenv.hostPlatform.isStatic then
haskell.packages.native-bignum.ghc912
# JS backend can't use gmp
else if stdenv.hostPlatform.isGhcjs then
haskell.packages.native-bignum.ghc912
haskell.packages.native-bignum.ghc910
else
haskell.packages.ghc912
haskell.packages.ghc910
);
# haskellPackages.ghc is build->host (it exposes the compiler used to build the
@@ -3645,13 +3646,14 @@ with pkgs;
ghc =
targetPackages.haskellPackages.ghc or (
# Prefer native-bignum to avoid linking issues with gmp;
# GHC 9.10 doesn't work too well with iserv-proxy.
if stdenv.hostPlatform.isStatic then
haskell.compiler.native-bignum.ghc912
# JS backend can't use GMP
else if stdenv.targetPlatform.isGhcjs then
haskell.compiler.native-bignum.ghc912
haskell.compiler.native-bignum.ghc910
else
haskell.compiler.ghc912
haskell.compiler.ghc910
);
# TODO(@NixOS/haskell): deprecate this alias?

View File

@@ -66,7 +66,7 @@ let
ghc96 = sets.ghc967;
ghc98 = sets.ghc984;
ghc910 = sets.ghc9103;
ghc912 = sets.ghc9125;
ghc912 = sets.ghc9123;
ghc914 = sets.ghc9141;
microhs_0_15 = sets.microhs_0_15_4_0;
@@ -189,14 +189,6 @@ in
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
inherit buildTargetLlvmPackages llvmPackages;
};
ghc9125 = callPackage ../development/compilers/ghc/9.12.5.nix {
bootPkgs =
# No suitable bindist packaged yet
bb.packages.ghc9103;
inherit (buildPackages.python3Packages) sphinx;
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
inherit buildTargetLlvmPackages llvmPackages;
};
ghc9141 = callPackage ../development/compilers/ghc/9.14.1.nix {
bootPkgs =
# No suitable bindist packaged yet
@@ -205,14 +197,6 @@ in
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
inherit buildTargetLlvmPackages llvmPackages;
};
ghc9142 = callPackage ../development/compilers/ghc/9.14.2.nix {
bootPkgs =
# No suitable bindist packaged yet
bb.packages.ghc9103;
inherit (buildPackages.python3Packages) sphinx;
inherit (buildPackages.darwin) xattr autoSignDarwinBinariesHook;
inherit buildTargetLlvmPackages llvmPackages;
};
ghcHEAD = callPackage ../development/compilers/ghc/head.nix {
bootPkgs =
# No suitable bindist packaged yet
@@ -312,21 +296,11 @@ in
ghc = bh.compiler.ghc9124;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.12.x.nix { };
};
ghc9125 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc9125;
ghc = bh.compiler.ghc9125;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.12.x.nix { };
};
ghc9141 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc9141;
ghc = bh.compiler.ghc9141;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.14.x.nix { };
};
ghc9142 = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghc9142;
ghc = bh.compiler.ghc9142;
compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-9.14.x.nix { };
};
ghcHEAD = callPackage ../development/haskell-modules {
buildHaskellPackages = bh.packages.ghcHEAD;
ghc = bh.compiler.ghcHEAD;

View File

@@ -67,9 +67,7 @@ let
ghc967
ghc984
ghc9103
ghc9125
ghc9141
ghc9142
ghc9123
];
# packagePlatforms applied to `haskell.packages.*`
@@ -527,49 +525,22 @@ let
compilerNames.ghc948
] released;
Cabal_3_10_3_0 = lib.subtractLists [
# time < 1.13 conflicts with time == 1.14.* || == 1.15.*
compilerNames.ghc9125
compilerNames.ghc9141
compilerNames.ghc9142
] released;
Cabal_3_12_1_0 = lib.subtractLists [
# time < 1.15 conflicts with time == 1.15.*
compilerNames.ghc9141
compilerNames.ghc9142
] released;
Cabal_3_14_2_0 = lib.subtractLists [
# time < 1.15 conflicts with time == 1.15.*
compilerNames.ghc9141
compilerNames.ghc9142
# time < 1.13 conflicts with time == 1.14.*
compilerNames.ghc9123
] released;
Cabal_3_12_1_0 = released;
Cabal_3_14_2_0 = released;
Cabal_3_16_1_0 = released;
Cabal_3_18_1_0 = released;
cabal2nix = released;
cabal2nix-unstable = released;
funcmp = released;
# haddock-{api,library} are core packages as of GHC >= 9.12
haddock-api = [
compilerNames.ghc94
compilerNames.ghc96
# No version compatible with 9.8 nor 9.10 released to Hackage
];
haddock-library = [
compilerNames.ghc94
compilerNames.ghc96
compilerNames.ghc98
compilerNames.ghc910
];
haskell-debugger = [
compilerNames.ghc9141
compilerNames.ghc9142
];
haskell-language-server = released;
hoogle = released;
hlint = lib.subtractLists [
# https://github.com/ndmitchell/hlint/issues/1672
# https://github.com/ndmitchell/hlint/pull/1673
compilerNames.ghc9141
compilerNames.ghc9142
compilerNames.ghc9123
] released;
hpack = released;
hsdns = released;
@@ -578,28 +549,28 @@ let
language-nix = released;
nix-paths = released;
titlecase = released;
ghc-exactprint = released;
ghc-lib = released;
ghc-lib-parser = released;
ghc-lib-parser-ex = released;
ghc-source-gen = released;
ghc-source-gen = lib.subtractLists [
compilerNames.ghc9123
] released;
ghc-tags = lib.subtractLists [
# https://github.com/arybczak/ghc-tags/pull/31
compilerNames.ghc9141
compilerNames.ghc9142
compilerNames.ghc9123
] released;
hashable = released;
primitive = released;
scrod = [
compilerNames.ghc9141
compilerNames.ghc9142
];
semaphore-compat = [
# Compiler < 9.8 don't have the semaphore-compat core package, but
# requires unix >= 2.8.1.0 which implies GHC >= 9.6 for us.
compilerNames.ghc967
];
weeder = released;
weeder = lib.subtractLists [
compilerNames.ghc9123
] released;
# MicroHs core packages
ghc-compat = [