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

Merge pull request #127438 from NixOS/haskell-updates

Browse Source
This commit is contained in:
maralorn 2021-06-22 23:32:51 +02:00 committed by GitHub
commit 35aa6b0fd8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 2436 additions and 2277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
maintainers/scripts/haskell/update-stackage.sh
View File

@ -11,15 +11,17 @@ stackage_config="pkgs/development/haskell-modules/configuration-hackage2nix/stac
trap "rm ${tmpfile} ${tmpfile}.new" 0 trap "rm ${tmpfile} ${tmpfile}.new" 0
touch "$tmpfile" "$tmpfile.new" # Creating files here so that trap creates no errors. touch "$tmpfile" "$tmpfile.new" # Creating files here so that trap creates no errors.
curl -L -s "https://stackage.org/nightly/cabal.config" >"$tmpfile" curl -L -s "https://stackage.org/lts/cabal.config" >"$tmpfile"
old_version=$(grep "# Stackage Nightly" $stackage_config | sed -E 's/.*([0-9]{4}-[0-9]{2}-[0-9]{2}).*/\1/') old_version=$(grep "# Stackage" $stackage_config | sed -E 's/.*([0-9]{2}\.[0-9]+)/\1/')
version=$(sed -rn "s/^--.*http:..(www.)?stackage.org.snapshot.nightly-//p" "$tmpfile") version=$(sed -rn "s/^--.*http:..(www.)?stackage.org.snapshot.lts-//p" "$tmpfile")
if [[ "$old_version" == "$version" ]]; then if [[ "$old_version" == "$version" ]]; then
echo "No new stackage version" echo "No new stackage version"
exit 0 # Nothing to do exit 0 # Nothing to do
fi fi
echo "Updating Stackage LTS from $old_version to $version."
# Create a simple yaml version of the file. # Create a simple yaml version of the file.
sed -r \ sed -r \
-e '/^--/d' \ -e '/^--/d' \
@ -31,7 +33,7 @@ sed -r \
< "${tmpfile}" | sort --ignore-case >"${tmpfile}.new" < "${tmpfile}" | sort --ignore-case >"${tmpfile}.new"
cat > $stackage_config << EOF cat > $stackage_config << EOF
# Stackage Nightly $version # Stackage LTS $version
# This file is auto-generated by # This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh # maintainers/scripts/haskell/update-stackage.sh
default-package-overrides: default-package-overrides:
@ -39,29 +41,16 @@ EOF
# Drop restrictions on some tools where we always want the latest version. # Drop restrictions on some tools where we always want the latest version.
sed -r \ sed -r \
-e '/ cabal-install /d' \
-e '/ cabal2nix /d' \ -e '/ cabal2nix /d' \
-e '/ cabal2spec /d' \
-e '/ distribution-nixpkgs /d' \ -e '/ distribution-nixpkgs /d' \
-e '/ git-annex /d' \
-e '/ hindent /d' \
-e '/ hledger/d' \
-e '/ hlint /d' \
-e '/ hoogle /d' \
-e '/ hopenssl /d' \
-e '/ jailbreak-cabal /d' \ -e '/ jailbreak-cabal /d' \
-e '/ json-autotype/d' \
-e '/ language-nix /d' \ -e '/ language-nix /d' \
-e '/ shake /d' \
-e '/ ShellCheck /d' \
-e '/ stack /d' \
-e '/ weeder /d' \
< "${tmpfile}.new" >> $stackage_config < "${tmpfile}.new" >> $stackage_config
if [[ "${1:-}" == "--do-commit" ]]; then if [[ "${1:-}" == "--do-commit" ]]; then
git add $stackage_config git add $stackage_config
git commit -F - << EOF git commit -F - << EOF
haskellPackages: stackage-nightly $old_version -> $version haskellPackages: stackage-lts $old_version -> $version
This commit has been generated by maintainers/scripts/haskell/update-stackage.sh This commit has been generated by maintainers/scripts/haskell/update-stackage.sh
EOF EOF

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

@ -1,6 +1,6 @@
{ {
"commit": "7708395682f798fe3649bd05387ab571fcf8890c", "commit": "8005ce7c7ba90fa92db65f86c544623353a96cf8",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7708395682f798fe3649bd05387ab571fcf8890c.tar.gz", "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/8005ce7c7ba90fa92db65f86c544623353a96cf8.tar.gz",
"sha256": "0pfv9nmccp9q6p77lmyh8jqkvq1ad392zyy72g8y6kdsgy71nir5", "sha256": "1kzhh7h0csb0vh9avbjsm6hziaa3lbpmzp4pkij4s3bbl4l664aa",
"msg": "Update from Hackage at 2021-06-12T16:23:24Z" "msg": "Update from Hackage at 2021-06-22T07:13:30Z"
} }

44
pkgs/development/haskell-modules/configuration-arm.nix
View File

@ -43,50 +43,52 @@ self: super: {
# Doctests fail on aarch64 due to a GHCi linking bug # Doctests fail on aarch64 due to a GHCi linking bug
# https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295437 # https://gitlab.haskell.org/ghc/ghc/-/issues/15275#note_295437
# TODO: figure out if needed on aarch32 as well # TODO: figure out if needed on aarch32 as well
language-nix = dontCheck super.language-nix;
trifecta = dontCheck super.trifecta;
ad = dontCheck super.ad;
vinyl = dontCheck super.vinyl;
BNFC = dontCheck super.BNFC; BNFC = dontCheck super.BNFC;
C-structs = dontCheck super.C-structs; C-structs = dontCheck super.C-structs;
accelerate = dontCheck super.accelerate; accelerate = dontCheck super.accelerate;
focuslist = dontCheck super.focuslist; ad = dontCheck super.ad;
flight-kml = dontCheck super.flight-kml;
exact-real = dontCheck super.exact-real;
autoapply = dontCheck super.autoapply; autoapply = dontCheck super.autoapply;
hint = dontCheck super.hint; construct = dontCheck super.construct;
hgeometry = dontCheck super.hgeometry; exact-real = dontCheck super.exact-real;
headroom = dontCheck super.headroom; flight-kml = dontCheck super.flight-kml;
focuslist = dontCheck super.focuslist;
grammatical-parsers = dontCheck super.grammatical-parsers;
greskell = dontCheck super.greskell;
groupBy = dontCheck super.groupBy;
haskell-time-range = dontCheck super.haskell-time-range; haskell-time-range = dontCheck super.haskell-time-range;
headroom = dontCheck super.headroom;
hgeometry = dontCheck super.hgeometry;
hhp = dontCheck super.hhp;
hint = dontCheck super.hint;
hls-splice-plugin = dontCheck super.hls-splice-plugin;
hsakamai = dontCheck super.hsakamai; hsakamai = dontCheck super.hsakamai;
hsemail-ns = dontCheck super.hsemail-ns; hsemail-ns = dontCheck super.hsemail-ns;
openapi3 = dontCheck super.openapi3;
strict-writer = dontCheck super.strict-writer;
xml-html-qq = dontCheck super.xml-html-qq;
static = dontCheck super.static;
hhp = dontCheck super.hhp;
groupBy = dontCheck super.groupBy;
greskell = dontCheck super.greskell;
html-validator-cli = dontCheck super.html-validator-cli; html-validator-cli = dontCheck super.html-validator-cli;
hw-fingertree-strict = dontCheck super.hw-fingertree-strict; hw-fingertree-strict = dontCheck super.hw-fingertree-strict;
hw-prim = dontCheck super.hw-prim;
hw-packed-vector = dontCheck super.hw-packed-vector; hw-packed-vector = dontCheck super.hw-packed-vector;
hw-prim = dontCheck super.hw-prim;
hw-xml = dontCheck super.hw-xml; hw-xml = dontCheck super.hw-xml;
language-nix = dontCheck super.language-nix;
lens-regex = dontCheck super.lens-regex; lens-regex = dontCheck super.lens-regex;
meep = dontCheck super.meep; meep = dontCheck super.meep;
openapi3 = dontCheck super.openapi3;
orbits = dontCheck super.orbits;
ranged-list = dontCheck super.ranged-list; ranged-list = dontCheck super.ranged-list;
rank2classes = dontCheck super.rank2classes; rank2classes = dontCheck super.rank2classes;
schedule = dontCheck super.schedule; schedule = dontCheck super.schedule;
static = dontCheck super.static;
strict-writer = dontCheck super.strict-writer;
termonad = dontCheck super.termonad;
trifecta = dontCheck super.trifecta;
twiml = dontCheck super.twiml; twiml = dontCheck super.twiml;
twitter-conduit = dontCheck super.twitter-conduit; twitter-conduit = dontCheck super.twitter-conduit;
validationt = dontCheck super.validationt; validationt = dontCheck super.validationt;
vgrep = dontCheck super.vgrep; vgrep = dontCheck super.vgrep;
vinyl = dontCheck super.vinyl;
vulkan-utils = dontCheck super.vulkan-utils; vulkan-utils = dontCheck super.vulkan-utils;
xml-html-qq = dontCheck super.xml-html-qq;
yaml-combinators = dontCheck super.yaml-combinators; yaml-combinators = dontCheck super.yaml-combinators;
yesod-paginator = dontCheck super.yesod-paginator; yesod-paginator = dontCheck super.yesod-paginator;
grammatical-parsers = dontCheck super.grammatical-parsers;
construct = dontCheck super.construct;
orbits = dontCheck super.orbits;
# https://github.com/ekmett/half/issues/35 # https://github.com/ekmett/half/issues/35
half = dontCheck super.half; half = dontCheck super.half;

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

@ -64,7 +64,14 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src"; name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/"; url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version; rev = "refs/tags/" + super.git-annex.version;
sha256 = "1wig8nw2rxgq86y88m1f1qf93z5yckidf1cs33ribmhqa1hs300p"; sha256 = "1hf2i36ayscdg7fa81akx031chg8c3scbjphj4c1qawif41bynmm";
# delete android and Android directories which cause issues on
# darwin (case insensitive directory). Since we don't need them
# during the build process, we can delete it to prevent a hash
# mismatch on darwin.
postFetch = ''
rm -r $out/doc/?ndroid*
'';
}; };
}).override { }).override {
dbus = if pkgs.stdenv.isLinux then self.dbus else null; dbus = if pkgs.stdenv.isLinux then self.dbus else null;
@ -478,10 +485,11 @@ self: super: {
doctest-discover = dontCheck super.doctest-discover; doctest-discover = dontCheck super.doctest-discover;
# Depends on itself for testing # Depends on itself for testing
tasty-discover = addBuildTool super.tasty-discover tasty-discover = overrideCabal super.tasty-discover (drv: {
(if pkgs.buildPlatform != pkgs.hostPlatform preBuild = ''
then self.buildHaskellPackages.tasty-discover export PATH="$PWD/dist/build/tasty-discover:$PATH"
else dontCheck super.tasty-discover); '' + (drv.preBuild or "");
});
# Known issue with nondeterministic test suite failure # Known issue with nondeterministic test suite failure
# https://github.com/nomeata/tasty-expected-failure/issues/21 # https://github.com/nomeata/tasty-expected-failure/issues/21
@ -563,7 +571,7 @@ self: super: {
preCheck = "export HOME=$TMPDIR"; preCheck = "export HOME=$TMPDIR";
testToolDepends = drv.testToolDepends or [] ++ [self.cabal-install]; testToolDepends = drv.testToolDepends or [] ++ [self.cabal-install];
doCheck = false; # https://github.com/kazu-yamamoto/ghc-mod/issues/335 doCheck = false; # https://github.com/kazu-yamamoto/ghc-mod/issues/335
executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.emacs]; executableToolDepends = drv.executableToolDepends or [] ++ [pkgs.buildPackages.emacs];
postInstall = '' postInstall = ''
local lispdir=( "$data/share/${self.ghc.name}/*/${drv.pname}-${drv.version}/elisp" ) local lispdir=( "$data/share/${self.ghc.name}/*/${drv.pname}-${drv.version}/elisp" )
make -C $lispdir make -C $lispdir
@ -705,20 +713,14 @@ self: super: {
# The tests spuriously fail # The tests spuriously fail
libmpd = dontCheck super.libmpd; libmpd = dontCheck super.libmpd;
# 2021-03-12: All of this libraries have to restrictive upper bounds # Too strict bounds on template-haskell (doesn't allow 2.16)
# https://github.com/diagrams/diagrams-core/issues/112 # For 2.17 support: https://github.com/JonasDuregard/sized-functors/pull/10
# https://github.com/diagrams/diagrams-cairo/issues/77
# https://github.com/diagrams/diagrams-rasterific/issues/63
# https://github.com/diagrams/diagrams-cairo/issues/77
active = doJailbreak super.active;
statestack = doJailbreak super.statestack;
force-layout = doJailbreak super.force-layout;
size-based = doJailbreak super.size-based; size-based = doJailbreak super.size-based;
# Remove as soon as we update to monoid-extras 0.6 and unpin these packages
dual-tree = doJailbreak super.dual-tree; dual-tree = doJailbreak super.dual-tree;
diagrams-core = doJailbreak super.diagrams-core; diagrams-core = doJailbreak super.diagrams-core;
diagrams-postscript = doJailbreak super.diagrams-postscript;
diagrams-svg = doJailbreak super.diagrams-svg;
diagrams-contrib = doJailbreak super.diagrams-contrib;
# Apply patch from master to add compat with optparse-applicative >= 0.16. # Apply patch from master to add compat with optparse-applicative >= 0.16.
# We unfortunately can't upgrade to 1.4.4 which includes this patch yet # We unfortunately can't upgrade to 1.4.4 which includes this patch yet
# since it would require monoid-extras 0.6 which breaks other diagrams libs. # since it would require monoid-extras 0.6 which breaks other diagrams libs.
@ -728,8 +730,6 @@ self: super: {
sha256 = "0xqvzh3ip9i0nv8xnh41afxki64r259pxq8ir1a4v99ggnldpjaa"; sha256 = "0xqvzh3ip9i0nv8xnh41afxki64r259pxq8ir1a4v99ggnldpjaa";
includes = [ "*/CmdLine.hs" ]; includes = [ "*/CmdLine.hs" ];
})); }));
diagrams-rasterific = doJailbreak super.diagrams-rasterific;
diagrams-cairo = doJailbreak super.diagrams-cairo;
# https://github.com/diagrams/diagrams-solve/issues/4 # https://github.com/diagrams/diagrams-solve/issues/4
diagrams-solve = dontCheck super.diagrams-solve; diagrams-solve = dontCheck super.diagrams-solve;
@ -764,7 +764,7 @@ self: super: {
# $PATH. Also, cryptol needs a version of sbl that's newer than what we have # $PATH. Also, cryptol needs a version of sbl that's newer than what we have
# in LTS-13.x. # in LTS-13.x.
cryptol = overrideCabal super.cryptol (drv: { cryptol = overrideCabal super.cryptol (drv: {
buildTools = drv.buildTools or [] ++ [ pkgs.makeWrapper ]; buildTools = drv.buildTools or [] ++ [ pkgs.buildPackages.makeWrapper ];
postInstall = drv.postInstall or "" + '' postInstall = drv.postInstall or "" + ''
for b in $out/bin/cryptol $out/bin/cryptol-html; do for b in $out/bin/cryptol $out/bin/cryptol-html; do
wrapProgram $b --prefix 'PATH' ':' "${pkgs.lib.getBin pkgs.z3}/bin" wrapProgram $b --prefix 'PATH' ':' "${pkgs.lib.getBin pkgs.z3}/bin"
@ -787,7 +787,10 @@ self: super: {
# Needs pginit to function and pgrep to verify. # Needs pginit to function and pgrep to verify.
tmp-postgres = overrideCabal super.tmp-postgres (drv: { tmp-postgres = overrideCabal super.tmp-postgres (drv: {
libraryToolDepends = drv.libraryToolDepends or [] ++ [pkgs.postgresql]; preCheck = ''
export HOME="$TMPDIR"
'' + (drv.preCheck or "");
libraryToolDepends = drv.libraryToolDepends or [] ++ [pkgs.buildPackages.postgresql];
testToolDepends = drv.testToolDepends or [] ++ [pkgs.procps]; testToolDepends = drv.testToolDepends or [] ++ [pkgs.procps];
}); });
@ -1168,6 +1171,11 @@ self: super: {
url = "https://github.com/jaspervdj/hakyll/commit/af9e29b5456c105dc948bc46c93e989a650b5ed1.patch"; url = "https://github.com/jaspervdj/hakyll/commit/af9e29b5456c105dc948bc46c93e989a650b5ed1.patch";
sha256 = "sha256-ghc0V5L9OybNHWKmM0vhjRBN2rIvDlp+ClcK/aQst44="; sha256 = "sha256-ghc0V5L9OybNHWKmM0vhjRBN2rIvDlp+ClcK/aQst44=";
}) })
# Remove when Hakyll > 4.14.0.0
(pkgs.fetchpatch {
url = "https://github.com/jaspervdj/hakyll/commit/e0c63558a82ac4347181d5d77dce7f763a1db410.patch";
sha256 = "sha256-wYlxJmq56YQ29vpVsQhO+JdL0GBezCAfkdhIdFnLYsc=";
})
]; ];
})); }));
@ -1196,7 +1204,7 @@ self: super: {
EdisonAPI = appendPatch super.EdisonAPI (pkgs.fetchpatch { EdisonAPI = appendPatch super.EdisonAPI (pkgs.fetchpatch {
url = "https://github.com/robdockins/edison/pull/16/commits/8da6c0f7d8666766e2f0693425c347c0adb492dc.patch"; url = "https://github.com/robdockins/edison/pull/16/commits/8da6c0f7d8666766e2f0693425c347c0adb492dc.patch";
postFetch = '' postFetch = ''
${pkgs.patchutils}/bin/filterdiff --include='a/edison-api/*' --strip=1 "$out" > "$tmpfile" ${pkgs.buildPackages.patchutils}/bin/filterdiff --include='a/edison-api/*' --strip=1 "$out" > "$tmpfile"
mv "$tmpfile" "$out" mv "$tmpfile" "$out"
''; '';
sha256 = "0yi5pz039lcm4pl9xnl6krqxyqq5rgb5b6m09w0sfy06x0n4x213"; sha256 = "0yi5pz039lcm4pl9xnl6krqxyqq5rgb5b6m09w0sfy06x0n4x213";
@ -1205,7 +1213,7 @@ self: super: {
EdisonCore = appendPatch super.EdisonCore (pkgs.fetchpatch { EdisonCore = appendPatch super.EdisonCore (pkgs.fetchpatch {
url = "https://github.com/robdockins/edison/pull/16/commits/8da6c0f7d8666766e2f0693425c347c0adb492dc.patch"; url = "https://github.com/robdockins/edison/pull/16/commits/8da6c0f7d8666766e2f0693425c347c0adb492dc.patch";
postFetch = '' postFetch = ''
${pkgs.patchutils}/bin/filterdiff --include='a/edison-core/*' --strip=1 "$out" > "$tmpfile" ${pkgs.buildPackages.patchutils}/bin/filterdiff --include='a/edison-core/*' --strip=1 "$out" > "$tmpfile"
mv "$tmpfile" "$out" mv "$tmpfile" "$out"
''; '';
sha256 = "097wqn8hxsr50b9mhndg5pjim5jma2ym4ylpibakmmb5m98n17zp"; sha256 = "097wqn8hxsr50b9mhndg5pjim5jma2ym4ylpibakmmb5m98n17zp";
@ -1284,36 +1292,15 @@ self: super: {
# Fixed upstream but not released to Hackage yet: # Fixed upstream but not released to Hackage yet:
# https://github.com/k0001/hs-libsodium/issues/2 # https://github.com/k0001/hs-libsodium/issues/2
libsodium = overrideCabal super.libsodium (drv: { libsodium = overrideCabal super.libsodium (drv: {
libraryToolDepends = (drv.libraryToolDepends or []) ++ [self.c2hs]; libraryToolDepends = (drv.libraryToolDepends or []) ++ [self.buildHaskellPackages.c2hs];
}); });
# https://github.com/kowainik/policeman/issues/57 # https://github.com/kowainik/policeman/issues/57
policeman = doJailbreak super.policeman; policeman = doJailbreak super.policeman;
# nixpkgs has bumped gdkpixbuf C lib, so we need gi-gdkpixbuf_2_0_26 to link against that. # Too strict version bounds on haskell-gi
# This leads to all this bumps which can be removed once stackage has haskell-gi 0.25.
haskell-gi = self.haskell-gi_0_25_0;
haskell-gi-base = addBuildDepends super.haskell-gi-base_0_25_0 [ pkgs.gobject-introspection ];
gi-glib = self.gi-glib_2_0_25;
gi-cairo = self.gi-cairo_1_0_25;
gi-gobject = self.gi-gobject_2_0_26;
gi-atk = self.gi-atk_2_0_23;
gi-gio = self.gi-gio_2_0_28;
gi-harfbuzz = self.gi-harfbuzz_0_0_4;
gi-javascriptcore = self.gi-javascriptcore_4_0_23;
gi-pango = self.gi-pango_1_0_24;
gi-soup = self.gi-soup_2_4_24;
gi-gdkpixbuf = self.gi-gdkpixbuf_2_0_26;
gi-gdk = self.gi-gdk_3_0_24;
gi-gtk = self.gi-gtk_3_0_37;
gi-webkit2 = self.gi-webkit2_4_0_27;
gi-cairo-render = doJailbreak super.gi-cairo-render; gi-cairo-render = doJailbreak super.gi-cairo-render;
gi-cairo-connector = doJailbreak super.gi-cairo-connector; gi-cairo-connector = doJailbreak super.gi-cairo-connector;
gi-gtk-hs = self.gi-gtk-hs_0_3_10;
gi-dbusmenu = self.gi-dbusmenu_0_4_9;
gi-xlib = self.gi-xlib_2_0_10;
gi-gdkx11 = self.gi-gdkx11_3_0_11;
gi-dbusmenugtk3 = self.gi-dbusmenugtk3_0_4_10;
# Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released) # Missing -Iinclude parameter to doc-tests (pull has been accepted, so should be resolved when 0.5.3 released)
# https://github.com/lehins/massiv/pull/104 # https://github.com/lehins/massiv/pull/104
@ -1398,7 +1385,7 @@ self: super: {
update-nix-fetchgit = let deps = [ pkgs.git pkgs.nix pkgs.nix-prefetch-git ]; update-nix-fetchgit = let deps = [ pkgs.git pkgs.nix pkgs.nix-prefetch-git ];
in generateOptparseApplicativeCompletion "update-nix-fetchgit" (overrideCabal in generateOptparseApplicativeCompletion "update-nix-fetchgit" (overrideCabal
(addTestToolDepends super.update-nix-fetchgit deps) (drv: { (addTestToolDepends super.update-nix-fetchgit deps) (drv: {
buildTools = drv.buildTools or [ ] ++ [ pkgs.makeWrapper ]; buildTools = drv.buildTools or [ ] ++ [ pkgs.buildPackages.makeWrapper ];
postInstall = drv.postInstall or "" + '' postInstall = drv.postInstall or "" + ''
wrapProgram "$out/bin/update-nix-fetchgit" --prefix 'PATH' ':' "${ wrapProgram "$out/bin/update-nix-fetchgit" --prefix 'PATH' ':' "${
pkgs.lib.makeBinPath deps pkgs.lib.makeBinPath deps
@ -1415,39 +1402,16 @@ self: super: {
# https://github.com/haskell/haskell-language-server/issues/611 # https://github.com/haskell/haskell-language-server/issues/611
haskell-language-server = dontCheck super.haskell-language-server; haskell-language-server = dontCheck super.haskell-language-server;
# 2021-05-08: Tests fail: https://github.com/haskell/haskell-language-server/issues/1808
hls-splice-plugin = dontCheck super.hls-splice-plugin;
# 2021-05-08: Tests fail: https://github.com/haskell/haskell-language-server/issues/1809 # 2021-05-08: Tests fail: https://github.com/haskell/haskell-language-server/issues/1809
hls-eval-plugin = dontCheck super.hls-eval-plugin; hls-eval-plugin = dontCheck super.hls-eval-plugin;
# 2021-03-19: Too restrictive upper bound on optparse-applicative # 2021-06-20: Tests fail: https://github.com/haskell/haskell-language-server/issues/1949
stylish-haskell = doJailbreak super.stylish-haskell; hls-refine-imports-plugin = dontCheck super.hls-refine-imports-plugin;
# 2021-03-19: https://github.com/facebookincubator/retrie/issues/24
retrie = doJailbreak super.retrie;
# Jailbreak because of restrictive upper bound on base16-bytestring
# 2021-03-19: https://github.com/Avi-D-coder/implicit-hie-cradle/pull/8
implicit-hie-cradle = doJailbreak super.implicit-hie-cradle;
# 2021-03-09: Golden tests seem to be missing in hackage release: # 2021-03-09: Golden tests seem to be missing in hackage release:
# https://github.com/haskell/haskell-language-server/issues/1536 # https://github.com/haskell/haskell-language-server/issues/1536
hls-tactics-plugin = dontCheck (super.hls-tactics-plugin.override { refinery = self.refinery_0_3_0_0; }); hls-tactics-plugin = dontCheck (super.hls-tactics-plugin.override { refinery = self.refinery_0_3_0_0; });
# 2021-03-24: hlint 3.3 is for ghc 9 compat, but hls only supports ghc 8.10
hls-hlint-plugin = super.hls-hlint-plugin.override {
hlint = super.hlint_3_2_7;
};
# hlint 3.3 needs a ghc-lib-parser newer than the one from stackage
hlint = super.hlint.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;
});
# 2021-03-21 Test hangs # 2021-03-21 Test hangs
# https://github.com/haskell/haskell-language-server/issues/1562 # https://github.com/haskell/haskell-language-server/issues/1562
# Jailbreak because of: https://github.com/haskell/haskell-language-server/pull/1595 # Jailbreak because of: https://github.com/haskell/haskell-language-server/pull/1595
@ -1509,8 +1473,6 @@ self: super: {
# 2020-11-19: Jailbreaking until: https://github.com/snapframework/snap/pull/219 # 2020-11-19: Jailbreaking until: https://github.com/snapframework/snap/pull/219
snap = doJailbreak super.snap; snap = doJailbreak super.snap;
cachix = generateOptparseApplicativeCompletion "cachix" super.cachix;
# 2020-11-23: Jailbreaking until: https://github.com/michaelt/text-pipes/pull/29 # 2020-11-23: Jailbreaking until: https://github.com/michaelt/text-pipes/pull/29
pipes-text = doJailbreak super.pipes-text; pipes-text = doJailbreak super.pipes-text;
@ -1524,20 +1486,7 @@ self: super: {
# Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129 # Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129
servant-swagger = dontCheck super.servant-swagger; servant-swagger = dontCheck super.servant-swagger;
hercules-ci-agent = super.hercules-ci-agent.override { hercules-ci-agent = generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent;
cachix =
# https://github.com/cachix/cachix/pull/361
(appendPatch
(addBuildDepend super.cachix super.hercules-ci-cnix-store)
(pkgs.fetchpatch {
name = "cachix-361.patch";
url = "https://patch-diff.githubusercontent.com/raw/cachix/cachix/pull/361.patch";
sha256 = "0wwlcpmnqmvk1css5f723dzgjvg4jr7i58ifhni5zg9h5iwycdfr";
stripLen = 1;
includes = ["*.cabal" "*.hs"];
})
);
};
hercules-ci-cli = generateOptparseApplicativeCompletion "hci" ( hercules-ci-cli = generateOptparseApplicativeCompletion "hci" (
# See hercules-ci-optparse-applicative in non-hackage-packages.nix. # See hercules-ci-optparse-applicative in non-hackage-packages.nix.
@ -1649,7 +1598,7 @@ self: super: {
feed = dontCheck super.feed; feed = dontCheck super.feed;
spacecookie = overrideCabal super.spacecookie (old: { spacecookie = overrideCabal super.spacecookie (old: {
buildTools = (old.buildTools or []) ++ [ pkgs.installShellFiles ]; buildTools = (old.buildTools or []) ++ [ pkgs.buildPackages.installShellFiles ];
# let testsuite discover the resulting binary # let testsuite discover the resulting binary
preCheck = '' preCheck = ''
export SPACECOOKIE_TEST_BIN=./dist/build/spacecookie/spacecookie export SPACECOOKIE_TEST_BIN=./dist/build/spacecookie/spacecookie
@ -1921,7 +1870,7 @@ EOT
] ++ (drv.patches or []); ] ++ (drv.patches or []);
# fix line endings preventing patch from applying # fix line endings preventing patch from applying
prePatch = '' prePatch = ''
${pkgs.dos2unix}/bin/dos2unix hashable.cabal ${pkgs.buildPackages.dos2unix}/bin/dos2unix hashable.cabal
'' + (drv.prePatch or ""); '' + (drv.prePatch or "");
}); });
@ -1958,8 +1907,11 @@ EOT
# Bounds on profunctors are too strict # Bounds on profunctors are too strict
# https://github.com/ConferOpenSource/composite/issues/50 # https://github.com/ConferOpenSource/composite/issues/50
composite-base = doJailbreak super.composite-base; # Remove overrides when assert fails.
composite-aeson = doJailbreak super.composite-aeson; composite-base = assert super.composite-base.version == "0.7.5.0";
doJailbreak super.composite-base;
composite-aeson = assert super.composite-aeson.version == "0.7.5.0";
doJailbreak super.composite-aeson;
# Too strict bounds on profunctors # Too strict bounds on profunctors
# https://github.com/google/proto-lens/issues/413 # https://github.com/google/proto-lens/issues/413
@ -1969,4 +1921,19 @@ EOT
# https://github.com/jcranch/tophat/issues/1 # https://github.com/jcranch/tophat/issues/1
tophat = doJailbreak super.tophat; tophat = doJailbreak super.tophat;
# 2021-06-20: Outdated upper bounds
# https://github.com/Porges/email-validate-hs/issues/58
email-validate = doJailbreak super.email-validate;
# 2021-06-20: Outdated upper bounds
# https://github.com/Porges/email-validate-hs/issues/58
ghcup = doJailbreak super.ghcup;
# Break out of "Cabal < 3.2" constraint.
stylish-haskell = doJailbreak super.stylish-haskell;
# To strict bound on hspec
# https://github.com/dagit/zenc/issues/5
zenc = doJailbreak super.zenc;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super

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

@ -171,5 +171,10 @@ self: super: {
# 2021-05-25: Tests fail and I have no way to debug them. # 2021-05-25: Tests fail and I have no way to debug them.
hls-class-plugin = dontCheck super.hls-class-plugin; hls-class-plugin = dontCheck super.hls-class-plugin;
hls-brittany-plugin = dontCheck super.hls-brittany-plugin; hls-brittany-plugin = dontCheck super.hls-brittany-plugin;
hls-fourmolu-plugin = dontCheck super.hls-fourmolu-plugin;
hls-module-name-plugin = dontCheck super.hls-module-name-plugin;
# We are lacking pure pgrep at the moment for tests to work
tmp-postgres = dontCheck super.tmp-postgres;
} }

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

@ -84,9 +84,6 @@ self: super: {
executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ]; executableHaskellDepends = drv.executableToolDepends or [] ++ [ self.repline ];
})); }));
# Break out of "Cabal < 3.2" constraint.
stylish-haskell = doJailbreak super.stylish-haskell;
# hackage-db 2.1.1 is incompatible with Cabal < 3.4 # hackage-db 2.1.1 is incompatible with Cabal < 3.4
# See https://github.com/NixOS/cabal2nix/issues/501 # See https://github.com/NixOS/cabal2nix/issues/501
hackage-db = self.hackage-db_2_1_0; hackage-db = self.hackage-db_2_1_0;

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

@ -80,10 +80,6 @@ self: super: {
sha256 = "1rzs764a0nhx002v4fadbys98s6qblw4kx4g46galzjf5f7n2dn4"; sha256 = "1rzs764a0nhx002v4fadbys98s6qblw4kx4g46galzjf5f7n2dn4";
}); });
doctest = dontCheck (doJailbreak super.doctest_0_18_1); doctest = dontCheck (doJailbreak super.doctest_0_18_1);
generic-deriving = appendPatch (doJailbreak super.generic-deriving) (pkgs.fetchpatch {
url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/generic-deriving-1.13.1.patch";
sha256 = "0z85kiwhi5p2wiqwyym0y8q8qrcifp125x5vm0n4482lz41kmqds";
});
language-haskell-extract = appendPatch (doJailbreak super.language-haskell-extract) (pkgs.fetchpatch { 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"; url = "https://gitlab.haskell.org/ghc/head.hackage/-/raw/master/patches/language-haskell-extract-0.2.4.patch";
sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f"; sha256 = "0rgzrq0513nlc1vw7nw4km4bcwn4ivxcgi33jly4a7n3c1r32v1f";
@ -101,9 +97,6 @@ self: super: {
# 0.16.0 introduced support for GHC 9.0.x, stackage has 0.15.0 # 0.16.0 introduced support for GHC 9.0.x, stackage has 0.15.0
memory = super.memory_0_16_0; memory = super.memory_0_16_0;
# 0.29 introduced support for GHC 9.0.x, stackage has 0.28
cryptonite = super.cryptonite_0_29;
# GHC 9.0.x doesn't like `import Spec (main)` in Main.hs # GHC 9.0.x doesn't like `import Spec (main)` in Main.hs
# https://github.com/snoyberg/mono-traversable/issues/192 # https://github.com/snoyberg/mono-traversable/issues/192
mono-traversable = dontCheck super.mono-traversable; mono-traversable = dontCheck super.mono-traversable;
@ -112,4 +105,11 @@ self: super: {
# https://github.com/Soostone/retry/issues/71 # https://github.com/Soostone/retry/issues/71
retry = dontCheck super.retry; retry = dontCheck super.retry;
# hlint 3.3 needs a ghc-lib-parser newer than the one from stackage
hlint = super.hlint_3_3_0.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;
});
} }

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

@ -60,6 +60,7 @@ broken-packages:
- adaptive-containers - adaptive-containers
- adaptive-tuple - adaptive-tuple
- adb - adb
- addy
- adjunction - adjunction
- adobe-swatch-exchange - adobe-swatch-exchange
- ADPfusion - ADPfusion
@ -196,6 +197,7 @@ broken-packages:
- ascii-flatten - ascii-flatten
- ascii-string - ascii-string
- ascii-vector-avc - ascii-vector-avc
- asif
- asil - asil
- asn - asn
- asn1-codec - asn1-codec
@ -402,6 +404,7 @@ broken-packages:
- bloomfilter-redis - bloomfilter-redis
- blosum - blosum
- blubber-server - blubber-server
- bludigon
- Blueprint - Blueprint
- bluetileutils - bluetileutils
- blunk-hask-tests - blunk-hask-tests
@ -540,6 +543,7 @@ broken-packages:
- canteven-parsedate - canteven-parsedate
- cantor - cantor
- Capabilities - Capabilities
- capataz
- capnp - capnp
- capped-list - capped-list
- capri - capri
@ -651,6 +655,7 @@ broken-packages:
- clipper - clipper
- clisparkline - clisparkline
- clit - clit
- clock-extras
- clogparse - clogparse
- clone-all - clone-all
- closure - closure
@ -678,6 +683,7 @@ broken-packages:
- codec-beam - codec-beam
- codec-libevent - codec-libevent
- codecov-haskell - codecov-haskell
- codeforces-cli
- codepad - codepad
- codeworld-api - codeworld-api
- codex - codex
@ -802,6 +808,7 @@ broken-packages:
- CoreDump - CoreDump
- CoreErlang - CoreErlang
- core-haskell - core-haskell
- corenlp-parser
- Coroutine - Coroutine
- coroutine-object - coroutine-object
- CouchDB - CouchDB
@ -856,6 +863,7 @@ broken-packages:
- css - css
- css-easings - css-easings
- css-selectors - css-selectors
- css-syntax
- csv-nptools - csv-nptools
- ctemplate - ctemplate
- ctkl - ctkl
@ -1080,6 +1088,7 @@ broken-packages:
- docusign-example - docusign-example
- docvim - docvim
- domplate - domplate
- do-spaces
- dotfs - dotfs
- dot-linker - dot-linker
- doublify-toolkit - doublify-toolkit
@ -1488,6 +1497,7 @@ broken-packages:
- funpat - funpat
- funspection - funspection
- fused-effects-exceptions - fused-effects-exceptions
- fused-effects-mwc-random
- fused-effects-resumable - fused-effects-resumable
- fusion - fusion
- futun - futun
@ -1560,6 +1570,7 @@ broken-packages:
- ghc-clippy-plugin - ghc-clippy-plugin
- ghc-core-smallstep - ghc-core-smallstep
- ghc-datasize - ghc-datasize
- ghc-debug-convention
- ghc-dump-tree - ghc-dump-tree
- ghc-dup - ghc-dup
- ghc-events-analyze - ghc-events-analyze
@ -2044,6 +2055,7 @@ broken-packages:
- hgrib - hgrib
- hharp - hharp
- HHDL - HHDL
- hhp
- hhwloc - hhwloc
- hi - hi
- hi3status - hi3status
@ -2102,9 +2114,6 @@ broken-packages:
- hlongurl - hlongurl
- hlrdb-core - hlrdb-core
- hls-exactprint-utils - hls-exactprint-utils
- hls-floskell-plugin
- hls-fourmolu-plugin
- hls-pragmas-plugin
- hlwm - hlwm
- hmarkup - hmarkup
- hmatrix-banded - hmatrix-banded
@ -2363,6 +2372,7 @@ broken-packages:
- hVOIDP - hVOIDP
- hwall-auth-iitk - hwall-auth-iitk
- hw-ci-assist - hw-ci-assist
- hw-dump
- hweblib - hweblib
- hwhile - hwhile
- hw-json-simd - hw-json-simd
@ -2736,6 +2746,7 @@ broken-packages:
- limp-cbc - limp-cbc
- linda - linda
- linden - linden
- linear-accelerate
- linear-algebra-cblas - linear-algebra-cblas
- linear-base - linear-base
- linear-code - linear-code
@ -3223,6 +3234,7 @@ broken-packages:
- nix-freeze-tree - nix-freeze-tree
- nixfromnpm - nixfromnpm
- nixpkgs-update - nixpkgs-update
- nix-thunk
- nix-tools - nix-tools
- nkjp - nkjp
- nlp-scores - nlp-scores
@ -3525,6 +3537,7 @@ broken-packages:
- pg-recorder - pg-recorder
- pg-store - pg-store
- pgstream - pgstream
- pg-transact
- phasechange - phasechange
- phaser - phaser
- phoityne - phoityne
@ -3612,6 +3625,7 @@ broken-packages:
- poly-control - poly-control
- polydata-core - polydata-core
- polynomial - polynomial
- polysemy
- polysemy-zoo - polysemy-zoo
- polytypeable - polytypeable
- pomohoro - pomohoro
@ -3630,6 +3644,7 @@ broken-packages:
- posix-api - posix-api
- posix-realtime - posix-realtime
- posix-waitpid - posix-waitpid
- posplyu
- postcodes - postcodes
- postgres-embedded - postgres-embedded
- postgresql-lo-stream - postgresql-lo-stream
@ -4123,6 +4138,7 @@ broken-packages:
- serokell-util - serokell-util
- servant-aeson-specs - servant-aeson-specs
- servant-auth-cookie - servant-auth-cookie
- servant-auth-docs
- servant-auth-hmac - servant-auth-hmac
- servant-auth-token-api - servant-auth-token-api
- servant-avro - servant-avro
@ -4216,6 +4232,7 @@ broken-packages:
- shivers-cfg - shivers-cfg
- shoap - shoap
- shopify - shopify
- shortcut-links
- shorten-strings - shorten-strings
- show-prettyprint - show-prettyprint
- Shpadoinkle-backend-snabbdom - Shpadoinkle-backend-snabbdom
@ -4377,6 +4394,7 @@ broken-packages:
- sparse - sparse
- sparsecheck - sparsecheck
- sparse-lin-alg - sparse-lin-alg
- spartacon
- special-functors - special-functors
- special-keys - special-keys
- speculate - speculate
@ -4501,6 +4519,7 @@ broken-packages:
- string-quote - string-quote
- stringtable-atom - stringtable-atom
- stripe - stripe
- stripeapi
- stripe-hs - stripe-hs
- stripe-http-streams - stripe-http-streams
- stripe-signature - stripe-signature
@ -4549,6 +4568,7 @@ broken-packages:
- swift-lda - swift-lda
- swiss-ephemeris - swiss-ephemeris
- swisstable - swisstable
- sws
- syb-extras - syb-extras
- SybWidget - SybWidget
- syb-with-class-instances-text - syb-with-class-instances-text
@ -4618,6 +4638,7 @@ broken-packages:
- tcod-haskell - tcod-haskell
- tcp - tcp
- tcp-streams-openssl - tcp-streams-openssl
- tdigest-Chart
- tds - tds
- teams - teams
- teeth - teeth
@ -4648,6 +4669,7 @@ broken-packages:
- terntup - terntup
- terraform-http-backend-pass - terraform-http-backend-pass
- tersmu - tersmu
- tesla
- testCom - testCom
- testcontainers - testcontainers
- test-fixture - test-fixture
@ -4683,6 +4705,7 @@ broken-packages:
- text-position - text-position
- text-register-machine - text-register-machine
- text-replace - text-replace
- text-time
- textual - textual
- text-utf8 - text-utf8
- text-xml-qq - text-xml-qq
@ -4759,7 +4782,6 @@ broken-packages:
- Titim - Titim
- tkhs - tkhs
- tkyprof - tkyprof
- tmp-postgres
- todo - todo
- tofromxml - tofromxml
- to-haskell - to-haskell
@ -5103,6 +5125,7 @@ broken-packages:
- weather-api - weather-api
- webapp - webapp
- WebBits - WebBits
- webby
- webcloud - webcloud
- webcrank - webcrank
- webcrank-dispatch - webcrank-dispatch
@ -5279,6 +5302,7 @@ broken-packages:
- yesod-form-richtext - yesod-form-richtext
- yesod-gitrev - yesod-gitrev
- yesod-goodies - yesod-goodies
- yesod-ip
- yesod-job-queue - yesod-job-queue
- yesod-links - yesod-links
- yesod-lucid - yesod-lucid
@ -5346,3 +5370,4 @@ broken-packages:
- ztar - ztar
- Zwaluw - Zwaluw
- zxcvbn-dvorak - zxcvbn-dvorak
- zxcvbn-hs

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

@ -73,26 +73,18 @@ default-package-overrides:
# gi-gdkx11-4.x requires gtk-4.x, which is still under development and # gi-gdkx11-4.x requires gtk-4.x, which is still under development and
# not yet available in Nixpkgs # not yet available in Nixpkgs
- gi-gdkx11 < 4 - gi-gdkx11 < 4
# Needs Cabal 3.4 for Setup.hs
- gi-javascriptcore < 4.0.23 #
- gi-soup < 2.4.24 #
- gi-webkit2 < 4.0.27 #
# 2021-05-11: not all diagrams libraries have adjusted to # 2021-05-11: not all diagrams libraries have adjusted to
# monoid-extras 0.6 yet, keep them pinned to lower versions # monoid-extras 0.6 yet, keep them pinned to lower versions
# until we can do a full migration, see # until we can do a full migration, see
# https://github.com/diagrams/diagrams-core/issues/115 # https://github.com/diagrams/diagrams-core/issues/115
# We can keep this pin at most until base 4.15 # We can keep this pin at most until base 4.15
# Since the monoid-extras adjustment was combined with
# a major release in some cases, we need to wait for
# diagrams 1.5 to be released.
- monoid-extras < 0.6 - monoid-extras < 0.6
- dual-tree < 0.2.3.0
- diagrams-core < 1.5.0 - diagrams-core < 1.5.0
- diagrams-lib < 1.4.4 - diagrams-lib < 1.4.4
# 2021-05-11: Pin for hls 1.1.0
- ghcide == 1.2.*
- hls-plugin-api == 1.1.0.0
- hls-explicit-imports-plugin < 1.0.0.2
# 2021-05-12: remove once versions >= 5.0.0 is in stackage
- futhark < 0.19.5
# 2021-06-05: remove once pandoc 2.14 is in stackage
- pandoc-crossref < 0.3.11.0
# 2021-06-14: hnix still needs old versions https://github.com/haskell-nix/hnix/issues/952 # 2021-06-14: hnix still needs old versions https://github.com/haskell-nix/hnix/issues/952
- hnix-store-core < 0.5 - hnix-store-core < 0.5
- hnix-store-remote < 0.5 - hnix-store-remote < 0.5
@ -113,7 +105,6 @@ extra-packages:
- haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0 - haddock-library ==1.7.* # required by stylish-cabal-0.5.0.0
- happy == 1.19.9 # for purescript - happy == 1.19.9 # for purescript
- hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29 - hinotify == 0.3.9 # for xmonad-0.26: https://github.com/kolmodin/hinotify/issues/29
- hlint < 3.3 # We don‘t have ghc-lib-parser 9.0.X yet.
- immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20 - immortal == 0.2.2.1 # required by Hasura 1.3.1, 2020-08-20
- mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls - mmorph == 1.1.3 # Newest working version of mmorph on ghc 8.6.5. needed for hls
- network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15 - network == 2.6.3.1 # required by pkgs/games/hedgewars/default.nix, 2020-11-15
@ -122,9 +113,6 @@ extra-packages:
- resolv == 0.1.1.2 # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x - resolv == 0.1.1.2 # required to build cabal-install-3.0.0.0 with pre ghc-8.8.x
- sbv == 7.13 # required for pkgs.petrinizer - sbv == 7.13 # required for pkgs.petrinizer
- crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses - crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses
- gi-gdk == 3.0.24 # 2021-05-07: For haskell-gi 0.25 without gtk4
- gi-gtk < 4.0 # 2021-05-07: For haskell-gi 0.25 without gtk4
- gi-gdkx11 == 3.0.11 # 2021-05-07: For haskell-gi 0.25 without gtk4
- ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version - ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version
- hackage-db < 2.1.1 # 2021-06-10: Need older hackage-db as long as Cabal < 3.4, see https://github.com/NixOS/cabal2nix/issues/501 - hackage-db < 2.1.1 # 2021-06-10: Need older hackage-db as long as Cabal < 3.4, see https://github.com/NixOS/cabal2nix/issues/501
@ -143,6 +131,9 @@ package-maintainers:
- pretty-simple - pretty-simple
- spago - spago
- termonad - termonad
domenkozar:
- cachix
- cachix-api
expipiplus1: expipiplus1:
- VulkanMemoryAllocator - VulkanMemoryAllocator
- autoapply - autoapply
@ -313,6 +304,7 @@ package-maintainers:
- large-hashable - large-hashable
- haskell-ci - haskell-ci
- diagrams - diagrams
- rel8
# owothia # owothia
- irc-client - irc-client
- chatter - chatter

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

@ -1,4 +1,4 @@
# Stackage Nightly 2021-06-10 # Stackage LTS 18.0
# This file is auto-generated by # This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh # maintainers/scripts/haskell/update-stackage.sh
default-package-overrides: default-package-overrides:
@ -28,7 +28,7 @@ default-package-overrides:
- aeson-picker ==0.1.0.5 - aeson-picker ==0.1.0.5
- aeson-pretty ==0.8.8 - aeson-pretty ==0.8.8
- aeson-qq ==0.8.3 - aeson-qq ==0.8.3
- aeson-schemas ==1.3.3 - aeson-schemas ==1.3.4
- aeson-typescript ==0.3.0.1 - aeson-typescript ==0.3.0.1
- aeson-with ==0.1.2.0 - aeson-with ==0.1.2.0
- aeson-yak ==0.1.1.3 - aeson-yak ==0.1.1.3
@ -195,12 +195,11 @@ default-package-overrides:
- attoparsec-path ==0.0.0.1 - attoparsec-path ==0.0.0.1
- audacity ==0.0.2 - audacity ==0.0.2
- aur ==7.0.6 - aur ==7.0.6
- aura ==3.2.4 - aura ==3.2.5
- authenticate ==1.3.5 - authenticate ==1.3.5
- authenticate-oauth ==1.6.0.1 - authenticate-oauth ==1.6.0.1
- autoexporter ==1.1.20 - autoexporter ==1.1.20
- auto-update ==0.1.6 - auto-update ==0.1.6
- avers ==0.0.17.1
- avro ==0.5.2.0 - avro ==0.5.2.0
- aws-cloudfront-signed-cookies ==0.2.0.8 - aws-cloudfront-signed-cookies ==0.2.0.8
- aws-xray-client ==0.1.0.0 - aws-xray-client ==0.1.0.0
@ -237,7 +236,7 @@ default-package-overrides:
- bech32 ==1.1.0 - bech32 ==1.1.0
- bech32-th ==1.0.2 - bech32-th ==1.0.2
- bench ==1.0.12 - bench ==1.0.12
- benchpress ==0.2.2.16 - benchpress ==0.2.2.17
- between ==0.11.0.0 - between ==0.11.0.0
- bibtex ==0.1.0.6 - bibtex ==0.1.0.6
- bifunctors ==5.5.11 - bifunctors ==5.5.11
@ -279,7 +278,7 @@ default-package-overrides:
- blaze-svg ==0.3.6.1 - blaze-svg ==0.3.6.1
- blaze-textual ==0.2.1.0 - blaze-textual ==0.2.1.0
- bmp ==1.2.6.3 - bmp ==1.2.6.3
- BNFC ==2.9.1 - BNFC ==2.9.2
- BNFC-meta ==0.6.1 - BNFC-meta ==0.6.1
- board-games ==0.3 - board-games ==0.3
- boltzmann-samplers ==0.1.1.0 - boltzmann-samplers ==0.1.1.0
@ -304,7 +303,7 @@ default-package-overrides:
- buffer-builder ==0.2.4.7 - buffer-builder ==0.2.4.7
- buffer-pipe ==0.0 - buffer-pipe ==0.0
- bugsnag-haskell ==0.0.4.1 - bugsnag-haskell ==0.0.4.1
- bugsnag-hs ==0.2.0.3 - bugsnag-hs ==0.2.0.4
- bugzilla-redhat ==0.3.1 - bugzilla-redhat ==0.3.1
- burrito ==1.2.0.2 - burrito ==1.2.0.2
- butcher ==1.3.3.2 - butcher ==1.3.3.2
@ -329,7 +328,8 @@ default-package-overrides:
- bzlib ==0.5.1.0 - bzlib ==0.5.1.0
- bzlib-conduit ==0.3.0.2 - bzlib-conduit ==0.3.0.2
- c14n ==0.1.0.1 - c14n ==0.1.0.1
- c2hs ==0.28.7 - c2hs ==0.28.8
- cabal2spec ==2.6.2
- cabal-appimage ==0.3.0.2 - cabal-appimage ==0.3.0.2
- cabal-debian ==5.1 - cabal-debian ==5.1
- cabal-doctest ==1.0.8 - cabal-doctest ==1.0.8
@ -393,8 +393,8 @@ default-package-overrides:
- cipher-des ==0.0.6 - cipher-des ==0.0.6
- cipher-rc4 ==0.1.4 - cipher-rc4 ==0.1.4
- circle-packing ==0.1.0.6 - circle-packing ==0.1.0.6
- circular ==0.3.1.1 - circular ==0.4.0.0
- citeproc ==0.3.0.9 - citeproc ==0.4.0.1
- clash-ghc ==1.4.2 - clash-ghc ==1.4.2
- clash-lib ==1.4.2 - clash-lib ==1.4.2
- clash-prelude ==1.4.2 - clash-prelude ==1.4.2
@ -404,8 +404,7 @@ default-package-overrides:
- clientsession ==0.9.1.2 - clientsession ==0.9.1.2
- climb ==0.3.3 - climb ==0.3.3
- Clipboard ==2.3.2.0 - Clipboard ==2.3.2.0
- clock ==0.8 - clock ==0.8.2
- clock-extras ==0.1.0.2
- closed ==0.2.0.1 - closed ==0.2.0.1
- clumpiness ==0.17.0.2 - clumpiness ==0.17.0.2
- ClustalParser ==1.3.0 - ClustalParser ==1.3.0
@ -425,9 +424,9 @@ default-package-overrides:
- combinatorial ==0.1.0.1 - combinatorial ==0.1.0.1
- comfort-array ==0.4.1 - comfort-array ==0.4.1
- comfort-graph ==0.0.3.1 - comfort-graph ==0.0.3.1
- commonmark ==0.1.1.4 - commonmark ==0.2
- commonmark-extensions ==0.2.0.4 - commonmark-extensions ==0.2.1.2
- commonmark-pandoc ==0.2.0.1 - commonmark-pandoc ==0.2.1
- commutative ==0.0.2 - commutative ==0.0.2
- comonad ==5.0.8 - comonad ==5.0.8
- comonad-extras ==4.0.1 - comonad-extras ==4.0.1
@ -502,7 +501,7 @@ default-package-overrides:
- cryptohash-sha1 ==0.11.100.1 - cryptohash-sha1 ==0.11.100.1
- cryptohash-sha256 ==0.11.102.0 - cryptohash-sha256 ==0.11.102.0
- cryptohash-sha512 ==0.11.100.1 - cryptohash-sha512 ==0.11.100.1
- cryptonite ==0.28 - cryptonite ==0.29
- cryptonite-conduit ==0.2.2 - cryptonite-conduit ==0.2.2
- cryptonite-openssl ==0.7 - cryptonite-openssl ==0.7
- crypto-numbers ==0.2.7 - crypto-numbers ==0.2.7
@ -622,9 +621,9 @@ default-package-overrides:
- dockerfile ==0.2.0 - dockerfile ==0.2.0
- doclayout ==0.3.0.2 - doclayout ==0.3.0.2
- doctemplates ==0.9 - doctemplates ==0.9
- doctest ==0.16.3 - doctest ==0.17
- doctest-discover ==0.2.0.0 - doctest-discover ==0.2.0.0
- doctest-driver-gen ==0.3.0.3 - doctest-driver-gen ==0.3.0.4
- doctest-exitcode-stdio ==0.0 - doctest-exitcode-stdio ==0.0
- doctest-extract ==0.1 - doctest-extract ==0.1
- doctest-lib ==0.1 - doctest-lib ==0.1
@ -675,12 +674,12 @@ default-package-overrides:
- elm-bridge ==0.6.1 - elm-bridge ==0.6.1
- elm-core-sources ==1.0.0 - elm-core-sources ==1.0.0
- elm-export ==0.6.0.1 - elm-export ==0.6.0.1
- elynx ==0.5.0.2 - elynx ==0.5.1.1
- elynx-markov ==0.5.0.2 - elynx-markov ==0.5.1.1
- elynx-nexus ==0.5.0.2 - elynx-nexus ==0.5.1.1
- elynx-seq ==0.5.0.2 - elynx-seq ==0.5.1.1
- elynx-tools ==0.5.0.2 - elynx-tools ==0.5.1.1
- elynx-tree ==0.5.0.2 - elynx-tree ==0.5.1.1
- email-validate ==2.3.2.13 - email-validate ==2.3.2.13
- emd ==0.2.0.0 - emd ==0.2.0.0
- emojis ==0.1 - emojis ==0.1
@ -736,14 +735,14 @@ default-package-overrides:
- extensible-exceptions ==0.1.1.4 - extensible-exceptions ==0.1.1.4
- extra ==1.7.9 - extra ==1.7.9
- extractable-singleton ==0.0.1 - extractable-singleton ==0.0.1
- extrapolate ==0.4.4 - extrapolate ==0.4.6
- fail ==4.9.0.0 - fail ==4.9.0.0
- failable ==1.2.4.0 - failable ==1.2.4.0
- fakedata ==0.8.0 - fakedata ==0.8.0
- fakedata-parser ==0.1.0.0 - fakedata-parser ==0.1.0.0
- fakefs ==0.3.0.2 - fakefs ==0.3.0.2
- fakepull ==0.3.0.2 - fakepull ==0.3.0.2
- faktory ==1.0.3.0 - faktory ==1.0.3.1
- fast-digits ==0.3.0.0 - fast-digits ==0.3.0.0
- fast-logger ==3.0.5 - fast-logger ==3.0.5
- fast-math ==1.0.2 - fast-math ==1.0.2
@ -804,7 +803,7 @@ default-package-overrides:
- forkable-monad ==0.2.0.3 - forkable-monad ==0.2.0.3
- forma ==1.1.3 - forma ==1.1.3
- format-numbers ==0.1.0.1 - format-numbers ==0.1.0.1
- formatting ==6.3.7 - formatting ==7.1.2
- foundation ==0.0.26.1 - foundation ==0.0.26.1
- fourmolu ==0.3.0.0 - fourmolu ==0.3.0.0
- free ==5.1.7 - free ==5.1.7
@ -840,7 +839,7 @@ default-package-overrides:
- generic-constraints ==1.1.1.1 - generic-constraints ==1.1.1.1
- generic-data ==0.9.2.0 - generic-data ==0.9.2.0
- generic-data-surgery ==0.3.0.0 - generic-data-surgery ==0.3.0.0
- generic-deriving ==1.13.1 - generic-deriving ==1.14
- generic-functor ==0.2.0.0 - generic-functor ==0.2.0.0
- generic-lens ==2.1.0.0 - generic-lens ==2.1.0.0
- generic-lens-core ==2.1.0.0 - generic-lens-core ==2.1.0.0
@ -884,7 +883,7 @@ default-package-overrides:
- geojson ==4.0.2 - geojson ==4.0.2
- getopt-generics ==0.13.0.4 - getopt-generics ==0.13.0.4
- ghc-byteorder ==4.11.0.0.10 - ghc-byteorder ==4.11.0.0.10
- ghc-check ==0.5.0.4 - ghc-check ==0.5.0.5
- ghc-core ==0.5.6 - ghc-core ==0.5.6
- ghc-events ==0.17.0 - ghc-events ==0.17.0
- ghc-exactprint ==0.6.4 - ghc-exactprint ==0.6.4
@ -906,25 +905,24 @@ default-package-overrides:
- ghc-typelits-natnormalise ==0.7.4 - ghc-typelits-natnormalise ==0.7.4
- ghc-typelits-presburger ==0.6.0.0 - ghc-typelits-presburger ==0.6.0.0
- ghost-buster ==0.1.1.0 - ghost-buster ==0.1.1.0
- gi-atk ==2.0.22 - gi-atk ==2.0.23
- gi-cairo ==1.0.24 - gi-cairo ==1.0.25
- gi-cairo-connector ==0.1.0 - gi-dbusmenu ==0.4.9
- gi-cairo-render ==0.1.0 - gi-dbusmenugtk3 ==0.4.10
- gi-dbusmenu ==0.4.8 - gi-gdk ==3.0.24
- gi-dbusmenugtk3 ==0.4.9 - gi-gdkpixbuf ==2.0.26
- gi-gdk ==3.0.23 - gi-gdkx11 ==3.0.11
- gi-gdkpixbuf ==2.0.24 - gi-gio ==2.0.28
- gi-gdkx11 ==3.0.10 - gi-glib ==2.0.25
- gi-gio ==2.0.27 - gi-gmodule ==2.0.1
- gi-glib ==2.0.24 - gi-gobject ==2.0.26
- gi-gobject ==2.0.25 - gi-graphene ==1.0.3
- gi-graphene ==1.0.2 - gi-gtk ==3.0.37
- gi-gtk ==3.0.36 - gi-gtk-hs ==0.3.10
- gi-gtk-hs ==0.3.9 - gi-harfbuzz ==0.0.4
- gi-harfbuzz ==0.0.3
- ginger ==0.10.1.0 - ginger ==0.10.1.0
- gingersnap ==0.3.1.0 - gingersnap ==0.3.1.0
- gi-pango ==1.0.23 - gi-pango ==1.0.24
- githash ==0.1.6.0 - githash ==0.1.6.0
- github-release ==1.3.7 - github-release ==1.3.7
- github-rest ==1.0.3 - github-rest ==1.0.3
@ -932,7 +930,7 @@ default-package-overrides:
- github-webhooks ==0.15.0 - github-webhooks ==0.15.0
- gitlab-haskell ==0.2.5 - gitlab-haskell ==0.2.5
- gitrev ==1.3.1 - gitrev ==1.3.1
- gi-xlib ==2.0.9 - gi-xlib ==2.0.10
- gl ==0.9 - gl ==0.9
- glabrous ==2.0.4 - glabrous ==2.0.4
- GLFW-b ==3.3.0.0 - GLFW-b ==3.3.0.0
@ -962,13 +960,12 @@ default-package-overrides:
- groom ==0.1.2.1 - groom ==0.1.2.1
- group-by-date ==0.1.0.4 - group-by-date ==0.1.0.4
- groups ==0.5.3 - groups ==0.5.3
- gtk-sni-tray ==0.1.6.2
- gtk-strut ==0.1.3.0 - gtk-strut ==0.1.3.0
- guarded-allocation ==0.0.1 - guarded-allocation ==0.0.1
- H ==0.9.0.1 - H ==0.9.0.1
- hackage-db ==2.1.1 - hackage-db ==2.1.1
- hackage-security ==0.6.0.1 - hackage-security ==0.6.0.1
- haddock-library ==1.9.0 - haddock-library ==1.10.0
- hadoop-streaming ==0.2.0.3 - hadoop-streaming ==0.2.0.3
- hakyll-convert ==0.3.0.4 - hakyll-convert ==0.3.0.4
- hal ==0.4.8 - hal ==0.4.8
@ -976,7 +973,7 @@ default-package-overrides:
- hall-symbols ==0.1.0.6 - hall-symbols ==0.1.0.6
- hamtsolo ==1.0.3 - hamtsolo ==1.0.3
- HandsomeSoup ==0.4.2 - HandsomeSoup ==0.4.2
- hapistrano ==0.4.1.4 - hapistrano ==0.4.2.0
- happstack-server ==7.7.1 - happstack-server ==7.7.1
- happy ==1.20.0 - happy ==1.20.0
- happy-meta ==0.2.0.11 - happy-meta ==0.2.0.11
@ -990,8 +987,8 @@ default-package-overrides:
- hashtables ==1.2.4.1 - hashtables ==1.2.4.1
- haskeline ==0.8.1.2 - haskeline ==0.8.1.2
- haskell-awk ==1.2.0.1 - haskell-awk ==1.2.0.1
- haskell-gi ==0.24.7 - haskell-gi ==0.25.0
- haskell-gi-base ==0.24.5 - haskell-gi-base ==0.25.0
- haskell-gi-overloading ==1.0 - haskell-gi-overloading ==1.0
- haskell-import-graph ==1.0.4 - haskell-import-graph ==1.0.4
- haskell-lexer ==1.1 - haskell-lexer ==1.1
@ -1037,6 +1034,8 @@ default-package-overrides:
- hexpat ==0.20.13 - hexpat ==0.20.13
- hformat ==0.3.3.1 - hformat ==0.3.3.1
- hfsevents ==0.1.6 - hfsevents ==0.1.6
- hgeometry ==0.12.0.4
- hgeometry-combinatorial ==0.12.0.3
- hgrev ==0.2.6 - hgrev ==0.2.6
- hidapi ==0.1.7 - hidapi ==0.1.7
- hie-bios ==0.7.5 - hie-bios ==0.7.5
@ -1049,9 +1048,17 @@ default-package-overrides:
- hjsmin ==0.2.0.4 - hjsmin ==0.2.0.4
- hkd-default ==1.1.0.0 - hkd-default ==1.1.0.0
- hkgr ==0.3 - hkgr ==0.3
- hledger ==1.21
- hledger-iadd ==1.3.14
- hledger-interest ==1.6.1
- hledger-lib ==1.21
- hledger-stockquotes ==0.1.2.0
- hledger-ui ==1.21
- hledger-web ==1.21
- hlibcpuid ==0.2.0 - hlibcpuid ==0.2.0
- hlibgit2 ==0.18.0.16 - hlibgit2 ==0.18.0.16
- hlibsass ==0.1.10.1 - hlibsass ==0.1.10.1
- hlint ==3.2.7
- hmatrix ==0.20.2 - hmatrix ==0.20.2
- hmatrix-backprop ==0.1.3.0 - hmatrix-backprop ==0.1.3.0
- hmatrix-gsl ==0.19.0.1 - hmatrix-gsl ==0.19.0.1
@ -1062,8 +1069,10 @@ default-package-overrides:
- hmpfr ==0.4.4 - hmpfr ==0.4.4
- hnock ==0.4.0 - hnock ==0.4.0
- hoauth2 ==1.16.0 - hoauth2 ==1.16.0
- hoogle ==5.0.18.1
- hOpenPGP ==2.9.5 - hOpenPGP ==2.9.5
- hopenpgp-tools ==0.23.6 - hopenpgp-tools ==0.23.6
- hopenssl ==2.2.4
- hopfli ==0.2.2.1 - hopfli ==0.2.2.1
- hosc ==0.18.1 - hosc ==0.18.1
- hostname ==1.0 - hostname ==1.0
@ -1113,7 +1122,7 @@ default-package-overrides:
- hspec-golden-aeson ==0.7.0.0 - hspec-golden-aeson ==0.7.0.0
- hspec-hedgehog ==0.0.1.2 - hspec-hedgehog ==0.0.1.2
- hspec-junit-formatter ==1.0.0.4 - hspec-junit-formatter ==1.0.0.4
- hspec-leancheck ==0.0.4 - hspec-leancheck ==0.0.6
- hspec-megaparsec ==2.2.0 - hspec-megaparsec ==2.2.0
- hspec-meta ==2.7.8 - hspec-meta ==2.7.8
- hspec-need-env ==0.1.0.7 - hspec-need-env ==0.1.0.7
@ -1263,7 +1272,7 @@ default-package-overrides:
- io-streams ==1.5.2.1 - io-streams ==1.5.2.1
- io-streams-haproxy ==1.0.1.0 - io-streams-haproxy ==1.0.1.0
- ip6addr ==1.0.2 - ip6addr ==1.0.2
- ipa ==0.3.1 - ipa ==0.3.1.1
- iproute ==1.7.11 - iproute ==1.7.11
- IPv6Addr ==2.0.2 - IPv6Addr ==2.0.2
- ipynb ==0.1.0.1 - ipynb ==0.1.0.1
@ -1285,7 +1294,7 @@ default-package-overrides:
- ix-shapable ==0.1.0 - ix-shapable ==0.1.0
- jack ==0.7.2 - jack ==0.7.2
- jalaali ==1.0.0.0 - jalaali ==1.0.0.0
- jira-wiki-markup ==1.3.5 - jira-wiki-markup ==1.4.0
- jose ==0.8.4 - jose ==0.8.4
- jose-jwt ==0.9.2 - jose-jwt ==0.9.2
- js-chart ==2.9.4.1 - js-chart ==2.9.4.1
@ -1331,7 +1340,7 @@ default-package-overrides:
- lame ==0.2.0 - lame ==0.2.0
- language-avro ==0.1.3.1 - language-avro ==0.1.3.1
- language-bash ==0.9.2 - language-bash ==0.9.2
- language-c ==0.8.3 - language-c ==0.9.0.1
- language-c-quote ==0.13 - language-c-quote ==0.13
- language-docker ==10.0.1 - language-docker ==10.0.1
- language-java ==0.2.9 - language-java ==0.2.9
@ -1458,7 +1467,7 @@ default-package-overrides:
- maximal-cliques ==0.1.1 - maximal-cliques ==0.1.1
- mbox ==0.3.4 - mbox ==0.3.4
- mbox-utility ==0.0.3.1 - mbox-utility ==0.0.3.1
- mcmc ==0.4.0.0 - mcmc ==0.5.0.0
- mcmc-types ==1.0.3 - mcmc-types ==1.0.3
- medea ==1.2.0 - medea ==1.2.0
- median-stream ==0.7.0.0 - median-stream ==0.7.0.0
@ -1471,6 +1480,7 @@ default-package-overrides:
- mercury-api ==0.1.0.2 - mercury-api ==0.1.0.2
- mergeful ==0.2.0.0 - mergeful ==0.2.0.0
- mergeless ==0.3.0.0 - mergeless ==0.3.0.0
- mersenne-random ==1.0.0.1
- mersenne-random-pure64 ==0.2.2.0 - mersenne-random-pure64 ==0.2.2.0
- messagepack ==0.5.4 - messagepack ==0.5.4
- metrics ==0.4.1.1 - metrics ==0.4.1.1
@ -1544,8 +1554,8 @@ default-package-overrides:
- monad-time ==0.3.1.0 - monad-time ==0.3.1.0
- monad-unlift ==0.2.0 - monad-unlift ==0.2.0
- monad-unlift-ref ==0.2.1 - monad-unlift-ref ==0.2.1
- mongoDB ==2.7.0.0 - mongoDB ==2.7.1.1
- monoid-subclasses ==1.0.1 - monoid-subclasses ==1.1
- monoid-transformer ==0.0.4 - monoid-transformer ==0.0.4
- mono-traversable ==1.0.15.1 - mono-traversable ==1.0.15.1
- mono-traversable-instances ==0.1.1.0 - mono-traversable-instances ==0.1.1.0
@ -1575,7 +1585,7 @@ default-package-overrides:
- mustache ==2.3.1 - mustache ==2.3.1
- mutable-containers ==0.3.4 - mutable-containers ==0.3.4
- mwc-probability ==2.3.1 - mwc-probability ==2.3.1
- mwc-random ==0.14.0.0 - mwc-random ==0.15.0.1
- mwc-random-monad ==0.7.3.1 - mwc-random-monad ==0.7.3.1
- mx-state-codes ==1.0.0.0 - mx-state-codes ==1.0.0.0
- mysql ==0.2.0.1 - mysql ==0.2.0.1
@ -1595,7 +1605,7 @@ default-package-overrides:
- netlib-carray ==0.1 - netlib-carray ==0.1
- netlib-comfort-array ==0.0.0.1 - netlib-comfort-array ==0.0.0.1
- netlib-ffi ==0.1.1 - netlib-ffi ==0.1.1
- net-mqtt ==0.7.1.0 - net-mqtt ==0.7.1.1
- net-mqtt-lens ==0.1.0.0 - net-mqtt-lens ==0.1.0.0
- netpbm ==1.0.4 - netpbm ==1.0.4
- nettle ==0.3.0 - nettle ==0.3.0
@ -1636,8 +1646,8 @@ default-package-overrides:
- nowdoc ==0.1.1.0 - nowdoc ==0.1.1.0
- nqe ==0.6.3 - nqe ==0.6.3
- nri-env-parser ==0.1.0.7 - nri-env-parser ==0.1.0.7
- nri-observability ==0.1.0.2 - nri-observability ==0.1.0.3
- nri-prelude ==0.6.0.1 - nri-prelude ==0.6.0.2
- nsis ==0.3.3 - nsis ==0.3.3
- numbers ==3000.2.0.2 - numbers ==3000.2.0.2
- numeric-extras ==0.1 - numeric-extras ==0.1
@ -1652,8 +1662,8 @@ default-package-overrides:
- nvim-hs-ghcid ==2.0.0.0 - nvim-hs-ghcid ==2.0.0.0
- oauthenticated ==0.2.1.0 - oauthenticated ==0.2.1.0
- ObjectName ==1.1.0.1 - ObjectName ==1.1.0.1
- o-clock ==1.2.0.1 - o-clock ==1.2.1
- odbc ==0.2.2 - odbc ==0.2.5
- oeis2 ==1.0.5 - oeis2 ==1.0.5
- ofx ==0.4.4.0 - ofx ==0.4.4.0
- old-locale ==1.0.0.7 - old-locale ==1.0.0.7
@ -1698,7 +1708,7 @@ default-package-overrides:
- pager ==0.1.1.0 - pager ==0.1.1.0
- pagination ==0.2.2 - pagination ==0.2.2
- pagure-cli ==0.2 - pagure-cli ==0.2
- pandoc ==2.13 - pandoc ==2.14.0.2
- pandoc-dhall-decoder ==0.1.0.1 - pandoc-dhall-decoder ==0.1.0.1
- pandoc-plot ==1.2.3 - pandoc-plot ==1.2.3
- pandoc-throw ==0.1.0.0 - pandoc-throw ==0.1.0.0
@ -1721,7 +1731,7 @@ default-package-overrides:
- password ==3.0.0.0 - password ==3.0.0.0
- password-instances ==3.0.0.0 - password-instances ==3.0.0.0
- password-types ==1.0.0.0 - password-types ==1.0.0.0
- path ==0.7.1 - path ==0.8.0
- path-binary-instance ==0.1.0.1 - path-binary-instance ==0.1.0.1
- path-extensions ==0.1.1.0 - path-extensions ==0.1.1.0
- path-extra ==0.2.0 - path-extra ==0.2.0
@ -1741,7 +1751,7 @@ default-package-overrides:
- pdfinfo ==1.5.4 - pdfinfo ==1.5.4
- peano ==0.1.0.1 - peano ==0.1.0.1
- pem ==0.2.4 - pem ==0.2.4
- percent-format ==0.0.1 - percent-format ==0.0.2
- peregrin ==0.3.1 - peregrin ==0.3.1
- perfect-hash-generator ==0.2.0.6 - perfect-hash-generator ==0.2.0.6
- perfect-vector-shuffle ==0.1.1.1 - perfect-vector-shuffle ==0.1.1.1
@ -1871,7 +1881,7 @@ default-package-overrides:
- pureMD5 ==2.1.3 - pureMD5 ==2.1.3
- purescript-bridge ==0.14.0.0 - purescript-bridge ==0.14.0.0
- pushbullet-types ==0.4.1.0 - pushbullet-types ==0.4.1.0
- pusher-http-haskell ==2.1.0.2 - pusher-http-haskell ==2.1.0.3
- pvar ==1.0.0.0 - pvar ==1.0.0.0
- PyF ==0.9.0.3 - PyF ==0.9.0.3
- qchas ==1.1.0.1 - qchas ==1.1.0.1
@ -1932,6 +1942,8 @@ default-package-overrides:
- readable ==0.3.1 - readable ==0.3.1
- read-editor ==0.1.0.2 - read-editor ==0.1.0.2
- read-env-var ==1.0.0.0 - read-env-var ==1.0.0.0
- reanimate ==1.1.4.0
- reanimate-svg ==0.13.0.1
- rebase ==1.13.0.1 - rebase ==1.13.0.1
- record-dot-preprocessor ==0.2.11 - record-dot-preprocessor ==0.2.11
- record-hasfield ==1.0 - record-hasfield ==1.0
@ -2003,7 +2015,7 @@ default-package-overrides:
- rosezipper ==0.2 - rosezipper ==0.2
- rot13 ==0.2.0.1 - rot13 ==0.2.0.1
- rpmbuild-order ==0.4.5 - rpmbuild-order ==0.4.5
- rp-tree ==0.4 - rp-tree ==0.6
- RSA ==2.4.1 - RSA ==2.4.1
- runmemo ==1.0.0.1 - runmemo ==1.0.0.1
- rvar ==0.2.0.6 - rvar ==0.2.0.6
@ -2024,7 +2036,7 @@ default-package-overrides:
- sample-frame ==0.0.3 - sample-frame ==0.0.3
- sample-frame-np ==0.0.4.1 - sample-frame-np ==0.0.4.1
- sampling ==0.3.5 - sampling ==0.3.5
- sandwich ==0.1.0.7 - sandwich ==0.1.0.8
- sandwich-quickcheck ==0.1.0.5 - sandwich-quickcheck ==0.1.0.5
- sandwich-slack ==0.1.0.4 - sandwich-slack ==0.1.0.4
- sandwich-webdriver ==0.1.0.5 - sandwich-webdriver ==0.1.0.5
@ -2068,7 +2080,7 @@ default-package-overrides:
- seqid ==0.6.2 - seqid ==0.6.2
- seqid-streams ==0.7.2 - seqid-streams ==0.7.2
- sequence-formats ==1.6.1 - sequence-formats ==1.6.1
- sequenceTools ==1.4.0.5 - sequenceTools ==1.5.0
- serf ==0.1.1.0 - serf ==0.1.1.0
- serialise ==0.2.3.0 - serialise ==0.2.3.0
- servant ==0.18.2 - servant ==0.18.2
@ -2108,11 +2120,13 @@ default-package-overrides:
- setlocale ==1.0.0.10 - setlocale ==1.0.0.10
- sexp-grammar ==2.3.0 - sexp-grammar ==2.3.0
- SHA ==1.6.4.4 - SHA ==1.6.4.4
- shake ==0.19.4
- shake-language-c ==0.12.0 - shake-language-c ==0.12.0
- shake-plus ==0.3.3.1 - shake-plus ==0.3.3.1
- shake-plus-extended ==0.4.1.0 - shake-plus-extended ==0.4.1.0
- shakespeare ==2.0.25 - shakespeare ==2.0.25
- shared-memory ==0.2.0.0 - shared-memory ==0.2.0.0
- ShellCheck ==0.7.2
- shell-conduit ==5.0.0 - shell-conduit ==5.0.0
- shell-escape ==0.2.0 - shell-escape ==0.2.0
- shellmet ==0.0.4.0 - shellmet ==0.0.4.0
@ -2153,7 +2167,7 @@ default-package-overrides:
- slack-progressbar ==0.1.0.1 - slack-progressbar ==0.1.0.1
- slick ==1.1.1.0 - slick ==1.1.1.0
- slist ==0.2.0.0 - slist ==0.2.0.0
- slynx ==0.5.0.2 - slynx ==0.5.1.1
- smallcheck ==1.2.1 - smallcheck ==1.2.1
- smash ==0.1.2 - smash ==0.1.2
- smash-aeson ==0.1.0.0 - smash-aeson ==0.1.0.0
@ -2182,7 +2196,7 @@ default-package-overrides:
- sparse-tensor ==0.2.1.5 - sparse-tensor ==0.2.1.5
- spatial-math ==0.5.0.1 - spatial-math ==0.5.0.1
- special-values ==0.1.0.0 - special-values ==0.1.0.0
- speculate ==0.4.8 - speculate ==0.4.10
- speedy-slice ==0.3.2 - speedy-slice ==0.3.2
- Spintax ==0.3.6 - Spintax ==0.3.6
- splice ==0.6.1.1 - splice ==0.6.1.1
@ -2200,6 +2214,7 @@ default-package-overrides:
- squeather ==0.8.0.0 - squeather ==0.8.0.0
- srcloc ==0.6 - srcloc ==0.6
- stache ==2.3.0 - stache ==2.3.0
- stack ==2.7.1
- stackcollapse-ghc ==0.0.1.3 - stackcollapse-ghc ==0.0.1.3
- stack-templatizer ==0.1.0.2 - stack-templatizer ==0.1.0.2
- stateref ==0.3 - stateref ==0.3
@ -2211,10 +2226,8 @@ default-package-overrides:
- step-function ==0.2 - step-function ==0.2
- stm-chans ==3.0.0.4 - stm-chans ==3.0.0.4
- stm-conduit ==4.0.1 - stm-conduit ==4.0.1
- stm-containers ==1.2
- stm-delay ==0.1.1.1 - stm-delay ==0.1.1.1
- stm-extras ==0.1.0.3 - stm-extras ==0.1.0.3
- stm-hamt ==1.2.0.6
- stm-lifted ==2.5.0.0 - stm-lifted ==2.5.0.0
- STMonadTrans ==0.4.5 - STMonadTrans ==0.4.5
- stm-split ==0.0.2.1 - stm-split ==0.0.2.1
@ -2267,7 +2280,7 @@ default-package-overrides:
- swagger ==0.3.0 - swagger ==0.3.0
- swagger2 ==2.6 - swagger2 ==2.6
- sweet-egison ==0.1.1.3 - sweet-egison ==0.1.1.3
- swish ==0.10.0.4 - swish ==0.10.0.5
- syb ==0.7.2.1 - syb ==0.7.2.1
- sydtest ==0.2.0.0 - sydtest ==0.2.0.0
- sydtest-discover ==0.0.0.0 - sydtest-discover ==0.0.0.0
@ -2305,13 +2318,13 @@ default-package-overrides:
- tasty-expected-failure ==0.12.3 - tasty-expected-failure ==0.12.3
- tasty-focus ==1.0.1 - tasty-focus ==1.0.1
- tasty-golden ==2.3.4 - tasty-golden ==2.3.4
- tasty-hedgehog ==1.0.1.0 - tasty-hedgehog ==1.1.0.0
- tasty-hspec ==1.1.6 - tasty-hspec ==1.1.6
- tasty-hunit ==0.10.0.3 - tasty-hunit ==0.10.0.3
- tasty-hunit-compat ==0.2.0.1 - tasty-hunit-compat ==0.2.0.1
- tasty-inspection-testing ==0.1 - tasty-inspection-testing ==0.1
- tasty-kat ==0.0.3 - tasty-kat ==0.0.3
- tasty-leancheck ==0.0.1 - tasty-leancheck ==0.0.2
- tasty-lua ==0.2.3.2 - tasty-lua ==0.2.3.2
- tasty-program ==1.0.5 - tasty-program ==1.0.5
- tasty-quickcheck ==0.10.1.2 - tasty-quickcheck ==0.10.1.2
@ -2336,12 +2349,12 @@ default-package-overrides:
- terminal-size ==0.3.2.1 - terminal-size ==0.3.2.1
- test-framework ==0.8.2.0 - test-framework ==0.8.2.0
- test-framework-hunit ==0.3.0.2 - test-framework-hunit ==0.3.0.2
- test-framework-leancheck ==0.0.1 - test-framework-leancheck ==0.0.4
- test-framework-quickcheck2 ==0.3.0.5 - test-framework-quickcheck2 ==0.3.0.5
- test-framework-smallcheck ==0.2 - test-framework-smallcheck ==0.2
- test-fun ==0.1.0.0 - test-fun ==0.1.0.0
- testing-type-modifiers ==0.1.0.1 - testing-type-modifiers ==0.1.0.1
- texmath ==0.12.2 - texmath ==0.12.3
- text-ansi ==0.1.1 - text-ansi ==0.1.1
- text-binary ==0.2.1.1 - text-binary ==0.2.1.1
- text-builder ==0.6.6.2 - text-builder ==0.6.6.2
@ -2395,7 +2408,7 @@ default-package-overrides:
- th-test-utils ==1.1.0 - th-test-utils ==1.1.0
- th-utilities ==0.2.4.3 - th-utilities ==0.2.4.3
- thyme ==0.3.5.5 - thyme ==0.3.5.5
- tidal ==1.7.4 - tidal ==1.7.5
- tile ==0.3.0.0 - tile ==0.3.0.0
- time-compat ==1.9.5 - time-compat ==1.9.5
- timeit ==2.0 - timeit ==2.0
@ -2416,7 +2429,7 @@ default-package-overrides:
- tls ==1.5.5 - tls ==1.5.5
- tls-debug ==0.4.8 - tls-debug ==0.4.8
- tls-session-manager ==0.0.4 - tls-session-manager ==0.0.4
- tlynx ==0.5.0.2 - tlynx ==0.5.1.1
- tmapchan ==0.0.3 - tmapchan ==0.0.3
- tmapmvar ==0.0.4 - tmapmvar ==0.0.4
- tmp-postgres ==1.34.1.0 - tmp-postgres ==1.34.1.0
@ -2480,9 +2493,11 @@ default-package-overrides:
- unexceptionalio ==0.5.1 - unexceptionalio ==0.5.1
- unexceptionalio-trans ==0.5.1 - unexceptionalio-trans ==0.5.1
- unicode ==0.0.1.1 - unicode ==0.0.1.1
- unicode-collation ==0.1.3
- unicode-show ==0.1.0.4 - unicode-show ==0.1.0.4
- unicode-transforms ==0.3.7.1 - unicode-transforms ==0.3.7.1
- unification-fd ==0.11.1 - unification-fd ==0.11.1
- union-angle ==0.1.0.1
- union-find ==0.2 - union-find ==0.2
- unipatterns ==0.0.0.0 - unipatterns ==0.0.0.0
- uniplate ==1.6.13 - uniplate ==1.6.13
@ -2558,7 +2573,7 @@ default-package-overrides:
- vector-split ==1.0.0.2 - vector-split ==1.0.0.2
- vector-th-unbox ==0.2.1.9 - vector-th-unbox ==0.2.1.9
- verbosity ==0.4.0.0 - verbosity ==0.4.0.0
- versions ==4.0.3 - versions ==5.0.0
- vformat ==0.14.1.0 - vformat ==0.14.1.0
- vformat-aeson ==0.1.0.1 - vformat-aeson ==0.1.0.1
- vformat-time ==0.1.0.0 - vformat-time ==0.1.0.0
@ -2576,7 +2591,7 @@ default-package-overrides:
- wai-feature-flags ==0.1.0.1 - wai-feature-flags ==0.1.0.1
- wai-handler-launch ==3.0.3.1 - wai-handler-launch ==3.0.3.1
- wai-logger ==2.3.6 - wai-logger ==2.3.6
- wai-middleware-auth ==0.2.4.1 - wai-middleware-auth ==0.2.5.0
- wai-middleware-caching ==0.1.0.2 - wai-middleware-caching ==0.1.0.2
- wai-middleware-clacks ==0.1.0.1 - wai-middleware-clacks ==0.1.0.1
- wai-middleware-prometheus ==1.0.0 - wai-middleware-prometheus ==1.0.0
@ -2594,7 +2609,6 @@ default-package-overrides:
- warp-tls-uid ==0.2.0.6 - warp-tls-uid ==0.2.0.6
- wave ==0.2.0 - wave ==0.2.0
- wcwidth ==0.0.2 - wcwidth ==0.0.2
- webby ==1.0.1
- webdriver ==0.9.0.1 - webdriver ==0.9.0.1
- webex-teams-api ==0.2.0.1 - webex-teams-api ==0.2.0.1
- webex-teams-conduit ==0.2.0.1 - webex-teams-conduit ==0.2.0.1
@ -2633,7 +2647,7 @@ default-package-overrides:
- writer-cps-transformers ==0.5.6.1 - writer-cps-transformers ==0.5.6.1
- wss-client ==0.3.0.0 - wss-client ==0.3.0.0
- wuss ==1.1.18 - wuss ==1.1.18
- X11 ==1.9.2 - X11 ==1.10
- X11-xft ==0.3.1 - X11-xft ==0.3.1
- x11-xim ==0.0.9.0 - x11-xim ==0.0.9.0
- x509 ==1.7.5 - x509 ==1.7.5
@ -2674,7 +2688,7 @@ default-package-overrides:
- yesod-bin ==1.6.1 - yesod-bin ==1.6.1
- yesod-core ==1.6.20.1 - yesod-core ==1.6.20.1
- yesod-fb ==0.6.1 - yesod-fb ==0.6.1
- yesod-form ==1.6.7 - yesod-form ==1.7.0
- yesod-gitrev ==0.2.1 - yesod-gitrev ==0.2.1
- yesod-markdown ==0.12.6.11 - yesod-markdown ==0.12.6.11
- yesod-newsfeed ==1.7.0.0 - yesod-newsfeed ==1.7.0.0

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

@ -92,6 +92,7 @@ dont-distribute-packages:
- ApplePush - ApplePush
- approx-rand-test - approx-rand-test
- arbor-monad-metric-datadog - arbor-monad-metric-datadog
- arch-hs
- archlinux-web - archlinux-web
- arduino-copilot - arduino-copilot
- arff - arff
@ -120,7 +121,6 @@ dont-distribute-packages:
- atuin - atuin
- audiovisual - audiovisual
- aura - aura
- aura_3_2_5
- authoring - authoring
- AutoForms - AutoForms
- autonix-deps-kf5 - autonix-deps-kf5
@ -321,6 +321,7 @@ dont-distribute-packages:
- cakyrespa - cakyrespa
- cal3d-examples - cal3d-examples
- cal3d-opengl - cal3d-opengl
- calamity-commands
- calc - calc
- calculator - calculator
- caldims - caldims
@ -435,6 +436,7 @@ dont-distribute-packages:
- code-conjure - code-conjure
- codec-rpm - codec-rpm
- codemonitor - codemonitor
- co-feldspar
- cognimeta-utils - cognimeta-utils
- coinbase-exchange - coinbase-exchange
- colada - colada
@ -631,6 +633,7 @@ dont-distribute-packages:
- dingo-widgets - dingo-widgets
- diplomacy - diplomacy
- diplomacy-server - diplomacy-server
- di-polysemy
- dirfiles - dirfiles
- discogs-haskell - discogs-haskell
- discord-gateway - discord-gateway
@ -695,6 +698,7 @@ dont-distribute-packages:
- Dust-tools-pcap - Dust-tools-pcap
- dvda - dvda
- dynamic-cabal - dynamic-cabal
- dynamic-pipeline
- dynamic-plot - dynamic-plot
- dynobud - dynobud
- DysFRP-Cairo - DysFRP-Cairo
@ -928,6 +932,10 @@ dont-distribute-packages:
- geodetic - geodetic
- geolite-csv - geolite-csv
- getemx - getemx
- ghc-debug-brick
- ghc-debug-client
- ghc-debug-common
- ghc-debug-stub
- ghc-imported-from - ghc-imported-from
- ghc-instances - ghc-instances
- ghci-pretty - ghci-pretty
@ -960,8 +968,10 @@ dont-distribute-packages:
- global-config - global-config
- glome-hs - glome-hs
- GlomeView - GlomeView
- gloss-accelerate
- gloss-devil - gloss-devil
- gloss-examples - gloss-examples
- gloss-raster-accelerate
- gloss-sodium - gloss-sodium
- gmap - gmap
- gmndl - gmndl
@ -1205,7 +1215,6 @@ dont-distribute-packages:
- hasql-cursor-query - hasql-cursor-query
- hasql-postgres - hasql-postgres
- hasql-postgres-options - hasql-postgres-options
- hasql-queue
- hasql-th - hasql-th
- hastache-aeson - hastache-aeson
- haste-app - haste-app
@ -1253,7 +1262,6 @@ dont-distribute-packages:
- hedgehog-gen-json - hedgehog-gen-json
- Hedi - Hedi
- hedis-pile - hedis-pile
- heidi
- heist-aeson - heist-aeson
- helics - helics
- helics-wai - helics-wai
@ -1892,7 +1900,6 @@ dont-distribute-packages:
- MaybeT-transformers - MaybeT-transformers
- MC-Fold-DP - MC-Fold-DP
- mcmc - mcmc
- mcmc_0_5_0_0
- mcmc-samplers - mcmc-samplers
- mDNSResponder-client - mDNSResponder-client
- mealy - mealy
@ -2183,7 +2190,6 @@ dont-distribute-packages:
- peyotls - peyotls
- peyotls-codec - peyotls-codec
- pgsql-simple - pgsql-simple
- pg-transact
- phonetic-languages-examples - phonetic-languages-examples
- phonetic-languages-simplified-lists-examples - phonetic-languages-simplified-lists-examples
- phooey - phooey
@ -2222,16 +2228,29 @@ dont-distribute-packages:
- poke - poke
- polh-lexicon - polh-lexicon
- polydata - polydata
- polysemy-chronos
- polysemy-conc
- polysemy-extra - polysemy-extra
- polysemy-fs
- polysemy-fskvstore - polysemy-fskvstore
- polysemy-http
- polysemy-kvstore-jsonfile - polysemy-kvstore-jsonfile
- polysemy-log
- polysemy-log-co - polysemy-log-co
- polysemy-log-di
- polysemy-methodology - polysemy-methodology
- polysemy-methodology-composite - polysemy-methodology-composite
- polysemy-mocks
- polysemy-optics - polysemy-optics
- polysemy-path - polysemy-path
- polysemy-plugin
- polysemy-RandomFu - polysemy-RandomFu
- polysemy-resume
- polysemy-test
- polysemy-time
- polysemy-video
- polysemy-vinyl - polysemy-vinyl
- polysemy-webserver
- polyseq - polyseq
- polytypeable-utils - polytypeable-utils
- pomodoro - pomodoro
@ -2607,6 +2626,7 @@ dont-distribute-packages:
- servant-streaming-docs - servant-streaming-docs
- servant-streaming-server - servant-streaming-server
- servant-swagger-tags - servant-swagger-tags
- servant-util-beam-pg
- servant-waargonaut - servant-waargonaut
- servant-zeppelin-client - servant-zeppelin-client
- servant-zeppelin-server - servant-zeppelin-server
@ -2805,6 +2825,7 @@ dont-distribute-packages:
- structured-mongoDB - structured-mongoDB
- stunts - stunts
- stutter - stutter
- stylist
- subhask - subhask
- substring-parser - substring-parser
- summoner-tui - summoner-tui
@ -2824,7 +2845,6 @@ dont-distribute-packages:
- swearjure - swearjure
- sweet-egison - sweet-egison
- switch - switch
- sydtest-persistent-postgresql
- sylvia - sylvia
- symantic-atom - symantic-atom
- symantic-lib - symantic-lib

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

@ -243,7 +243,7 @@ self: super: builtins.intersectAttrs super {
llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm_9; }; llvm-hs = super.llvm-hs.override { llvm-config = pkgs.llvm_9; };
# Needs help finding LLVM. # Needs help finding LLVM.
spaceprobe = addBuildTool super.spaceprobe self.llvmPackages.llvm; spaceprobe = addBuildTool super.spaceprobe self.buildHaskellPackages.llvmPackages.llvm;
# Tries to run GUI in tests # Tries to run GUI in tests
leksah = dontCheck (overrideCabal super.leksah (drv: { leksah = dontCheck (overrideCabal super.leksah (drv: {
@ -336,7 +336,7 @@ self: super: builtins.intersectAttrs super {
# https://github.com/deech/fltkhs/issues/16 # https://github.com/deech/fltkhs/issues/16
fltkhs = overrideCabal super.fltkhs (drv: { fltkhs = overrideCabal super.fltkhs (drv: {
libraryToolDepends = (drv.libraryToolDepends or []) ++ [pkgs.autoconf]; libraryToolDepends = (drv.libraryToolDepends or []) ++ [pkgs.buildPackages.autoconf];
librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.fltk13 pkgs.libGL pkgs.libjpeg]; librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.fltk13 pkgs.libGL pkgs.libjpeg];
}); });
@ -495,8 +495,8 @@ self: super: builtins.intersectAttrs super {
Frames-beam = dontCheck super.Frames-beam; Frames-beam = dontCheck super.Frames-beam;
# Compile manpages (which are in RST and are compiled with Sphinx). # Compile manpages (which are in RST and are compiled with Sphinx).
futhark = with pkgs; futhark =
overrideCabal (addBuildTools super.futhark [makeWrapper python3Packages.sphinx]) overrideCabal (addBuildTools super.futhark (with pkgs.buildPackages; [makeWrapper python3Packages.sphinx]))
(_drv: { (_drv: {
postBuild = (_drv.postBuild or "") + '' postBuild = (_drv.postBuild or "") + ''
make -C docs man make -C docs man
@ -511,7 +511,7 @@ self: super: builtins.intersectAttrs super {
git-annex = with pkgs; git-annex = with pkgs;
if (!stdenv.isLinux) then if (!stdenv.isLinux) then
let path = lib.makeBinPath [ coreutils ]; let path = lib.makeBinPath [ coreutils ];
in overrideCabal (addBuildTool super.git-annex makeWrapper) (_drv: { in overrideCabal (addBuildTool super.git-annex buildPackages.makeWrapper) (_drv: {
# This is an instance of https://github.com/NixOS/nix/pull/1085 # This is an instance of https://github.com/NixOS/nix/pull/1085
# Fails with: # Fails with:
# gpg: can't connect to the agent: File name too long # gpg: can't connect to the agent: File name too long
@ -577,7 +577,17 @@ self: super: builtins.intersectAttrs super {
sha256 = "1hjdprm990vyxz86fgq14ajn0lkams7i00h8k2i2g1a0hjdwppq6"; sha256 = "1hjdprm990vyxz86fgq14ajn0lkams7i00h8k2i2g1a0hjdwppq6";
}; };
spagoWithOverrides = super.spago.override { spagoWithPatches = appendPatch super.spago (
# Spago needs a small patch to work with versions-5.0.0:
# https://github.com/purescript/spago/pull/798
# This can probably be removed with >spago-0.20.3.
pkgs.fetchpatch {
url = "https://github.com/purescript/spago/commit/dd4bf4413d9675c1c8065d24d0ed7b345c7fa5dd.patch";
sha256 = "1i1r3f4n9mlkckx15bfrdy5m7gjf0zx7ycwyqra6qn34zpcbzpmf";
}
);
spagoWithOverrides = spagoWithPatches.override {
# spago has not yet been updated for the latest dhall. # spago has not yet been updated for the latest dhall.
dhall = self.dhall_1_38_1; dhall = self.dhall_1_38_1;
}; };
@ -621,7 +631,7 @@ self: super: builtins.intersectAttrs super {
# mplayer-spot uses mplayer at runtime. # mplayer-spot uses mplayer at runtime.
mplayer-spot = mplayer-spot =
let path = pkgs.lib.makeBinPath [ pkgs.mplayer ]; let path = pkgs.lib.makeBinPath [ pkgs.mplayer ];
in overrideCabal (addBuildTool super.mplayer-spot pkgs.makeWrapper) (oldAttrs: { in overrideCabal (addBuildTool super.mplayer-spot pkgs.buildPackages.makeWrapper) (oldAttrs: {
postInstall = '' postInstall = ''
wrapProgram $out/bin/mplayer-spot --prefix PATH : "${path}" wrapProgram $out/bin/mplayer-spot --prefix PATH : "${path}"
''; '';
@ -633,7 +643,7 @@ self: super: builtins.intersectAttrs super {
cut-the-crap = cut-the-crap =
let path = pkgs.lib.makeBinPath [ pkgs.ffmpeg pkgs.youtube-dl ]; let path = pkgs.lib.makeBinPath [ pkgs.ffmpeg pkgs.youtube-dl ];
in overrideCabal (addBuildTool super.cut-the-crap pkgs.makeWrapper) (_drv: { in overrideCabal (addBuildTool super.cut-the-crap pkgs.buildPackages.makeWrapper) (_drv: {
postInstall = '' postInstall = ''
wrapProgram $out/bin/cut-the-crap \ wrapProgram $out/bin/cut-the-crap \
--prefix PATH : "${path}" --prefix PATH : "${path}"
@ -650,7 +660,7 @@ self: super: builtins.intersectAttrs super {
neuron = overrideCabal (super.neuron) (drv: { neuron = overrideCabal (super.neuron) (drv: {
# neuron expects the neuron-search script to be in PATH at built-time. # neuron expects the neuron-search script to be in PATH at built-time.
buildTools = [ pkgs.makeWrapper ]; buildTools = [ pkgs.buildPackages.makeWrapper ];
preConfigure = '' preConfigure = ''
mkdir -p $out/bin mkdir -p $out/bin
cp src-bash/neuron-search $out/bin/neuron-search cp src-bash/neuron-search $out/bin/neuron-search
@ -790,6 +800,42 @@ self: super: builtins.intersectAttrs super {
export HOME=$TMPDIR/home export HOME=$TMPDIR/home
''; '';
}); });
hls-ormolu-plugin = overrideCabal super.hls-ormolu-plugin (drv: {
testToolDepends = [ pkgs.git ];
preCheck = ''
export HOME=$TMPDIR/home
'';
});
hls-fourmolu-plugin = overrideCabal super.hls-fourmolu-plugin (drv: {
testToolDepends = [ pkgs.git ];
preCheck = ''
export HOME=$TMPDIR/home
'';
});
hls-module-name-plugin = overrideCabal super.hls-module-name-plugin (drv: {
testToolDepends = [ pkgs.git ];
preCheck = ''
export HOME=$TMPDIR/home
'';
});
hls-splice-plugin = overrideCabal super.hls-splice-plugin (drv: {
testToolDepends = [ pkgs.git ];
preCheck = ''
export HOME=$TMPDIR/home
'';
});
hls-floskell-plugin = overrideCabal super.hls-floskell-plugin (drv: {
testToolDepends = [ pkgs.git ];
preCheck = ''
export HOME=$TMPDIR/home
'';
});
hls-pragmas-plugin = overrideCabal super.hls-pragmas-plugin (drv: {
testToolDepends = [ pkgs.git ];
preCheck = ''
export HOME=$TMPDIR/home
'';
});
# Tests have file permissions expections that don‘t work with the nix store. # Tests have file permissions expections that don‘t work with the nix store.
hls-stylish-haskell-plugin = dontCheck super.hls-stylish-haskell-plugin; hls-stylish-haskell-plugin = dontCheck super.hls-stylish-haskell-plugin;
hls-haddock-comments-plugin = overrideCabal super.hls-haddock-comments-plugin (drv: { hls-haddock-comments-plugin = overrideCabal super.hls-haddock-comments-plugin (drv: {
@ -799,6 +845,7 @@ self: super: builtins.intersectAttrs super {
''; '';
}); });
hls-eval-plugin = overrideCabal super.hls-eval-plugin (drv: { hls-eval-plugin = overrideCabal super.hls-eval-plugin (drv: {
testToolDepends = [ pkgs.git ];
preCheck = '' preCheck = ''
export HOME=$TMPDIR/home export HOME=$TMPDIR/home
''; '';
@ -832,7 +879,7 @@ self: super: builtins.intersectAttrs super {
(justStaticExecutables super.cabal2nix-unstable) (justStaticExecutables super.cabal2nix-unstable)
(drv: { (drv: {
buildTools = (drv.buildTools or []) ++ [ buildTools = (drv.buildTools or []) ++ [
pkgs.makeWrapper pkgs.buildPackages.makeWrapper
]; ];
postInstall = '' postInstall = ''
wrapProgram $out/bin/cabal2nix \ wrapProgram $out/bin/cabal2nix \
@ -855,7 +902,7 @@ self: super: builtins.intersectAttrs super {
# Runtime dependencies and CLI completion # Runtime dependencies and CLI completion
nvfetcher = generateOptparseApplicativeCompletion "nvfetcher" (overrideCabal nvfetcher = generateOptparseApplicativeCompletion "nvfetcher" (overrideCabal
super.nvfetcher (drv: { super.nvfetcher (drv: {
buildTools = drv.buildTools or [ ] ++ [ pkgs.makeWrapper ]; buildTools = drv.buildTools or [ ] ++ [ pkgs.buildPackages.makeWrapper ];
postInstall = drv.postInstall or "" + '' postInstall = drv.postInstall or "" + ''
wrapProgram "$out/bin/nvfetcher" --prefix 'PATH' ':' "${ wrapProgram "$out/bin/nvfetcher" --prefix 'PATH' ':' "${
pkgs.lib.makeBinPath [ pkgs.nvchecker pkgs.nix-prefetch-git ] pkgs.lib.makeBinPath [ pkgs.nvchecker pkgs.nix-prefetch-git ]
@ -863,4 +910,8 @@ self: super: builtins.intersectAttrs super {
''; '';
})); }));
rel8 = addTestToolDepend super.rel8 pkgs.postgresql;
cachix = generateOptparseApplicativeCompletion "cachix" super.cachix;
} }

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

File diff suppressed because it is too large Load Diff