Merge pull request #226832 from NixOS/haskell-updates

haskellPackages: update stackage and hackage
This commit is contained in:
maralorn 2023-04-20 17:28:51 +02:00 committed by GitHub
commit 90c98c4c72
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 568 additions and 841 deletions

View file

@ -1,6 +1,6 @@
{
"commit": "88252bfad2741817b521acc02a424b878264bf9f",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/88252bfad2741817b521acc02a424b878264bf9f.tar.gz",
"sha256": "00nc417r9xrknhmyjh3rfxlsbchizxicnbp98q63yb5czdapg4bm",
"msg": "Update from Hackage at 2023-04-13T09:45:26Z"
"commit": "67ecaa60725908a5bc562294a2c0e03e30858aa7",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/67ecaa60725908a5bc562294a2c0e03e30858aa7.tar.gz",
"sha256": "0yf0dliq65j5achg3iqz0hkf25jjkgxarsdsr5vl2r5h41n39qg3",
"msg": "Update from Hackage at 2023-04-18T09:14:41Z"
}

View file

@ -38,6 +38,11 @@ self: super: {
happy = dontCheck super.happy;
happy_1_19_12 = doDistribute (dontCheck super.happy_1_19_12);
# add arm specific library
wiringPi = overrideCabal ({librarySystemDepends ? [], ...}: {
librarySystemDepends = librarySystemDepends ++ [pkgs.wiringpi];
}) super.wiringPi;
} // lib.optionalAttrs pkgs.stdenv.hostPlatform.isAarch64 {
# AARCH64-SPECIFIC OVERRIDES

View file

@ -2489,7 +2489,7 @@ self: super: {
# 2022-11-15: Needs newer witch package and brick 1.3 which in turn works with text-zipper 0.12
# Other dependencies are resolved with doJailbreak for both swarm and brick_1_3
swarm = doJailbreak (super.swarm.override {
brick = doJailbreak (dontCheck super.brick_1_6);
brick = doJailbreak (dontCheck super.brick_1_7);
});
# Too strict upper bound on bytestring

View file

@ -62,8 +62,6 @@ in {
ghc-source-gen = checkAgainAfter super.ghc-source-gen "0.4.3.0" "fails to build" (markBroken super.ghc-source-gen);
lucid = jailbreakForCurrentVersion super.lucid "2.11.1";
haskell-src-meta = doJailbreak super.haskell-src-meta;
# Tests fail in GHC 9.2
@ -211,7 +209,7 @@ in {
# https://github.com/tweag/ormolu/issues/941
fourmolu = overrideCabal (drv: {
libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ];
}) (disableCabalFlag "fixity-th" super.fourmolu_0_10_0_0);
}) (disableCabalFlag "fixity-th" super.fourmolu_0_10_1_0);
# Apply workaround for Cabal 3.8 bug https://github.com/haskell/cabal/issues/8455
# by making `pkg-config --static` happy. Note: Cabal 3.9 is also affected, so

View file

@ -4975,6 +4975,7 @@ broken-packages:
- softfloat-hs
- solar
- solga
- som # test failure in job https://hydra.nixos.org/build/216744749 at 2023-04-20
- Sonnex
- sorted
- sorting
@ -5254,6 +5255,7 @@ broken-packages:
- tasty-hedgehog-coverage
- tasty-json
- tasty-mgolden
- tasty-papi # test failure in job https://hydra.nixos.org/build/216756583 at 2023-04-20
- tasty-stats
- tasty-test-vector
- TastyTLT
@ -5701,6 +5703,7 @@ broken-packages:
- vector-fftw
- vector-functorlazy
- vector-heterogenous
- vector-quicksort # dependency missing in job https://hydra.nixos.org/build/216753081 at 2023-04-20
- vector-random
- vector-read-instances
- vector-space-map

View file

@ -134,7 +134,7 @@ extra-packages:
- retrie < 1.2.0.0 # 2022-12-30: required for hls on ghc < 9.2
- ghc-tags == 1.5.* # 2023-02-18: preserve for ghc-lib == 9.2.*
- primitive == 0.7.4.0 # 2023-03-04: primitive 0.8 is not compatible with too many packages on ghc 9.4 as of now
- fourmolu == 0.10.0.0 # 2023-04-03: for hls-fourmolu-plugin 1.1.1.0
- fourmolu == 0.10.1.0 # 2023-04-18: for hls-fourmolu-plugin 1.1.1.0
package-maintainers:
abbradar:

View file

@ -1,4 +1,4 @@
# Stackage LTS 20.17
# Stackage LTS 20.18
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -8,7 +8,7 @@ default-package-overrides:
- AC-Angle ==1.0
- acc ==0.2.0.1
- ace ==0.6
- acid-state ==0.16.1.1
- acid-state ==0.16.1.2
- action-permutations ==0.0.0.1
- active ==0.2.0.17
- ad ==4.5.4
@ -43,7 +43,7 @@ default-package-overrides:
- al ==0.1.4.2
- alarmclock ==0.7.0.6
- alerts ==0.1.2.0
- alex ==3.2.7.1
- alex ==3.2.7.2
- alex-meta ==0.3.0.13
- algebra ==4.3.1
- algebraic-graphs ==0.6.1
@ -446,8 +446,8 @@ default-package-overrides:
- convertible ==1.1.1.1
- cookie ==0.4.6
- copr-api ==0.1.0
- core-data ==0.3.9.0
- core-program ==0.6.5.0
- core-data ==0.3.9.1
- core-program ==0.6.5.1
- core-telemetry ==0.2.8.0
- core-text ==0.3.8.1
- countable ==1.2
@ -554,7 +554,7 @@ default-package-overrides:
- dawg-ord ==0.5.1.2
- dbcleaner ==0.1.3
- DBFunctor ==0.1.2.1
- dbus ==1.2.27
- dbus ==1.2.28
- dbus-hslogger ==0.1.0.1
- debian ==4.0.4
- debian-build ==0.10.2.1
@ -771,7 +771,7 @@ default-package-overrides:
- filecache ==0.4.1
- file-embed ==0.0.15.0
- file-embed-lzma ==0.0.1
- filelock ==0.1.1.5
- filelock ==0.1.1.6
- filemanip ==0.3.6.3
- file-modules ==0.1.2.4
- filepath-bytestring ==1.4.2.1.12
@ -1047,7 +1047,7 @@ default-package-overrides:
- hasql-dynamic-statements ==0.3.1.2
- hasql-implicits ==0.1.1
- hasql-migration ==0.3.0
- hasql-notifications ==0.2.0.3
- hasql-notifications ==0.2.0.4
- hasql-optparse-applicative ==0.5
- hasql-pool ==0.8.0.7
- hasql-queue ==1.2.0.2
@ -1301,7 +1301,7 @@ default-package-overrides:
- inbox ==0.2.0
- include-file ==0.1.0.4
- incremental ==0.3.1
- incremental-parser ==0.5.0.4
- incremental-parser ==0.5.0.5
- indents ==0.5.0.1
- indexed ==0.1.3
- indexed-containers ==0.1.0.2
@ -1398,7 +1398,7 @@ default-package-overrides:
- keep-alive ==0.2.1.0
- keycode ==0.2.2
- keys ==3.12.3
- ki ==1.0.0.2
- ki ==1.0.1.0
- kind-apply ==0.3.2.1
- kind-generics ==0.4.1.4
- kind-generics-th ==0.2.2.3
@ -1509,7 +1509,7 @@ default-package-overrides:
- lua ==2.2.1
- lua-arbitrary ==1.0.1.1
- lucid2 ==0.0.20221012
- lucid ==2.11.1
- lucid ==2.11.20230408
- lucid-cdn ==0.2.2.0
- lucid-extras ==0.2.2
- lukko ==0.1.1.3
@ -1576,7 +1576,7 @@ default-package-overrides:
- microlens-mtl ==0.2.0.3
- microlens-platform ==0.4.2.1
- microlens-process ==0.2.0.2
- microlens-th ==0.4.3.11
- microlens-th ==0.4.3.12
- microspec ==0.2.1.3
- microstache ==1.0.2.3
- midair ==0.2.0.1
@ -1652,15 +1652,15 @@ default-package-overrides:
- mono-traversable-instances ==0.1.1.0
- mono-traversable-keys ==0.2.0
- more-containers ==0.2.2.2
- morpheus-graphql ==0.27.0
- morpheus-graphql-app ==0.27.0
- morpheus-graphql-client ==0.27.0
- morpheus-graphql-code-gen ==0.27.0
- morpheus-graphql-code-gen-utils ==0.27.0
- morpheus-graphql-core ==0.27.0
- morpheus-graphql-server ==0.27.0
- morpheus-graphql-subscriptions ==0.27.0
- morpheus-graphql-tests ==0.27.0
- morpheus-graphql ==0.27.1
- morpheus-graphql-app ==0.27.1
- morpheus-graphql-client ==0.27.1
- morpheus-graphql-code-gen ==0.27.1
- morpheus-graphql-code-gen-utils ==0.27.1
- morpheus-graphql-core ==0.27.1
- morpheus-graphql-server ==0.27.1
- morpheus-graphql-subscriptions ==0.27.1
- morpheus-graphql-tests ==0.27.1
- moss ==0.2.0.1
- mountpoints ==1.0.2
- mpi-hs ==0.7.2.0
@ -1939,7 +1939,7 @@ default-package-overrides:
- polysemy-fs ==0.1.0.0
- polysemy-kvstore ==0.1.3.0
- polysemy-methodology ==0.2.2.0
- polysemy-plugin ==0.4.4.0
- polysemy-plugin ==0.4.5.0
- polysemy-several ==0.1.1.0
- polysemy-webserver ==0.2.1.1
- polysemy-zoo ==0.8.1.0
@ -2105,7 +2105,7 @@ default-package-overrides:
- reducers ==3.12.4
- refact ==0.3.0.2
- ref-fd ==0.5.0.1
- refined ==0.8
- refined ==0.8.1
- reflection ==2.1.7
- reform ==0.2.7.5
- reform-blaze ==0.2.4.4
@ -2203,7 +2203,7 @@ default-package-overrides:
- sample-frame-np ==0.0.5
- sampling ==0.3.5
- sandi ==0.5
- sandwich ==0.1.3.0
- sandwich ==0.1.3.1
- sandwich-hedgehog ==0.1.1.0
- sandwich-quickcheck ==0.1.0.6
- sandwich-slack ==0.1.1.0
@ -2413,7 +2413,7 @@ default-package-overrides:
- StateVar ==1.2.2
- stateWriter ==0.3.0
- static-text ==0.2.0.7
- statistics ==0.16.1.2
- statistics ==0.16.2.0
- status-notifier-item ==0.3.1.0
- stb-image-redux ==0.2.1.2
- step-function ==0.2.0.1
@ -2442,7 +2442,7 @@ default-package-overrides:
- streaming-attoparsec ==1.0.0.1
- streaming-bytestring ==0.2.4
- streaming-cassava ==0.2.0.0
- streaming-commons ==0.2.2.5
- streaming-commons ==0.2.2.6
- streaming-wai ==0.1.1
- streamly ==0.8.1.1
- streams ==3.3.2
@ -2708,7 +2708,7 @@ default-package-overrides:
- typed-process ==0.2.11.0
- typed-uuid ==0.2.0.0
- type-equality ==1
- type-errors ==0.2.0.1
- type-errors ==0.2.0.2
- type-fun ==0.1.3
- type-hint ==0.1
- type-level-integers ==0.0.1
@ -2879,7 +2879,7 @@ default-package-overrides:
- wave ==0.2.0
- wcwidth ==0.0.2
- webby ==1.1.0
- webdriver ==0.10.0.0
- webdriver ==0.10.0.1
- webex-teams-api ==0.2.0.1
- webex-teams-conduit ==0.2.0.1
- webgear-core ==1.0.4
@ -2905,7 +2905,7 @@ default-package-overrides:
- witherable ==0.4.2
- within ==0.2.0.1
- with-location ==0.1.0
- with-utf8 ==1.0.2.3
- with-utf8 ==1.0.2.4
- witness ==0.6.1
- wizards ==1.0.3
- wl-pprint ==1.2.1
@ -2973,7 +2973,7 @@ default-package-overrides:
- yesod-auth ==1.6.11.1
- yesod-auth-basic ==0.1.0.3
- yesod-auth-hashdb ==1.7.1.7
- yesod-auth-oauth2 ==0.7.0.3
- yesod-auth-oauth2 ==0.7.1.0
- yesod-bin ==1.6.2.2
- yesod-core ==1.6.24.2
- yesod-eventsource ==1.6.0.1

View file

@ -810,11 +810,8 @@ dont-distribute-packages:
- bitcoin-api
- bitcoin-api-extra
- bitcoin-block
- bitcoin-compact-filters
- bitcoin-tx
- bitcoin-types
- bitcoind-regtest
- bitcoind-rpc
- bitfield
- bitly-cli
- bitmaps
@ -1112,6 +1109,7 @@ dont-distribute-packages:
- cqrs-test
- cqrs-testkit
- crackNum
- crackNum_3_4
- craft
- craftwerk-cairo
- craftwerk-gtk
@ -1279,6 +1277,7 @@ dont-distribute-packages:
- distribution-plot
- dixi
- dl-fedora
- dl-fedora_0_9_5
- dmenu-pkill
- dmenu-pmount
- dmenu-search
@ -1544,9 +1543,6 @@ dont-distribute-packages:
- ftshell
- funbot
- funbot-git-hook
- funcons-lambda-cbv-mp
- funcons-simple
- funcons-tools
- function-combine
- functor
- functor-combo
@ -1600,7 +1596,6 @@ dont-distribute-packages:
- geolite-csv
- getemx
- gf
- ghc-debug-brick
- ghc-imported-from
- ghc-instances
- ghc-mod

View file

@ -1083,11 +1083,11 @@ self: super: builtins.intersectAttrs super {
}) super.fourmolu;
# Test suite wants to run main executable
fourmolu_0_10_0_0 = overrideCabal (drv: {
fourmolu_0_10_1_0 = overrideCabal (drv: {
preCheck = drv.preCheck or "" + ''
export PATH="$PWD/dist/build/fourmolu:$PATH"
'';
}) super.fourmolu_0_10_0_0;
}) super.fourmolu_0_10_1_0;
# Test suite needs to execute 'disco' binary
disco = overrideCabal (drv: {

File diff suppressed because it is too large Load diff