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

Merge pull request #176219 from NixOS/haskell-updates

Browse Source 
haskellPackages: update stackage and hackage
This commit is contained in:
sternenseemann
2022-06-07 21:34:06 +02:00
committed by GitHub
parent 93dbf11026 3910b36a70
commit 0c4588c505
10 changed files with 1063 additions and 669 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/data/misc/hackage/pin.json
+4 -4
View File
@@ -1,6 +1,6 @@
{
"commit": "1da63d5bfb88cd1e920fefd1b55650c78edc5539",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/1da63d5bfb88cd1e920fefd1b55650c78edc5539.tar.gz",
"sha256": "1n8qv8ajfwrj73f81m2zj81jyjx1jxxhjljwp8gch2aq8piz74g6",
"msg": "Update from Hackage at 2022-05-29T17:05:02Z"
"commit": "a4be9679c308459b390768e6195f3f08ae5366db",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/a4be9679c308459b390768e6195f3f08ae5366db.tar.gz",
"sha256": "09pr3ag0k1wjiih36p902gcpygxg8f7wqpr5g8j7ka851g0gckqa",
"msg": "Update from Hackage at 2022-06-04T09:01:11Z"
}
pkgs/development/haskell-modules/configuration-common.nix
+7 -22
View File
@@ -2351,25 +2351,6 @@ self: super: {
# Invalid CPP in test suite: https://github.com/cdornan/memory-cd/issues/1
memory-cd = dontCheck super.memory-cd;
protolude = appendPatches [
# Intermediate Patch, so the next one applies
(fetchpatch {
name = "integer-gmp-only-symbols.patch";
url = "https://github.com/protolude/protolude/commit/84d228a3b5a2adfe5c8aec23176a0301012e54eb.patch";
sha256 = "0mk0gxcg8vp73wlz764y24gqmxdrhanp12dfam9xsb6cm34jkjdc";
})
# Compat with GHC 9.0 (not merged yet)
(fetchpatch {
name = "protolude-ghc-9.0.patch";
url = "https://github.com/protolude/protolude/pull/131/commits/1ca4b4564b4d868022d5bab5330e2c7d9cae11a0.patch";
sha256 = "0jrm6715kc8v7v4isi79b3w1i51rs332bkak25ik6zv3i5lgcg68";
includes = [
"protolude.cabal"
"src/**"
];
})
] super.protolude;
# https://github.com/haskell/fgl/pull/99
fgl = doJailbreak super.fgl;
fgl-arbitrary = doJailbreak super.fgl-arbitrary;
@@ -2485,9 +2466,9 @@ self: super: {
ema = assert super.ema.version == "0.6.0.0";
super.ema.overrideScope (self: super: { relude = doJailbreak self.relude_0_7_0_0; });
# attoparsec bump is on v2 branch, but not released yet
irc-core = assert super.irc-core.version == "2.10"; doJailbreak super.irc-core;
glirc = assert super.irc-core.version == "2.10"; doJailbreak super.glirc;
glirc = super.glirc.override {
vty = self.vty_5_35_1;
};
# 2022-02-25: Unmaintained and to strict upper bounds
paths = doJailbreak super.paths;
@@ -2568,6 +2549,10 @@ self: super: {
sha256 = "0wxpqazjnal9naibapg63nm7x6qz0lklcfw2m5mzjrh2q9x2cvnd";
}) super.debian;
# Test data missing from sdist
# https://github.com/ngless-toolkit/ngless/issues/152
NGLess = dontCheck super.NGLess;
# Raise version bounds for hspec
records-sop = appendPatch (fetchpatch {
url = "https://github.com/kosmikus/records-sop/pull/11/commits/d88831388ab3041190130fec3cdd679a4217b3c7.patch";
pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
+4
View File
@@ -206,9 +206,13 @@ self: super: {
regex-rure = doDistribute (markUnbroken super.regex-rure);
jacinda = doDistribute super.jacinda;
some = doJailbreak super.some;
# 2022-06-05: this is not the latest version of fourmolu because
# hls-fourmolu-plugin 1.0.3.0 doesn‘t support a newer one.
fourmolu = super.fourmolu_0_6_0_0;
# hls-fourmolu-plugin in this version has a to strict upper bound of fourmolu <= 0.5.0.0
hls-fourmolu-plugin = assert super.hls-fourmolu-plugin.version == "1.0.3.0"; doJailbreak super.hls-fourmolu-plugin;
hls-ormolu-plugin = assert super.hls-ormolu-plugin.version == "1.0.2.1"; doJailbreak super.hls-ormolu-plugin;
implicit-hie-cradle = doJailbreak super.implicit-hie-cradle;
# 1.3 introduced support for GHC 9.2.x, so when this assert fails, the jailbreak can be removed
pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+6 -1
View File
@@ -571,6 +571,7 @@ broken-packages:
- call-alloy
- cal-layout
- call-haskell-from-anything
- call-plantuml
- camfort
- canon
- canonical-filepath
@@ -648,6 +649,7 @@ broken-packages:
- checked
- Checked
- checkmate
- chez-grater
- chiasma
- Chitra
- choose
@@ -3782,6 +3784,7 @@ broken-packages:
- pcf-font
- pcgen
- PCLT
- pcre2
- pcre-light-extra
- pdfname
- pdf-slave-template
@@ -3943,6 +3946,7 @@ broken-packages:
- polysemy-check
- polysemy-keyed-state
- polysemy-kvstore-jsonfile
- polysemy-managed
- polysemy-mocks
- polysemy-readline
- polysemy-req
@@ -5504,6 +5508,7 @@ broken-packages:
- wai-graceful
- wai-handler-devel
- wai-handler-fastcgi
- wai-handler-hal
- wai-handler-scgi
- wai-handler-webkit
- wai-hmac-auth
@@ -5564,11 +5569,11 @@ broken-packages:
- webdriver
- webdriver-snoy
- web-encodings
- webkitgtk3
- WeberLogic
- webex-teams-pipes
- webfinger-client
- web-inv-route
- webkitgtk3
- webkit-javascriptcore
- webmention
- web-output
pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+1 -4
View File
@@ -87,10 +87,6 @@ default-package-overrides:
- dhall-nix < 1.1.24
# Temporarily forbid distribution-nixpkgs updates until cabal2nix supports the new version
- distribution-nixpkgs < 1.7.0
# glirc 2.39 is broken: https://github.com/glguy/irc-core/issues/99
- glirc == 2.38
# glirc 2.38 requires hookup 0.6
- hookup == 0.6
extra-packages:
- aeson < 2 # required by pantry-0.5.2
@@ -138,6 +134,7 @@ extra-packages:
- 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
- fourmolu == 0.6.0.0 # 2022-06-05: Last fourmolu version compatible with hls 1.7/ hls-fourmolu-plugin 1.0.3.0
package-maintainers:
abbradar:
pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml
+20 -20
View File
@@ -1,4 +1,4 @@
# Stackage LTS 19.8
# Stackage LTS 19.9
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@@ -24,7 +24,7 @@ default-package-overrides:
- aeson-casing ==0.2.0.0
- aeson-commit ==1.4
- aeson-compat ==0.3.10
- aeson-diff ==1.1.0.12
- aeson-diff ==1.1.0.13
- aeson-extra ==0.5.1
- aeson-generic-compat ==0.0.1.3
- aeson-optics ==1.1.1
@@ -368,7 +368,7 @@ default-package-overrides:
- colour ==2.3.6
- columnar ==1.0.0.0
- combinatorial ==0.1.0.1
- comfort-array ==0.5.1
- comfort-array ==0.5.1.1
- comfort-array-shape ==0.0
- comfort-fftw ==0.0
- comfort-graph ==0.0.3.2
@@ -399,7 +399,7 @@ default-package-overrides:
- conduit-aeson ==0.1.0.1
- conduit-algorithms ==0.0.12.0
- conduit-combinators ==1.3.0
- conduit-concurrent-map ==0.1.1
- conduit-concurrent-map ==0.1.3
- conduit-connection ==0.1.0.5
- conduit-extra ==1.3.6
- conduit-parse ==0.2.1.1
@@ -426,7 +426,7 @@ default-package-overrides:
- control-dsl ==0.2.1.3
- control-monad-free ==0.6.2
- control-monad-omega ==0.3.2
- convertible ==1.1.1.0
- convertible ==1.1.1.1
- cookie ==0.4.5
- copr-api ==0.1.0
- core-data ==0.3.2.2
@@ -604,7 +604,7 @@ default-package-overrides:
- doctest-exitcode-stdio ==0.0
- doctest-extract ==0.1
- doctest-lib ==0.1
- doctest-parallel ==0.2.2
- doctest-parallel ==0.2.3
- doldol ==0.4.1.2
- do-list ==1.0.1
- domain ==0.1.1.3
@@ -672,7 +672,7 @@ default-package-overrides:
- eq ==4.3
- equal-files ==0.0.5.3
- equational-reasoning ==0.7.0.1
- equivalence ==0.4
- equivalence ==0.4.0.1
- erf ==2.0.0.0
- errata ==0.4.0.0
- error ==0.3.0.0
@@ -761,7 +761,7 @@ default-package-overrides:
- fixed-length ==0.2.3
- fixed-vector ==1.2.1.0
- fixed-vector-hetero ==0.6.1.1
- fix-whitespace ==0.0.7
- fix-whitespace ==0.0.8
- flac ==0.2.0
- flac-picture ==0.1.2
- flags-applicative ==0.1.0.3
@@ -1328,7 +1328,7 @@ default-package-overrides:
- json-feed ==2.0.0.1
- jsonifier ==0.2.0.1
- jsonpath ==0.2.1.0
- json-stream ==0.4.3.0
- json-stream ==0.4.4.1
- JuicyPixels ==3.3.7
- JuicyPixels-blurhash ==0.1.0.3
- JuicyPixels-extra ==0.5.2
@@ -1425,7 +1425,7 @@ default-package-overrides:
- linux-file-extents ==0.2.0.0
- linux-namespaces ==0.1.3.0
- List ==0.6.2
- ListLike ==4.7.6
- ListLike ==4.7.7
- list-predicate ==0.1.0.1
- listsafe ==0.1.0.1
- list-singleton ==2.0.0.0
@@ -1611,7 +1611,7 @@ default-package-overrides:
- mwc-random-monad ==0.7.3.1
- mx-state-codes ==1.0.0.0
- mysql ==0.2.1
- mysql-simple ==0.4.7.2
- mysql-simple ==0.4.8
- n2o ==0.11.1
- n2o-nitro ==0.11.2
- nagios-check ==0.3.2
@@ -1622,7 +1622,7 @@ default-package-overrides:
- nanospec ==0.2.2
- nanovg ==0.8.0.0
- nats ==1.1.2
- natural-arithmetic ==0.1.2.0
- natural-arithmetic ==0.1.3.0
- natural-induction ==0.2.0.0
- natural-sort ==0.1.2
- natural-transformation ==0.4
@@ -1681,9 +1681,9 @@ default-package-overrides:
- numbers ==3000.2.0.2
- numeric-extras ==0.1
- numeric-limits ==0.1.0.0
- numeric-prelude ==0.4.3.3
- numeric-prelude ==0.4.4
- numeric-quest ==0.2.0.2
- numhask ==0.10.0.0
- numhask ==0.10.1.0
- numhask-array ==0.10.0
- numhask-space ==0.10.0.0
- NumInstances ==1.4
@@ -2208,7 +2208,7 @@ default-package-overrides:
- shake ==0.19.6
- shake-language-c ==0.12.0
- shake-plus ==0.3.4.0
- shakespeare ==2.0.27
- shakespeare ==2.0.29
- shared-memory ==0.2.0.0
- ShellCheck ==0.8.0
- shell-conduit ==5.0.0
@@ -2478,7 +2478,7 @@ default-package-overrides:
- text-regex-replace ==0.1.1.4
- text-rope ==0.1
- text-short ==0.1.5
- text-show ==3.9.6
- text-show ==3.9.7
- text-show-instances ==3.8.6
- text-zipper ==0.11
- tfp ==1.0.2
@@ -2488,7 +2488,7 @@ default-package-overrides:
- th-compat ==0.1.3
- th-constraint-compat ==0.0.1.0
- th-desugar ==1.12
- th-env ==0.1.0.3
- th-env ==0.1.1
- these ==1.1.1.1
- these-lens ==1.0.1.2
- these-optics ==1.0.1.2
@@ -2613,7 +2613,7 @@ default-package-overrides:
- unicode-show ==0.1.1.1
- unicode-transforms ==0.4.0.1
- unidecode ==0.1.0.4
- unification-fd ==0.11.1
- unification-fd ==0.11.2
- union ==0.1.2
- union-angle ==0.1.0.1
- union-find ==0.2
@@ -2632,7 +2632,7 @@ default-package-overrides:
- universe-reverse-instances ==1.1.1
- universe-some ==1.2.1
- universum ==1.7.3
- unix-bytestring ==0.3.7.6
- unix-bytestring ==0.3.7.7
- unix-compat ==0.5.4
- unix-time ==0.4.7
- unliftio ==0.2.22.0
@@ -2735,7 +2735,7 @@ default-package-overrides:
- wai-transformers ==0.1.0
- wai-websockets ==3.0.1.2
- wakame ==0.1.0.0
- warp ==3.3.20
- warp ==3.3.21
- warp-tls ==3.3.2
- warp-tls-uid ==0.2.0.6
- wave ==0.2.0
pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+4
View File
@@ -878,6 +878,7 @@ dont-distribute-packages:
- cabal-query
- cabal-test
- cabal2arch
- cabal2json
- cabalmdvrpm
- cabalrpmdeps
- cabocha
@@ -3087,6 +3088,8 @@ dont-distribute-packages:
- phonetic-languages-simplified-generalized-properties-array
- phonetic-languages-simplified-lists-examples
- phonetic-languages-simplified-properties-array
- phonetic-languages-simplified-properties-array-common
- phonetic-languages-simplified-properties-array-old
- phonetic-languages-simplified-properties-lists
- phonetic-languages-simplified-properties-lists-double
- phonetic-languages-ukrainian
@@ -4200,6 +4203,7 @@ dont-distribute-packages:
- yesod-auth-fb
- yesod-auth-ldap
- yesod-auth-lti13
- yesod-auth-simple
- yesod-colonnade
- yesod-comments
- yesod-continuations
pkgs/development/haskell-modules/configuration-nix.nix
+10
View File
@@ -924,6 +924,9 @@ self: super: builtins.intersectAttrs super {
&& buildPlatform.isx86;
} super.hashes;
# Tries to access network
aws-sns-verify = dontCheck super.aws-sns-verify;
# procex relies on close_range which has been introduced in Linux 5.9,
# the test suite seems to force the use of this feature (or the fallback
# mechanism is broken), so we can't run the test suite on machines with a
@@ -941,6 +944,13 @@ self: super: builtins.intersectAttrs super {
'' + (drv.postConfigure or "");
}) super.procex;
# Test suite wants to run main executable
fourmolu_0_7_0_1 = overrideCabal (drv: {
preCheck = drv.preCheck or "" + ''
export PATH="$PWD/dist/build/fourmolu:$PATH"
'';
}) super.fourmolu_0_7_0_1;
# Apply a patch which hardcodes the store path of graphviz instead of using
# whatever graphviz is in PATH.
graphviz = overrideCabal (drv: {
pkgs/development/haskell-modules/hackage-packages.nix
Generated
+1001 -615
View File
File diff suppressed because it is too large Load Diff
pkgs/development/haskell-modules/hoogle.nix
+6 -3
View File
@@ -49,9 +49,12 @@ buildPackages.stdenv.mkDerivation {
# compiling databases takes less time than copying the results
# between machines.
preferLocalBuild = true;
# Plus, you need a complete database for each possible combination
# of dependencies, caching them does not make sense.
allowSubstitutes = false;
# we still allow substitutes because a database is relatively small and if it
# is already built downloading is probably faster. The substitution will only
# trigger for users who have already cached the database on a substituter and
# thus probably intend to substitute it.
allowSubstitutes = true;
inherit docPackages;