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

Merge pull request #173800 from NixOS/haskell-updates

Browse Source 
haskellPackages: update stackage and hackage
This commit is contained in:
maralorn 2022-05-29 19:12:29 +02:00 committed by GitHub
commit b571ef8fcb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 1475 additions and 1404 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,6 +1,6 @@
{
"commit": "2c56a18f7c408d4fd67a3667d93cab163692fc53",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/2c56a18f7c408d4fd67a3667d93cab163692fc53.tar.gz",
"sha256": "0yvikmygrb6gb0lv4jp00rsqnagvkrc94sgmrn1gfjlmazss77z5",
"msg": "Update from Hackage at 2022-05-14T01:13:33Z"
"commit": "d69efcbdc39d5a7ae25039f9737ad04e34f38f68",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/d69efcbdc39d5a7ae25039f9737ad04e34f38f68.tar.gz",
"sha256": "1xlnp36h5r8q3nf1fbq472rkqp0wmgz51rylnd23kl0pba2fypkp",
"msg": "Update from Hackage at 2022-05-20T19:45:02Z"
}

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

@ -165,6 +165,9 @@ self: super: {
})
] super.flat;
# Too strict bounds on base, optparse-applicative: https://github.com/edsko/friendly/issues/5
friendly = doJailbreak super.friendly;
# Too strict bound on hspec: https://github.com/ivan-m/graphviz/issues/55
graphviz = doJailbreak super.graphviz;
@ -779,22 +782,6 @@ self: super: {
# The tests spuriously fail
libmpd = dontCheck super.libmpd;
# For template-haskell 2.16 and 2.17 support: https://github.com/JonasDuregard/sized-functors/pull/10
size-based = overrideCabal
(drv: {
# make all line endings unix, otherwise patching fails
prePatch = ''
find . -type f -print0 | xargs -0 ${pkgs.buildPackages.dos2unix}/bin/dos2unix
'' + (drv.prePatch or "");
patches = [
(fetchpatch {
url = "https://github.com/JonasDuregard/sized-functors/pull/10/commits/fe6bf78a1b97ff7429630d0e8974c9bc40945dcf.patch";
sha256 = "sha256-mMsXOqLqSbGl9Q0txiZiciPtGT7f12lnhlpFsnCwamk=";
})
];
})
super.size-based;
# https://github.com/diagrams/diagrams-braille/issues/1
diagrams-braille = doJailbreak super.diagrams-braille;
@ -1003,10 +990,6 @@ self: super: {
# https://github.com/haskell-hvr/resolv/pull/6
resolv_0_1_1_2 = dontCheck super.resolv_0_1_1_2;
# Too strict bounds on base and Cabal, fixed on master
# Occasional test failures: https://github.com/phadej/spdx/issues/27
spdx = assert super.spdx.version == "1.0.0.2"; doJailbreak (dontCheck super.spdx);
# The test suite does not know how to find the 'alex' binary.
alex = overrideCabal (drv: {
testSystemDepends = (drv.testSystemDepends or []) ++ [pkgs.which];
@ -1166,16 +1149,6 @@ self: super: {
# https://github.com/danfran/cabal-macosx/issues/13
cabal-macosx = dontCheck super.cabal-macosx;
# Causes Test.QuickCheck.resize: negative size crashes e.g. in test suites
# https://github.com/typeable/generic-arbitrary/issues/14
generic-arbitrary = appendPatches [
(pkgs.fetchpatch {
name = "generic-arbitrary-no-negative-resize.patch";
url = "https://github.com/typeable/generic-arbitrary/commit/c13d119d8ad0d43860ecdb93b357b0239e366a6c.patch";
sha256 = "1jgbd2jn575icqw9nfdzh57nacm3pn8n53ka52129pnfjqfzyhsi";
})
] super.generic-arbitrary;
# https://github.com/DanielG/cabal-helper/pull/123
cabal-helper = doJailbreak super.cabal-helper;
@ -1767,7 +1740,11 @@ self: super: {
# waiting for aeson bump
servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core;
hercules-ci-agent = generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent;
hercules-ci-agent =
assert super.hercules-ci-agent.version == "0.9.5"; # >0.9.5: remove source override as sdist will be fixed
overrideSrc
{ src = pkgs.fetchFromGitHub { owner = "hercules-ci"; repo = "hercules-ci-agent"; rev = "hercules-ci-agent-0.9.5"; sha256 = "sha256-7d8lf4g8CWHTzIOmma8UKvFIi1Og6RqPH9Lt+6iA4pw="; } + "/hercules-ci-agent"; }
(generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent);
# Test suite doesn't compile with aeson 2.0
# https://github.com/hercules-ci/hercules-ci-agent/pull/387
@ -2351,22 +2328,16 @@ self: super: {
"--skip" "/Data.List.UniqueUnsorted.repeatedBy,repeated,unique/repeatedBy: simple test/"
] ++ drv.testFlags or [];
}) super.Unique;
# https://github.com/AndrewRademacher/aeson-casing/issues/8
aeson-casing = assert super.aeson-casing.version == "0.2.0.0"; overrideCabal (drv: {
testFlags = [
"-p" "! /encode train/"
] ++ drv.testFlags or [];
}) super.aeson-casing;
# https://github.com/Soostone/katip/issues/134
katip = assert super.katip.version == "0.8.7.0"; overrideCabal (drv: {
testFlags = [
"-p" "!/Text-golden/&&!/respects payloadKeys for each constituent payload/"
] ++ drv.testFlags or [];
}) super.katip;
# 2020-11-19: Jailbreaking until: https://github.com/snapframework/heist/pull/124
# 2021-12-22: https://github.com/snapframework/heist/issues/131
heist = assert super.heist.version == "1.1.0.1";
# aeson 2.0 compat https://github.com/snapframework/heist/pull/132
# not merged in master yet

2
pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
View File

@ -173,7 +173,7 @@ self: super: {
];
# lens >= 5.1 supports 9.2.1
lens = doDistribute self.lens_5_1;
lens = doDistribute self.lens_5_1_1;
# Syntax error in tests fixed in https://github.com/simonmar/alex/commit/84b29475e057ef744f32a94bc0d3954b84160760
alex = dontCheck super.alex;

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

@ -453,7 +453,6 @@ broken-packages:
- botpp
- bottom
- boundingboxes
- bower-json
- bowntz
- bpath
- BPS
@ -1552,7 +1551,6 @@ broken-packages:
- fresh
- friday-devil
- friday-scale-dct
- friendly
- frown
- frp-arduino
- frpnow
@ -4903,6 +4901,7 @@ broken-packages:
- stripeapi
- stripe-core
- stripe-servant
- strongweak
- structural-traversal
- structures
- stt

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

@ -85,6 +85,8 @@ default-package-overrides:
- http-client-restricted < 0.0.5
# Needs dhall 1.41.*, Stackage LTS 19 has 1.40
- dhall-nix < 1.1.24
# Temporarily forbid distribution-nixpkgs updates until cabal2nix supports the new version
- distribution-nixpkgs < 1.7.0
extra-packages:
- aeson < 2 # required by pantry-0.5.2
@ -131,6 +133,7 @@ extra-packages:
- hspec < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
- hspec-core < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
- hspec-discover < 2.8 # 2022-04-07: Needed for tasty-hspec 1.1.6
- bower-json == 1.0.0.1 # 2022-05-21: Needed for spago 0.20.9
package-maintainers:
abbradar:

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

@ -1,4 +1,4 @@
# Stackage LTS 19.6
# Stackage LTS 19.7
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -13,7 +13,7 @@ default-package-overrides:
- active ==0.2.0.15
- ad ==4.5
- ad-delcont ==0.3.0.0
- adjunctions ==4.4
- adjunctions ==4.4.1
- adler32 ==0.1.2.0
- advent-of-code-api ==0.2.8.1
- aern2-mp ==0.2.8.0
@ -156,12 +156,12 @@ default-package-overrides:
- bech32 ==1.1.2
- bech32-th ==1.1.1
- bench ==1.0.12
- benchpress ==0.2.2.19
- benchpress ==0.2.2.20
- bencode ==0.6.1.1
- bencoding ==0.4.5.4
- between ==0.11.0.0
- bibtex ==0.1.0.6
- bifunctors ==5.5.11
- bifunctors ==5.5.12
- bimap ==0.4.0
- bimaps ==0.1.0.2
- bimap-server ==0.1.0.1
@ -174,7 +174,7 @@ default-package-overrides:
- binary-instances ==1.0.2
- binary-list ==1.1.1.2
- binary-orphans ==1.0.2
- binary-parser ==0.5.7.1
- binary-parser ==0.5.7.2
- binary-parsers ==0.2.4.0
- binary-search ==2.0.0
- binary-shared ==0.8.3
@ -224,7 +224,7 @@ default-package-overrides:
- bordacount ==0.1.0.0
- boring ==0.2
- both ==0.1.1.2
- bound ==2.0.4
- bound ==2.0.5
- BoundedChan ==1.0.3.0
- bounded-queue ==1.0.0
- boxes ==0.1.5
@ -234,7 +234,7 @@ default-package-overrides:
- bsb-http-chunked ==0.0.0.4
- bson ==0.4.0.1
- bson-lens ==0.1.1
- buffer-builder ==0.2.4.7
- buffer-builder ==0.2.4.8
- buffer-pipe ==0.0
- bugsnag-haskell ==0.0.4.4
- bugsnag-hs ==0.2.0.8
@ -244,11 +244,11 @@ default-package-overrides:
- buttplug-hs-core ==0.1.0.1
- bv ==0.5
- byteable ==0.1.1
- byte-count-reader ==0.10.1.8
- byte-count-reader ==0.10.1.9
- bytedump ==1.0
- byte-order ==0.1.3.0
- byteorder ==1.0.4
- bytes ==0.17.1
- bytes ==0.17.2
- byteset ==0.1.1.0
- bytestring-builder ==0.10.8.2.0
- bytestring-conversion ==0.3.1
@ -399,8 +399,8 @@ default-package-overrides:
- conduit-combinators ==1.3.0
- conduit-concurrent-map ==0.1.1
- conduit-connection ==0.1.0.5
- conduit-extra ==1.3.5
- conduit-parse ==0.2.1.0
- conduit-extra ==1.3.6
- conduit-parse ==0.2.1.1
- conduit-zstd ==0.0.2.0
- conferer ==1.1.0.0
- conferer-aeson ==1.1.0.2
@ -428,7 +428,7 @@ default-package-overrides:
- cookie ==0.4.5
- copr-api ==0.1.0
- core-data ==0.3.2.2
- core-program ==0.4.6.1
- core-program ==0.4.6.4
- core-text ==0.3.7.1
- countable ==1.0
- covariance ==0.1.0.6
@ -557,7 +557,7 @@ default-package-overrides:
- deriveJsonNoPrefix ==0.1.0.1
- derive-topdown ==0.0.3.0
- deriving-aeson ==0.2.8
- deriving-compat ==0.6
- deriving-compat ==0.6.1
- derulo ==2.0.0.1
- detour-via-sci ==1.0.0
- df1 ==0.4
@ -645,7 +645,7 @@ default-package-overrides:
- edit-distance ==0.2.2.1
- edit-distance-vector ==1.0.0.4
- editor-open ==0.6.0.0
- either ==5.0.1.1
- either ==5.0.2
- either-both ==0.1.1.1
- either-unwrap ==1.1
- elerea ==2.9.0
@ -798,7 +798,7 @@ default-package-overrides:
- foundation ==0.0.28
- fourmolu ==0.4.0.0
- Frames ==0.7.3
- free ==5.1.7
- free ==5.1.8
- free-categories ==0.2.0.2
- freenect ==1.2.1
- freer-simple ==1.2.1.2
@ -828,7 +828,7 @@ default-package-overrides:
- gdp ==0.0.3.0
- general-games ==1.1.1
- generic-aeson ==0.2.0.13
- generic-arbitrary ==0.2.1
- generic-arbitrary ==0.2.2
- generic-constraints ==1.1.1.1
- generic-data ==0.9.2.1
- generic-data-surgery ==0.3.0.0
@ -946,7 +946,7 @@ default-package-overrides:
- gpolyline ==0.1.0.1
- graph-core ==0.3.0.0
- graphite ==0.10.0.1
- graphs ==0.7.1
- graphs ==0.7.2
- graphula ==2.0.1.1
- graphviz ==2999.20.1.0
- graph-wrapper ==0.2.6.0
@ -1047,7 +1047,7 @@ default-package-overrides:
- hgeometry ==0.14
- hgeometry-combinatorial ==0.14
- hid ==0.2.2
- hidapi ==0.1.7
- hidapi ==0.1.8
- hie-bios ==0.9.1
- hi-file-parser ==0.1.2.0
- higher-leveldb ==0.6.0.0
@ -1140,7 +1140,7 @@ default-package-overrides:
- hspec-core ==2.8.5
- hspec-discover ==2.8.5
- hspec-expectations ==0.8.2
- hspec-expectations-json ==1.0.0.6
- hspec-expectations-json ==1.0.0.7
- hspec-expectations-lifted ==0.10.0
- hspec-expectations-pretty-diff ==0.7.2.6
- hspec-golden ==0.2.0.0
@ -1150,7 +1150,7 @@ default-package-overrides:
- hspec-leancheck ==0.0.6
- hspec-megaparsec ==2.2.0
- hspec-meta ==2.7.8
- hspec-need-env ==0.1.0.8
- hspec-need-env ==0.1.0.9
- hspec-parsec ==0
- hspec-smallcheck ==0.5.2
- hspec-tmp-proc ==0.5.0.1
@ -1161,7 +1161,7 @@ default-package-overrides:
- hstatistics ==0.3.1
- HStringTemplate ==0.8.8
- HSvm ==0.1.1.3.25
- HsYAML ==0.2.1.0
- HsYAML ==0.2.1.1
- HsYAML-aeson ==0.2.0.1
- hsyslog ==5.0.2
- hsyslog-udp ==0.2.5
@ -1170,7 +1170,7 @@ default-package-overrides:
- html ==1.0.1.2
- html-conduit ==1.3.2.2
- html-email-validate ==0.2.0.0
- html-entities ==1.1.4.5
- html-entities ==1.1.4.6
- html-entity-map ==0.1.0.0
- http2 ==3.0.3
- HTTP ==4000.3.16
@ -1189,7 +1189,7 @@ default-package-overrides:
- http-link-header ==1.2.1
- http-media ==0.8.0.0
- http-query ==0.1.3
- http-reverse-proxy ==0.6.0
- http-reverse-proxy ==0.6.0.1
- http-streams ==0.8.9.6
- http-types ==0.12.3
- human-readable-duration ==0.2.1.4
@ -1289,7 +1289,7 @@ default-package-overrides:
- intervals ==0.9.2
- intro ==0.9.0.0
- intset-imperative ==0.1.0.0
- invariant ==0.5.5
- invariant ==0.5.6
- invert ==1.0.0.2
- invertible ==0.2.0.7
- invertible-grammar ==0.1.3.2
@ -1337,9 +1337,9 @@ default-package-overrides:
- junit-xml ==0.1.0.2
- justified-containers ==0.3.0.0
- jwt ==0.11.0
- kan-extensions ==5.2.3
- kan-extensions ==5.2.4
- kanji ==3.5.0
- katip ==0.8.7.0
- katip ==0.8.7.1
- katip-logstash ==0.1.0.2
- katip-wai ==0.1.1.0
- kazura-queue ==0.1.0.4
@ -1430,8 +1430,8 @@ default-package-overrides:
- list-predicate ==0.1.0.1
- listsafe ==0.1.0.1
- list-singleton ==2.0.0.0
- list-t ==1.0.5.1
- list-transformer ==1.0.7
- list-t ==1.0.5.2
- list-transformer ==1.0.8
- ListTree ==0.2.3
- ListZipper ==1.2.0.2
- literatex ==0.2.0.2
@ -1459,7 +1459,7 @@ default-package-overrides:
- lsp-types ==1.4.0.1
- lua ==2.1.0
- lua-arbitrary ==1.0.1
- lucid ==2.11.0
- lucid ==2.11.1
- lucid-cdn ==0.2.2.0
- lucid-extras ==0.2.2
- lukko ==0.1.1.3
@ -1501,8 +1501,8 @@ default-package-overrides:
- mcmc-types ==1.0.3
- median-stream ==0.7.0.0
- med-module ==0.1.2.2
- megaparsec ==9.2.0
- megaparsec-tests ==9.2.0
- megaparsec ==9.2.1
- megaparsec-tests ==9.2.1
- mega-sdist ==0.4.2.1
- memory ==0.16.0
- MemoTrie ==0.6.10
@ -1655,7 +1655,7 @@ default-package-overrides:
- network-transport-tcp ==0.8.0
- network-transport-tests ==0.3.0
- network-uri ==2.6.4.1
- network-wait ==0.1.1.0
- network-wait ==0.1.2.0
- newtype ==0.2.2.0
- newtype-generics ==0.6.1
- nfc ==0.1.0
@ -1764,7 +1764,7 @@ default-package-overrides:
- ParsecTools ==0.0.2.0
- parser-combinators ==1.3.0
- parser-combinators-tests ==1.3.0
- parsers ==0.12.10
- parsers ==0.12.11
- partial-handler ==1.0.3
- partial-isomorphisms ==0.2.3.0
- partial-order ==0.2.0.0
@ -1846,7 +1846,7 @@ default-package-overrides:
- placeholders ==0.1
- plaid ==0.1.0.4
- plotlyhs ==0.2.1
- pointed ==5.0.3
- pointed ==5.0.4
- pointedlist ==0.6.1
- pointless-fun ==1.1.0.8
- poll ==0.0.0.2
@ -1873,7 +1873,7 @@ default-package-overrides:
- posix-paths ==0.3.0.0
- possibly ==1.0.0.0
- postgres-options ==0.2.0.0
- postgresql-binary ==0.12.4.2
- postgresql-binary ==0.12.4.3
- postgresql-libpq ==0.9.4.3
- postgresql-libpq-notify ==0.2.0.0
- postgresql-migration ==0.2.1.3
@ -1985,7 +1985,7 @@ default-package-overrides:
- rampart ==2.0.0.0
- ramus ==0.1.2
- rando ==0.0.0.4
- random ==1.2.1
- random ==1.2.1.1
- random-bytestring ==0.1.4
- random-fu ==0.3.0.0
- random-shuffle ==0.0.4
@ -2067,7 +2067,7 @@ default-package-overrides:
- resistor-cube ==0.0.1.4
- resolv ==0.1.2.0
- resource-pool ==0.2.3.2
- resourcet ==1.2.4.3
- resourcet ==1.2.5
- result ==0.2.6.0
- retry ==0.9.2.0
- rev-state ==0.1.2
@ -2092,7 +2092,7 @@ default-package-overrides:
- rosezipper ==0.2
- rot13 ==0.2.0.1
- rpmbuild-order ==0.4.5
- rpm-nvr ==0.1.1
- rpm-nvr ==0.1.2
- rp-tree ==0.7.1
- RSA ==2.4.1
- rss-conduit ==0.6.0.1
@ -2288,7 +2288,7 @@ default-package-overrides:
- speedy-slice ==0.3.2
- Spintax ==0.3.6
- splice ==0.6.1.1
- splint ==1.0.1.4
- splint ==1.0.1.5
- split ==0.2.3.4
- splitmix ==0.1.0.4
- splitmix-distributions ==0.9.0.0
@ -2316,7 +2316,7 @@ default-package-overrides:
- StateVar ==1.2.2
- stateWriter ==0.3.0
- static-text ==0.2.0.7
- statistics ==0.16.0.2
- statistics ==0.16.1.0
- status-notifier-item ==0.3.1.0
- stb-image-redux ==0.2.1.2
- step-function ==0.2
@ -2352,7 +2352,7 @@ default-package-overrides:
- streamt ==0.5.0.0
- strict ==0.4.0.1
- strict-concurrency ==0.2.4.3
- strict-list ==0.1.6
- strict-list ==0.1.7
- strict-tuple ==0.1.5
- strict-tuple-lens ==0.2
- strict-wrapper ==0.0.0.0
@ -2404,7 +2404,7 @@ default-package-overrides:
- tagged ==0.8.6.1
- tagged-binary ==0.2.0.1
- tagged-identity ==0.1.3
- tagged-transformer ==0.8.1
- tagged-transformer ==0.8.2
- tagshare ==0.0
- tagsoup ==0.14.8
- tagstream-conduit ==0.5.6
@ -2412,8 +2412,8 @@ default-package-overrides:
- tao-example ==1.0.0
- tar ==0.5.1.1
- tar-conduit ==0.3.2
- tardis ==0.4.3.0
- tasty ==1.4.2.1
- tardis ==0.4.4.0
- tasty ==1.4.2.3
- tasty-ant-xml ==1.1.8
- tasty-bench ==0.3.1
- tasty-dejafu ==2.0.0.8
@ -2435,7 +2435,7 @@ default-package-overrides:
- tasty-program ==1.0.5
- tasty-quickcheck ==0.10.2
- tasty-rerun ==1.1.18
- tasty-silver ==3.3.1
- tasty-silver ==3.3.1.1
- tasty-smallcheck ==0.8.2
- tasty-tap ==0.1.0
- tasty-test-reporter ==0.1.1.4
@ -2469,7 +2469,7 @@ default-package-overrides:
- text-binary ==0.2.1.1
- text-builder ==0.6.6.5
- text-builder-dev ==0.2.1
- text-conversions ==0.3.1
- text-conversions ==0.3.1.1
- text-icu ==0.7.1.0
- text-latin1 ==0.3.1
- text-ldap ==0.1.1.14
@ -2573,7 +2573,7 @@ default-package-overrides:
- tuples-homogenous-h98 ==0.1.1.0
- tuple-sop ==0.3.1.0
- tuple-th ==0.2.5
- turtle ==1.5.24
- turtle ==1.5.25
- twitter-conduit ==0.6.1
- twitter-types ==0.11.0
- twitter-types-lens ==0.11.0
@ -2717,7 +2717,7 @@ default-package-overrides:
- wai-cors ==0.2.7
- wai-enforce-https ==1.0.0.0
- wai-eventsource ==3.0.0
- wai-extra ==3.1.10
- wai-extra ==3.1.12.1
- wai-feature-flags ==0.1.0.3
- wai-handler-launch ==3.0.3.1
- wai-logger ==2.4.0
@ -2855,7 +2855,7 @@ default-package-overrides:
- yesod-routes-flow ==3.0.0.2
- yesod-sitemap ==1.6.0
- yesod-static ==1.6.1.0
- yesod-test ==1.6.13
- yesod-test ==1.6.14
- yesod-websockets ==0.3.0.3
- yes-precure5-command ==5.5.3
- yi-rope ==0.11
@ -2875,7 +2875,7 @@ default-package-overrides:
- zipper-extra ==0.1.3.2
- zippers ==0.3.2
- zip-stream ==0.2.1.0
- zlib ==0.6.2.3
- zlib ==0.6.3.0
- zlib-bindings ==0.1.1.5
- zlib-lens ==0.1.2.1
- zot ==0.0.3

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

@ -47,7 +47,6 @@ dont-distribute-packages:
- Bitly
- BlastHTTP
- Blobs
- BlogLiterately
- BlogLiterately-diagrams
- Bookshelf
- CBOR
@ -2621,6 +2620,7 @@ dont-distribute-packages:
- list-witnesses
- listenbrainz-client
- liszt
- little-rio_1_0_0
- live-sequencer
- llvm
- llvm-analysis
@ -3189,7 +3189,6 @@ dont-distribute-packages:
- protobuf-native
- protocol-buffers-descriptor-fork
- proton
- psc-ide
- psql
- ptera
- ptera-core
@ -3202,9 +3201,7 @@ dont-distribute-packages:
- pure-cdb
- pure-priority-queue-tests
- purenix
- purescript
- purescript-iso
- purescript-tsd-gen
- pursuit-client
- push-notify
- push-notify-apn
@ -4236,7 +4233,6 @@ dont-distribute-packages:
- yuuko
- z85
- zasni-gerna
- zephyr
- zephyr-copilot
- zeromq3-conduit
- zeromq3-haskell

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

@ -620,10 +620,10 @@ self: super: builtins.intersectAttrs super {
}) super.spago;
spagoOldAeson = spagoDocs.overrideScope (hfinal: hprev: {
# spago (and its dependency, bower-json) is not yet updated for aeson-2.0
# spago is not yet updated for aeson 2.0
aeson = hfinal.aeson_1_5_6_0;
# bower-json needs aeson_1_5_6_0 and is marked broken without it.
bower-json = doDistribute (markUnbroken hprev.bower-json);
# bower-json 1.1.0.0 only supports aeson 2.0, so we pull in the older version here.
bower-json = hprev.bower-json_1_0_0_1;
});
# Tests require network access.
@ -994,7 +994,6 @@ self: super: builtins.intersectAttrs super {
hls-module-name-plugin
hls-ormolu-plugin
hls-pragmas-plugin
hls-rename-plugin
hls-splice-plugin;
# Tests have file permissions expections that don‘t work with the nix store.
hls-stylish-haskell-plugin = dontCheck super.hls-stylish-haskell-plugin;
@ -1002,6 +1001,7 @@ self: super: builtins.intersectAttrs super {
# Flaky tests
hls-hlint-plugin = dontCheck super.hls-hlint-plugin;
hls-class-plugin = dontCheck super.hls-class-plugin;
hls-rename-plugin = dontCheck super.hls-rename-plugin;
hls-alternate-number-format-plugin = dontCheck super.hls-alternate-number-format-plugin;
hls-qualify-imported-names-plugin = dontCheck super.hls-qualify-imported-names-plugin;
hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin;

12
pkgs/development/haskell-modules/generic-builder.nix
View File

@ -338,9 +338,10 @@ stdenv.mkDerivation ({
echo "Build with ${ghc}."
${optionalString (isLibrary && hyperlinkSource) "export PATH=${hscolour}/bin:$PATH"}
setupPackageConfDir="$TMPDIR/setup-package.conf.d"
builddir="$(mktemp -d)"
setupPackageConfDir="$builddir/setup-package.conf.d"
mkdir -p $setupPackageConfDir
packageConfDir="$TMPDIR/package.conf.d"
packageConfDir="$builddir/package.conf.d"
mkdir -p $packageConfDir
setupCompileFlags="${concatStringsSep " " setupCompileFlags}"
@ -418,7 +419,7 @@ stdenv.mkDerivation ({
done
echo setupCompileFlags: $setupCompileFlags
${nativeGhcCommand} $setupCompileFlags --make -o Setup -odir $TMPDIR -hidir $TMPDIR $i
${nativeGhcCommand} $setupCompileFlags --make -o Setup -odir $builddir -hidir $builddir $i
runHook postCompileBuildDriver
'';
@ -469,7 +470,10 @@ stdenv.mkDerivation ({
# `--test-option`, so Cabal passes it to the underlying test suite binary.
checkPhase = ''
runHook preCheck
checkFlagsArray+=(${lib.escapeShellArgs (builtins.map (opt: "--test-option=${opt}") testFlags)})
checkFlagsArray+=(
"--show-details=streaming"
${lib.escapeShellArgs (builtins.map (opt: "--test-option=${opt}") testFlags)}
)
${setupCommand} test ${testTarget} $checkFlags ''${checkFlagsArray:+"''${checkFlagsArray[@]}"}
runHook postCheck
'';

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

File diff suppressed because it is too large Load Diff

5
pkgs/development/tools/pandoc/default.nix
View File

@ -1,4 +1,4 @@
{ haskellPackages, fetchpatch, haskell, removeReferencesTo }:
{ stdenv, lib, haskellPackages, fetchpatch, haskell, removeReferencesTo }:
let
static = haskell.lib.compose.justStaticExecutables haskellPackages.pandoc;
@ -13,6 +13,9 @@ in
remove-references-to \
-t ${haskellPackages.pandoc-types} \
$out/bin/pandoc
'' + lib.optionalString (stdenv.buildPlatform == stdenv.hostPlatform) ''
mkdir -p $out/share/bash-completion/completions
$out/bin/pandoc --bash-completion > $out/share/bash-completion/completions/pandoc
'';
}) static).overrideAttrs (drv: {
# These libraries are still referenced, because they generate