Merge pull request #198127 from NixOS/haskell-updates
haskellPackages: update stackage and hackage
This commit is contained in:
sternenseemann
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"commit": "2c8100e0ec017b1ab20fcf4679176087b10fbd45",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/2c8100e0ec017b1ab20fcf4679176087b10fbd45.tar.gz",
|
||||
"sha256": "16jvcyn4cxc2f0p92f71yk1n2p6jmblnhqm8is5ipn0j4xz6l0bl",
|
||||
"msg": "Update from Hackage at 2022-10-11T19:16:50Z"
|
||||
"commit": "8983027e744098e8a2fbeac09bcc6eb8a9471fff",
|
||||
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/8983027e744098e8a2fbeac09bcc6eb8a9471fff.tar.gz",
|
||||
"sha256": "1iqgakw71x8cymdifpqnv546wmmrda6w862axli4k03vj7rv91iw",
|
||||
"msg": "Update from Hackage at 2022-10-27T19:26:33Z"
|
||||
}
|
||||
|
||||
@@ -1105,6 +1105,8 @@ self: super: {
|
||||
|
||||
# Requires pg_ctl command during tests
|
||||
beam-postgres = overrideCabal (drv: {
|
||||
# https://github.com/NixOS/nixpkgs/issues/198495
|
||||
doCheck = pkgs.postgresql.doCheck;
|
||||
testToolDepends = (drv.testToolDepends or []) ++ [pkgs.postgresql];
|
||||
}) super.beam-postgres;
|
||||
|
||||
@@ -1127,6 +1129,8 @@ self: super: {
|
||||
sed -i test/PostgreSQL/Test.hs \
|
||||
-e s^host=localhost^^
|
||||
'';
|
||||
# https://github.com/NixOS/nixpkgs/issues/198495
|
||||
doCheck = pkgs.postgresql.doCheck;
|
||||
# Match the test suite defaults (or hardcoded values?)
|
||||
preCheck = drv.preCheck or "" + ''
|
||||
PGUSER=esqutest
|
||||
@@ -1267,6 +1271,8 @@ self: super: {
|
||||
sed -i test/PgInit.hs \
|
||||
-e s^'host=" <> host <> "'^^
|
||||
'';
|
||||
# https://github.com/NixOS/nixpkgs/issues/198495
|
||||
doCheck = pkgs.postgresql.doCheck;
|
||||
preCheck = drv.preCheck or "" + ''
|
||||
PGDATABASE=test
|
||||
PGUSER=test
|
||||
@@ -1471,6 +1477,8 @@ self: super: {
|
||||
testToolDepends = drv.testToolDepends or [] ++ [
|
||||
pkgs.postgresql pkgs.postgresqlTestHook
|
||||
];
|
||||
# https://github.com/NixOS/nixpkgs/issues/198495
|
||||
doCheck = pkgs.postgresql.doCheck;
|
||||
preCheck = drv.preCheck or "" + ''
|
||||
# empty string means use default connection
|
||||
export DATABASE_URL=""
|
||||
@@ -1557,6 +1565,16 @@ self: super: {
|
||||
hlint = enableCabalFlag "ghc-lib" lself.hlint_3_4_1;
|
||||
ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4;
|
||||
ghc-lib-parser = lself.ghc-lib-parser_9_2_4_20220729;
|
||||
# For most ghc versions, we overrideScope Cabal in the configuration-ghc-???.nix,
|
||||
# because some packages, like ormolu, need a newer Cabal version.
|
||||
# ghc-paths is special because it depends on Cabal for building
|
||||
# its Setup.hs, and therefor declares a Cabal dependency, but does
|
||||
# not actually use it as a build dependency.
|
||||
# That means ghc-paths can just use the ghc included Cabal version,
|
||||
# without causing package-db incoherence and we should do that because
|
||||
# otherwise we have different versions of ghc-paths
|
||||
# around with have the same abi-hash, which can lead to confusions and conflicts.
|
||||
ghc-paths = lsuper.ghc-paths.override { Cabal = null; };
|
||||
});
|
||||
|
||||
hls-hlint-plugin = super.hls-hlint-plugin.overrideScope (lself: lsuper: {
|
||||
@@ -1593,6 +1611,11 @@ self: super: {
|
||||
# 2022-09-19: https://github.com/haskell/haskell-language-server/issues/3200
|
||||
hls-refactor-plugin = dontCheck super.hls-refactor-plugin;
|
||||
|
||||
# 2022-10-27: implicit-hie 0.1.3.0 needs a newer version of Cabal-syntax.
|
||||
implicit-hie = super.implicit-hie.override {
|
||||
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
|
||||
};
|
||||
|
||||
# 2021-03-21: Test hangs
|
||||
# https://github.com/haskell/haskell-language-server/issues/1562
|
||||
# 2021-11-13: Too strict upper bound on implicit-hie-cradle
|
||||
@@ -1901,9 +1924,6 @@ self: super: {
|
||||
# 2021-04-02: Outdated optparse-applicative bound is fixed but not realeased on upstream.
|
||||
trial-optparse-applicative = assert super.trial-optparse-applicative.version == "0.0.0.0"; doJailbreak super.trial-optparse-applicative;
|
||||
|
||||
# 2021-04-02: Outdated optparse-applicative bound is fixed but not realeased on upstream.
|
||||
extensions = assert super.extensions.version == "0.0.0.1"; doJailbreak super.extensions;
|
||||
|
||||
# 2021-04-02: iCalendar is basically unmaintained.
|
||||
# There are PRs for bumping the bounds: https://github.com/chrra/iCalendar/pull/46
|
||||
iCalendar = overrideCabal {
|
||||
@@ -2417,7 +2437,7 @@ self: super: {
|
||||
csv = overrideCabal (drv: { preCompileBuildDriver = "rm Setup.hs"; }) super.csv;
|
||||
|
||||
cabal-fmt = doJailbreak (super.cabal-fmt.override {
|
||||
# Needs newer Cabal-syntex version.
|
||||
# Needs newer Cabal-syntax version.
|
||||
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
|
||||
});
|
||||
|
||||
@@ -2539,6 +2559,12 @@ self: super: {
|
||||
testTarget = "regex-tdfa-unittest";
|
||||
} super.regex-tdfa;
|
||||
|
||||
# Missing test files https://github.com/qrilka/xlsx/issues/165
|
||||
xlsx = dontCheck super.xlsx;
|
||||
|
||||
# Missing test files https://github.com/kephas/xdg-basedir-compliant/issues/1
|
||||
xdg-basedir-compliant = dontCheck super.xdg-basedir-compliant;
|
||||
|
||||
# 2022-09-01:
|
||||
# Restrictive upper bound on base.
|
||||
# Remove once version 1.* is released
|
||||
@@ -2578,7 +2604,7 @@ in {
|
||||
purescript =
|
||||
lib.pipe
|
||||
(super.purescript.overrideScope purescriptOverlay)
|
||||
[
|
||||
([
|
||||
# PureScript uses nodejs to run tests, so the tests have been disabled
|
||||
# for now. If someone is interested in figuring out how to get this
|
||||
# working, it seems like it might be possible.
|
||||
@@ -2589,7 +2615,10 @@ in {
|
||||
doJailbreak
|
||||
# Generate shell completions
|
||||
(self.generateOptparseApplicativeCompletions [ "purs" ])
|
||||
];
|
||||
] ++ lib.optionals (lib.versions.majorMinor self.ghc.version == "9.2") [
|
||||
markUnbroken
|
||||
doDistribute
|
||||
]);
|
||||
|
||||
purescript-cst = purescriptStOverride super.purescript-cst;
|
||||
|
||||
|
||||
@@ -52,12 +52,12 @@ self: super: {
|
||||
cabal-install = super.cabal-install.overrideScope (self: super: {
|
||||
Cabal = self.Cabal_3_8_1_0;
|
||||
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
|
||||
process = self.process_1_6_15_0;
|
||||
process = self.process_1_6_16_0;
|
||||
});
|
||||
cabal-install-solver = super.cabal-install-solver.overrideScope (self: super: {
|
||||
Cabal = self.Cabal_3_8_1_0;
|
||||
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
|
||||
process = self.process_1_6_15_0;
|
||||
process = self.process_1_6_16_0;
|
||||
});
|
||||
|
||||
# Pick right versions for GHC-specific packages
|
||||
|
||||
@@ -58,12 +58,12 @@ self: super: {
|
||||
cabal-install = super.cabal-install.overrideScope (self: super: {
|
||||
Cabal = self.Cabal_3_8_1_0;
|
||||
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
|
||||
process = self.process_1_6_15_0;
|
||||
process = self.process_1_6_16_0;
|
||||
});
|
||||
cabal-install-solver = super.cabal-install-solver.overrideScope (self: super: {
|
||||
Cabal = self.Cabal_3_8_1_0;
|
||||
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
|
||||
process = self.process_1_6_15_0;
|
||||
process = self.process_1_6_16_0;
|
||||
});
|
||||
|
||||
# Ignore overly restrictive upper version bounds.
|
||||
|
||||
@@ -53,12 +53,12 @@ self: super: {
|
||||
cabal-install = super.cabal-install.overrideScope (self: super: {
|
||||
Cabal = self.Cabal_3_8_1_0;
|
||||
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
|
||||
process = self.process_1_6_15_0;
|
||||
process = self.process_1_6_16_0;
|
||||
});
|
||||
cabal-install-solver = super.cabal-install-solver.overrideScope (self: super: {
|
||||
Cabal = self.Cabal_3_8_1_0;
|
||||
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
|
||||
process = self.process_1_6_15_0;
|
||||
process = self.process_1_6_16_0;
|
||||
});
|
||||
|
||||
# Jailbreaks & Version Updates
|
||||
|
||||
@@ -59,12 +59,12 @@ self: super: {
|
||||
cabal-install = super.cabal-install.overrideScope (self: super: {
|
||||
Cabal = self.Cabal_3_8_1_0;
|
||||
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
|
||||
process = self.process_1_6_15_0;
|
||||
process = self.process_1_6_16_0;
|
||||
});
|
||||
cabal-install-solver = super.cabal-install-solver.overrideScope (self: super: {
|
||||
Cabal = self.Cabal_3_8_1_0;
|
||||
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
|
||||
process = self.process_1_6_15_0;
|
||||
process = self.process_1_6_16_0;
|
||||
});
|
||||
|
||||
doctest = dontCheck (doJailbreak super.doctest);
|
||||
@@ -87,7 +87,7 @@ self: super: {
|
||||
constraints = doJailbreak super.constraints;
|
||||
cpphs = overrideCabal (drv: { postPatch = "sed -i -e 's,time >=1.5 && <1.11,time >=1.5 \\&\\& <1.12,' cpphs.cabal";}) super.cpphs;
|
||||
data-fix = doJailbreak super.data-fix;
|
||||
dbus = self.dbus_1_2_26;
|
||||
dbus = self.dbus_1_2_27;
|
||||
dec = doJailbreak super.dec;
|
||||
ed25519 = doJailbreak super.ed25519;
|
||||
ghc-byteorder = doJailbreak super.ghc-byteorder;
|
||||
@@ -132,6 +132,11 @@ self: super: {
|
||||
servant = doJailbreak super.servant;
|
||||
servant-swagger = doJailbreak super.servant-swagger;
|
||||
|
||||
# Depends on utf8-light which isn't maintained / doesn't support base >= 4.16
|
||||
# https://github.com/haskell-infra/hackage-trustees/issues/347
|
||||
# https://mail.haskell.org/pipermail/haskell-cafe/2022-October/135613.html
|
||||
language-javascript_0_7_0_0 = dontCheck super.language-javascript_0_7_0_0;
|
||||
|
||||
# 2022-09-02: Too strict bounds on lens
|
||||
# https://github.com/haskell-servant/servant/pull/1607/files
|
||||
servant-docs = doJailbreak super.servant-docs;
|
||||
|
||||
@@ -10,7 +10,6 @@ in
|
||||
|
||||
with haskellLib;
|
||||
self: super: let
|
||||
doctest_0_20_broken = p: checkAgainAfter self.doctest "0.20.0" "doctest broken on 9.4" (dontCheck p);
|
||||
jailbreakForCurrentVersion = p: v: checkAgainAfter p v "bad bounds" (doJailbreak p);
|
||||
in {
|
||||
llvmPackages = lib.dontRecurseIntoAttrs self.ghc.llvmPackages;
|
||||
@@ -62,41 +61,15 @@ in {
|
||||
# 0.30 introduced support for GHC 9.2.
|
||||
cryptonite = doDistribute self.cryptonite_0_30;
|
||||
|
||||
# Too strict bound on base
|
||||
# https://github.com/haskell/cabal/issues/8509
|
||||
# Requested versions of Cabal, Cabal-syntax and process match GHC 9.4's for now
|
||||
cabal-install = doJailbreak super.cabal-install;
|
||||
cabal-install-solver = doJailbreak super.cabal-install-solver;
|
||||
|
||||
# Test failure due to new Cabal 3.8 version. Since the failure only pertains
|
||||
# to a change in how Cabal internally represents some platforms and we depend
|
||||
# on the type of representation anywhere, this failure is harmless. Can be
|
||||
# removed after https://github.com/NixOS/cabal2nix/pull/571 is merged.
|
||||
# TODO(@sternenseemann): merge and release a fixed version
|
||||
distribution-nixpkgs = dontCheck super.distribution-nixpkgs;
|
||||
cabal2nix =
|
||||
# cabal2nix depends on foundation, which is broken on aarch64-linux.
|
||||
# https://github.com/haskell-foundation/foundation/issues/571
|
||||
overrideCabal
|
||||
(drv: { badPlatforms = [ "aarch64-linux" ]; })
|
||||
(dontCheck super.cabal2nix);
|
||||
cabal2nix-unstable = dontCheck super.cabal2nix-unstable;
|
||||
super.cabal2nix;
|
||||
|
||||
# build fails on due to ghc api changes
|
||||
# unfinished PR that doesn't yet compile:
|
||||
# https://github.com/sol/doctest/pull/375
|
||||
doctest = markBroken super.doctest_0_20_0;
|
||||
doctest = self.doctest_0_20_1;
|
||||
# consequences of doctest breakage follow:
|
||||
http-types = doctest_0_20_broken super.http-types;
|
||||
iproute = doctest_0_20_broken super.iproute;
|
||||
foldl = doctest_0_20_broken super.foldl;
|
||||
prettyprinter-ansi-terminal = doctest_0_20_broken super.prettyprinter-ansi-terminal;
|
||||
pretty-simple = doctest_0_20_broken super.pretty-simple;
|
||||
http-date = doctest_0_20_broken super.http-date;
|
||||
network-byte-order = doctest_0_20_broken super.network-byte-order;
|
||||
co-log-core = doctest_0_20_broken (doJailbreak super.co-log-core);
|
||||
xml-conduit = doctest_0_20_broken (dontCheck super.xml-conduit);
|
||||
validation-selective = doctest_0_20_broken (dontCheck super.validation-selective);
|
||||
|
||||
double-conversion = markBroken super.double-conversion;
|
||||
blaze-textual = checkAgainAfter super.double-conversion "2.0.4.1" "double-conversion fails to build; required for testsuite" (dontCheck super.blaze-textual);
|
||||
@@ -105,6 +78,8 @@ in {
|
||||
lucid = jailbreakForCurrentVersion super.lucid "2.11.1";
|
||||
invariant = jailbreakForCurrentVersion super.invariant "0.5.6";
|
||||
implicit-hie-cradle = jailbreakForCurrentVersion super.implicit-hie-cradle "0.5.0.0";
|
||||
# https://github.com/co-log/co-log-core/pull/22#issuecomment-1294040208
|
||||
co-log-core = jailbreakForCurrentVersion super.co-log-core "0.3.1.0";
|
||||
|
||||
haskell-src-meta = doJailbreak super.haskell-src-meta;
|
||||
|
||||
@@ -114,7 +89,6 @@ in {
|
||||
# Jailbreaks & Version Updates
|
||||
|
||||
aeson = self.aeson_2_1_1_0;
|
||||
aeson-diff = doctest_0_20_broken (dontCheck super.aeson-diff);
|
||||
lens-aeson = self.lens-aeson_1_2_2;
|
||||
|
||||
assoc = doJailbreak super.assoc;
|
||||
@@ -153,7 +127,7 @@ in {
|
||||
|
||||
# 2022-09-02: Too strict bounds on lens
|
||||
# https://github.com/GetShopTV/swagger2/pull/242
|
||||
swagger2 = doctest_0_20_broken (dontCheck (doJailbreak super.swagger2));
|
||||
swagger2 = doJailbreak super.swagger2;
|
||||
|
||||
base-orphans = dontCheck super.base-orphans;
|
||||
|
||||
|
||||
@@ -264,6 +264,7 @@ broken-packages:
|
||||
- avatar-generator
|
||||
- aviation-units
|
||||
- avl-static
|
||||
- avro
|
||||
- avro-piper
|
||||
- avr-shake
|
||||
- avwx
|
||||
@@ -745,6 +746,7 @@ broken-packages:
|
||||
- codo-notation
|
||||
- coin
|
||||
- coinbase-pro
|
||||
- cointracking-imports
|
||||
- collada-output
|
||||
- collapse-util
|
||||
- collections
|
||||
@@ -1149,6 +1151,7 @@ broken-packages:
|
||||
- djinn-th
|
||||
- dmcc
|
||||
- dmenu
|
||||
- dnf-repo
|
||||
- dns-patterns
|
||||
- dnsrbl
|
||||
- dnssd
|
||||
@@ -1257,6 +1260,7 @@ broken-packages:
|
||||
- edit
|
||||
- edit-lenses
|
||||
- editline
|
||||
- effectful-st
|
||||
- effect-handlers
|
||||
- effective-aspects
|
||||
- effect-monad
|
||||
@@ -1357,6 +1361,8 @@ broken-packages:
|
||||
- eventful-sql-common
|
||||
- eventsource-api
|
||||
- eventstore
|
||||
- eventuo11y
|
||||
- eventuo11y-dsl
|
||||
- evoke
|
||||
- ewe
|
||||
- exact-cover
|
||||
@@ -1391,7 +1397,6 @@ broken-packages:
|
||||
- extended-containers
|
||||
- extensible-effects-concurrent
|
||||
- extensible-skeleton
|
||||
- extensions
|
||||
- Extra
|
||||
- extractelf
|
||||
- ez3
|
||||
@@ -2351,6 +2356,7 @@ broken-packages:
|
||||
- hquantlib
|
||||
- hquery
|
||||
- hR
|
||||
- h-raylib
|
||||
- hreq-core
|
||||
- h-reversi
|
||||
- hricket
|
||||
@@ -3340,6 +3346,7 @@ broken-packages:
|
||||
- monoid-owns
|
||||
- monoidplus
|
||||
- monoids
|
||||
- monomer-hagrid
|
||||
- monopati
|
||||
- monus
|
||||
- monzo
|
||||
@@ -3591,6 +3598,7 @@ broken-packages:
|
||||
- Omega
|
||||
- om-elm
|
||||
- om-fail
|
||||
- om-fork
|
||||
- om-http
|
||||
- om-http-logging
|
||||
- omnifmt
|
||||
@@ -4107,6 +4115,7 @@ broken-packages:
|
||||
- Pup-Events-Server
|
||||
- pure-io
|
||||
- pure-priority-queue
|
||||
- purescript
|
||||
- purescript-tsd-gen
|
||||
- pure-zlib
|
||||
- pushbullet
|
||||
@@ -5007,7 +5016,6 @@ broken-packages:
|
||||
- Tablify
|
||||
- tabloid
|
||||
- tabs
|
||||
- taffybar
|
||||
- tag-bits
|
||||
- tagged-exception-core
|
||||
- tagged-timers
|
||||
@@ -5365,6 +5373,9 @@ broken-packages:
|
||||
- unescaping-print
|
||||
- unfix-binders
|
||||
- unfoldable
|
||||
- unicode-data-names
|
||||
- unicode-data-scripts
|
||||
- unicode-data-security
|
||||
- unicode-prelude
|
||||
- unicode-symbols
|
||||
- unicode-tricks
|
||||
@@ -5676,6 +5687,7 @@ broken-packages:
|
||||
- xleb
|
||||
- xls
|
||||
- xlsior
|
||||
- xlsx-tabular
|
||||
- xlsx-templater
|
||||
- xml2json
|
||||
- xml-conduit-decode
|
||||
|
||||
@@ -416,6 +416,7 @@ package-maintainers:
|
||||
- rel8
|
||||
- regex-rure
|
||||
- jacinda
|
||||
- citeproc
|
||||
# owothia
|
||||
- irc-client
|
||||
- chatter
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
# Stackage LTS 19.28
|
||||
# Stackage LTS 19.30
|
||||
# This file is auto-generated by
|
||||
# maintainers/scripts/haskell/update-stackage.sh
|
||||
default-package-overrides:
|
||||
@@ -706,7 +706,7 @@ default-package-overrides:
|
||||
- executable-path ==0.0.3.1
|
||||
- exit-codes ==1.0.0
|
||||
- exomizer ==1.0.0
|
||||
- experimenter ==0.1.0.12
|
||||
- experimenter ==0.1.0.14
|
||||
- expiring-cache-map ==0.0.6.1
|
||||
- explainable-predicates ==0.1.2.3
|
||||
- explicit-exception ==0.1.10
|
||||
@@ -725,7 +725,7 @@ default-package-overrides:
|
||||
- fakedata-quickcheck ==0.2.0
|
||||
- fakefs ==0.3.0.2
|
||||
- fakepull ==0.3.0.2
|
||||
- faktory ==1.1.2.3
|
||||
- faktory ==1.1.2.4
|
||||
- fast-builder ==0.1.3.0
|
||||
- fast-logger ==3.1.1
|
||||
- fast-math ==1.0.2
|
||||
@@ -887,33 +887,33 @@ default-package-overrides:
|
||||
- ghc-syntax-highlighter ==0.0.7.0
|
||||
- ghc-tcplugins-extra ==0.4.3
|
||||
- ghc-trace-events ==0.1.2.6
|
||||
- ghc-typelits-extra ==0.4.3
|
||||
- ghc-typelits-knownnat ==0.7.6
|
||||
- ghc-typelits-natnormalise ==0.7.6
|
||||
- ghc-typelits-extra ==0.4.4
|
||||
- ghc-typelits-knownnat ==0.7.7
|
||||
- ghc-typelits-natnormalise ==0.7.7
|
||||
- ghc-typelits-presburger ==0.6.2.0
|
||||
- ghost-buster ==0.1.1.0
|
||||
- gi-atk ==2.0.24
|
||||
- gi-cairo ==1.0.26
|
||||
- gi-atk ==2.0.25
|
||||
- gi-cairo ==1.0.27
|
||||
- gi-cairo-connector ==0.1.1
|
||||
- gi-cairo-render ==0.1.1
|
||||
- gi-dbusmenu ==0.4.10
|
||||
- gi-dbusmenugtk3 ==0.4.11
|
||||
- gi-freetype2 ==2.0.1
|
||||
- gi-gdk ==3.0.25
|
||||
- gi-gdkpixbuf ==2.0.28
|
||||
- gi-gdkx11 ==3.0.12
|
||||
- gi-gio ==2.0.29
|
||||
- gi-glib ==2.0.26
|
||||
- gi-gmodule ==2.0.2
|
||||
- gi-gobject ==2.0.27
|
||||
- gi-graphene ==1.0.4
|
||||
- gi-gtk ==3.0.38
|
||||
- gi-gtk-hs ==0.3.12
|
||||
- gi-gtksource ==3.0.25
|
||||
- gi-harfbuzz ==0.0.6
|
||||
- gi-javascriptcore ==4.0.24
|
||||
- gi-cairo-render ==0.1.2
|
||||
- gi-dbusmenu ==0.4.11
|
||||
- gi-dbusmenugtk3 ==0.4.12
|
||||
- gi-freetype2 ==2.0.2
|
||||
- gi-gdk ==3.0.26
|
||||
- gi-gdkpixbuf ==2.0.29
|
||||
- gi-gdkx11 ==3.0.13
|
||||
- gi-gio ==2.0.30
|
||||
- gi-glib ==2.0.27
|
||||
- gi-gmodule ==2.0.3
|
||||
- gi-gobject ==2.0.28
|
||||
- gi-graphene ==1.0.5
|
||||
- gi-gtk ==3.0.39
|
||||
- gi-gtk-hs ==0.3.13
|
||||
- gi-gtksource ==3.0.26
|
||||
- gi-harfbuzz ==0.0.7
|
||||
- gi-javascriptcore ==4.0.25
|
||||
- ginger ==0.10.4.0
|
||||
- gi-pango ==1.0.26
|
||||
- gi-pango ==1.0.27
|
||||
- githash ==0.1.6.2
|
||||
- github ==0.27
|
||||
- github-release ==2.0.0.2
|
||||
@@ -921,10 +921,10 @@ default-package-overrides:
|
||||
- github-types ==0.2.1
|
||||
- github-webhooks ==0.15.0
|
||||
- gitrev ==1.3.1
|
||||
- gi-vte ==2.91.29
|
||||
- gi-xlib ==2.0.11
|
||||
- gi-vte ==2.91.30
|
||||
- gi-xlib ==2.0.12
|
||||
- gl ==0.9
|
||||
- glabrous ==2.0.5
|
||||
- glabrous ==2.0.6
|
||||
- glasso ==0.1.0
|
||||
- GLFW-b ==3.3.0.0
|
||||
- Glob ==0.10.2
|
||||
@@ -993,7 +993,7 @@ default-package-overrides:
|
||||
- haskeline ==0.8.2
|
||||
- haskell-awk ==1.2.0.1
|
||||
- haskell-gi ==0.26.1
|
||||
- haskell-gi-base ==0.26.1
|
||||
- haskell-gi-base ==0.26.2
|
||||
- haskell-gi-overloading ==1.0
|
||||
- haskell-lexer ==1.1
|
||||
- haskell-lsp-types ==0.24.0.0
|
||||
@@ -1016,7 +1016,7 @@ default-package-overrides:
|
||||
- has-transformers ==0.1.0.4
|
||||
- hasty-hamiltonian ==1.3.4
|
||||
- HaTeX ==3.22.3.1
|
||||
- HaXml ==1.25.11
|
||||
- HaXml ==1.25.12
|
||||
- haxr ==3000.11.4.1
|
||||
- HCodecs ==0.5.2
|
||||
- hdaemonize ==0.5.6
|
||||
@@ -1385,7 +1385,7 @@ default-package-overrides:
|
||||
- lazysmallcheck ==0.6
|
||||
- lca ==0.4
|
||||
- leancheck ==0.9.12
|
||||
- leancheck-instances ==0.0.4
|
||||
- leancheck-instances ==0.0.5
|
||||
- leapseconds-announced ==2017.1.0.1
|
||||
- learn-physics ==0.6.5
|
||||
- lens ==5.0.1
|
||||
@@ -1548,7 +1548,7 @@ default-package-overrides:
|
||||
- mock-time ==0.1.0
|
||||
- mod ==0.1.2.2
|
||||
- model ==0.5
|
||||
- modern-uri ==0.3.4.4
|
||||
- modern-uri ==0.3.5.0
|
||||
- modular ==0.1.0.8
|
||||
- monad-chronicle ==1.0.1
|
||||
- monad-control ==1.0.3.1
|
||||
@@ -1579,7 +1579,7 @@ default-package-overrides:
|
||||
- monads-tf ==0.1.0.3
|
||||
- monad-time ==0.3.1.0
|
||||
- mongoDB ==2.7.1.1
|
||||
- monoidal-containers ==0.6.2.0
|
||||
- monoidal-containers ==0.6.3.0
|
||||
- monoid-extras ==0.6.1
|
||||
- monoid-subclasses ==1.1.3
|
||||
- monoid-transformer ==0.0.4
|
||||
@@ -1651,8 +1651,8 @@ default-package-overrides:
|
||||
- network-simple-tls ==0.4
|
||||
- network-transport ==0.5.4
|
||||
- network-transport-composed ==0.2.1
|
||||
- network-transport-tcp ==0.8.0
|
||||
- network-transport-tests ==0.3.0
|
||||
- network-transport-tcp ==0.8.1
|
||||
- network-transport-tests ==0.3.1
|
||||
- network-uri ==2.6.4.1
|
||||
- network-wait ==0.1.2.0
|
||||
- newtype ==0.2.2.0
|
||||
@@ -1766,7 +1766,7 @@ default-package-overrides:
|
||||
- partial-isomorphisms ==0.2.3.0
|
||||
- partial-order ==0.2.0.0
|
||||
- partial-semigroup ==0.5.1.14
|
||||
- password ==3.0.1.0
|
||||
- password ==3.0.2.0
|
||||
- password-instances ==3.0.0.0
|
||||
- password-types ==1.0.0.0
|
||||
- pasta-curves ==0.0.1.0
|
||||
@@ -1786,7 +1786,7 @@ default-package-overrides:
|
||||
- pava ==0.1.1.4
|
||||
- pcg-random ==0.1.3.7
|
||||
- pcre2 ==2.1.1.1
|
||||
- pcre-heavy ==1.0.0.2
|
||||
- pcre-heavy ==1.0.0.3
|
||||
- pcre-light ==0.4.1.0
|
||||
- pcre-utils ==0.1.8.2
|
||||
- pdc ==0.1.1
|
||||
@@ -1822,7 +1822,7 @@ default-package-overrides:
|
||||
- phatsort ==0.5.0.1
|
||||
- picosat ==0.1.6
|
||||
- pid1 ==0.1.3.0
|
||||
- pinch ==0.4.1.2
|
||||
- pinch ==0.4.2.0
|
||||
- pipes ==4.3.16
|
||||
- pipes-attoparsec ==0.5.1.5
|
||||
- pipes-bytestring ==2.1.7
|
||||
@@ -1862,7 +1862,7 @@ default-package-overrides:
|
||||
- polysemy-plugin ==0.4.1.1
|
||||
- polysemy-several ==0.1.1.0
|
||||
- polysemy-socket ==0.0.2.0
|
||||
- polysemy-uncontrolled ==0.1.1.0
|
||||
- polysemy-uncontrolled ==0.1.1.1
|
||||
- polysemy-video ==0.2.0.1
|
||||
- polysemy-vinyl ==0.1.5.0
|
||||
- polysemy-webserver ==0.2.1.1
|
||||
@@ -2379,7 +2379,7 @@ default-package-overrides:
|
||||
- svg-builder ==0.1.1
|
||||
- SVGFonts ==1.8.0.1
|
||||
- svg-tree ==0.6.2.4
|
||||
- swagger2 ==2.8.4
|
||||
- swagger2 ==2.8.5
|
||||
- swish ==0.10.2.0
|
||||
- syb ==0.7.2.2
|
||||
- sydtest-discover ==0.0.0.2
|
||||
@@ -2595,7 +2595,7 @@ default-package-overrides:
|
||||
- type-spec ==0.4.0.0
|
||||
- typography-geometry ==1.0.1.0
|
||||
- tz ==0.1.3.6
|
||||
- tzdata ==0.2.20220923.0
|
||||
- tzdata ==0.2.20221011.0
|
||||
- ua-parser ==0.7.7.0
|
||||
- uglymemo ==0.1.0.1
|
||||
- unagi-chan ==0.4.1.4
|
||||
@@ -2614,7 +2614,6 @@ default-package-overrides:
|
||||
- unicode-transforms ==0.4.0.1
|
||||
- unidecode ==0.1.0.4
|
||||
- unification-fd ==0.11.2
|
||||
- union ==0.1.2
|
||||
- union-angle ==0.1.0.1
|
||||
- union-find ==0.2
|
||||
- unipatterns ==0.0.0.0
|
||||
@@ -2696,7 +2695,7 @@ default-package-overrides:
|
||||
- vector-th-unbox ==0.2.2
|
||||
- vectortiles ==1.5.1
|
||||
- verbosity ==0.4.0.0
|
||||
- versions ==5.0.3
|
||||
- versions ==5.0.4
|
||||
- vformat ==0.14.1.0
|
||||
- vformat-time ==0.1.0.0
|
||||
- ViennaRNAParser ==1.3.3
|
||||
|
||||
@@ -234,6 +234,7 @@ dont-distribute-packages:
|
||||
- KiCS-debugger
|
||||
- KiCS-prophecy
|
||||
- LDAPv3
|
||||
- LPPaver
|
||||
- LambdaHack
|
||||
- LambdaINet
|
||||
- LambdaPrettyQuote
|
||||
@@ -811,6 +812,7 @@ dont-distribute-packages:
|
||||
- blubber
|
||||
- bluetile
|
||||
- blunt
|
||||
- bnb-staking-csvs
|
||||
- bno055-haskell
|
||||
- bogre-banana
|
||||
- boilerplate
|
||||
@@ -922,6 +924,7 @@ dont-distribute-packages:
|
||||
- cheapskate-terminal
|
||||
- check-pvp
|
||||
- chevalier-common
|
||||
- chiasma-test
|
||||
- chitauri
|
||||
- choose-exe
|
||||
- chorale-geo
|
||||
@@ -1346,6 +1349,8 @@ dont-distribute-packages:
|
||||
- eventsource-geteventstore-store
|
||||
- eventsource-store-specs
|
||||
- eventsource-stub-store
|
||||
- eventuo11y-batteries
|
||||
- eventuo11y-json
|
||||
- every-bit-counts
|
||||
- exception-monads-fd
|
||||
- exference
|
||||
@@ -1555,7 +1560,7 @@ dont-distribute-packages:
|
||||
- gi-ges
|
||||
- gi-gsk
|
||||
- gi-gstpbutils
|
||||
- gi-gtk_4_0_5
|
||||
- gi-gtk_4_0_6
|
||||
- gipeda
|
||||
- git-config
|
||||
- git-fmt
|
||||
@@ -2134,6 +2139,7 @@ dont-distribute-packages:
|
||||
- hpaste
|
||||
- hpc-tracer
|
||||
- hplayground
|
||||
- hpqtypes-effectful
|
||||
- hpqtypes-extras
|
||||
- hprotoc-fork
|
||||
- hps
|
||||
@@ -2173,6 +2179,7 @@ dont-distribute-packages:
|
||||
- hsfacter
|
||||
- hsinspect-lsp
|
||||
- hslogstash
|
||||
- hslua-module-zip
|
||||
- hsnsq
|
||||
- hspec-expectations-pretty
|
||||
- hspec-pg-transact
|
||||
@@ -2224,6 +2231,7 @@ dont-distribute-packages:
|
||||
- huzzy
|
||||
- hw-all
|
||||
- hw-aws-sqs-conduit
|
||||
- hw-kafka-avro
|
||||
- hw-uri
|
||||
- hworker-ses
|
||||
- hwormhole
|
||||
@@ -2278,7 +2286,6 @@ dont-distribute-packages:
|
||||
- indentation-parsec
|
||||
- indentation-trifecta
|
||||
- indexation
|
||||
- indieweb-algorithms
|
||||
- indigo
|
||||
- infernu
|
||||
- infinity
|
||||
@@ -2446,6 +2453,7 @@ dont-distribute-packages:
|
||||
- lambdiff
|
||||
- lang
|
||||
- language-Modula2
|
||||
- language-avro
|
||||
- language-boogie
|
||||
- language-ecmascript-analysis
|
||||
- language-eiffel
|
||||
@@ -2653,7 +2661,6 @@ dont-distribute-packages:
|
||||
- metar-http
|
||||
- metronome
|
||||
- micro-gateway
|
||||
- microformats2-parser
|
||||
- microformats2-types
|
||||
- midimory
|
||||
- mighttpd
|
||||
@@ -2715,6 +2722,8 @@ dont-distribute-packages:
|
||||
- morpheus-graphql-cli
|
||||
- morpheus-graphql-client
|
||||
- morpheus-graphql-code-gen
|
||||
- morpheus-graphql-code-gen-utils
|
||||
- morpheus-graphql-server
|
||||
- morpheus-graphql-subscriptions
|
||||
- morphisms-functors-inventory
|
||||
- mortred
|
||||
@@ -2994,6 +3003,7 @@ dont-distribute-packages:
|
||||
- pisigma
|
||||
- pitchtrack
|
||||
- pkgtreediff
|
||||
- pkgtreediff_0_6_0
|
||||
- planet-mitchell
|
||||
- playlists-http
|
||||
- plocketed
|
||||
@@ -3272,6 +3282,7 @@ dont-distribute-packages:
|
||||
- ribosome-host
|
||||
- ribosome-host-test
|
||||
- ribosome-root
|
||||
- ribosome-test
|
||||
- ridley-extras
|
||||
- rio-process-pool
|
||||
- riot
|
||||
@@ -3473,7 +3484,7 @@ dont-distribute-packages:
|
||||
- skeletons
|
||||
- sketch-frp-copilot
|
||||
- skylark-client
|
||||
- skylighting_0_13
|
||||
- skylighting_0_13_1
|
||||
- slate
|
||||
- slidemews
|
||||
- slip32
|
||||
@@ -3528,6 +3539,7 @@ dont-distribute-packages:
|
||||
- sock2stream
|
||||
- socket-io
|
||||
- sockets
|
||||
- solana-staking-csvs
|
||||
- solga-swagger
|
||||
- solr
|
||||
- souffle-dsl
|
||||
|
||||
@@ -27,6 +27,10 @@
|
||||
# If you have an override of this kind, see configuration-common.nix instead.
|
||||
{ pkgs, haskellLib }:
|
||||
|
||||
let
|
||||
inherit (pkgs) lib;
|
||||
in
|
||||
|
||||
with haskellLib;
|
||||
|
||||
# All of the overrides in this set should look like:
|
||||
@@ -788,6 +792,16 @@ self: super: builtins.intersectAttrs super {
|
||||
# Tests access internet
|
||||
prune-juice = dontCheck super.prune-juice;
|
||||
|
||||
citeproc = lib.pipe super.citeproc [
|
||||
enableSeparateBinOutput
|
||||
# Enable executable being built and add missing dependencies
|
||||
(enableCabalFlag "executable")
|
||||
(addBuildDepends [ self.aeson-pretty ])
|
||||
# TODO(@sternenseemann): we may want to enable that for improved performance
|
||||
# Is correctness good enough since 0.5?
|
||||
(disableCabalFlag "icu")
|
||||
];
|
||||
|
||||
# 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
|
||||
@@ -887,7 +901,11 @@ self: super: builtins.intersectAttrs super {
|
||||
'';
|
||||
}) super.nvfetcher);
|
||||
|
||||
rel8 = addTestToolDepend pkgs.postgresql super.rel8;
|
||||
rel8 = pkgs.lib.pipe super.rel8 [
|
||||
(addTestToolDepend pkgs.postgresql)
|
||||
# https://github.com/NixOS/nixpkgs/issues/198495
|
||||
(overrideCabal { doCheck = pkgs.postgresql.doCheck; })
|
||||
];
|
||||
|
||||
cachix = self.generateOptparseApplicativeCompletions [ "cachix" ] (super.cachix.override { nix = pkgs.nixVersions.nix_2_9; });
|
||||
|
||||
@@ -1054,7 +1072,7 @@ self: super: builtins.intersectAttrs super {
|
||||
# Make sure that Cabal 3.8.* can be built as-is
|
||||
Cabal_3_8_1_0 = doDistribute (super.Cabal_3_8_1_0.override {
|
||||
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
|
||||
process = self.process_1_6_15_0;
|
||||
process = self.process_1_6_16_0;
|
||||
});
|
||||
|
||||
# cabal-install switched to build type simple in 3.2.0.0
|
||||
|
||||
+1609
-927
File diff suppressed because it is too large
Load Diff
@@ -32012,10 +32012,8 @@ with pkgs;
|
||||
# customConfig = builtins.readFile ./tabbed.config.h;
|
||||
};
|
||||
|
||||
# Use GHC 9.0 when this asserts starts to fire
|
||||
taffybar = assert haskellPackages.taffybar.version == "3.3.0";
|
||||
callPackage ../applications/window-managers/taffybar {
|
||||
inherit (haskell.packages.ghc810) ghcWithPackages taffybar;
|
||||
taffybar = callPackage ../applications/window-managers/taffybar {
|
||||
inherit (haskellPackages) ghcWithPackages taffybar;
|
||||
};
|
||||
|
||||
tagainijisho = libsForQt5.callPackage ../applications/office/tagainijisho {};
|
||||
|
||||
@@ -394,6 +394,9 @@ let
|
||||
compilerNames.ghc902
|
||||
compilerNames.ghc924
|
||||
];
|
||||
purescript = [
|
||||
compilerNames.ghc924
|
||||
];
|
||||
purescript-cst = [
|
||||
compilerNames.ghc8107
|
||||
];
|
||||
|
||||
Reference in New Issue
Block a user