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

Merge pull request #182400 from NixOS/haskell-updates

Browse Source 
haskellPackages: update stackage and hackage
This commit is contained in:
sternenseemann 2022-07-26 20:59:12 +02:00 committed by GitHub
commit 656cd225b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
15 changed files with 526 additions and 563 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": "f254a995da2ac1341f05d921778c064b49a5fcb2",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/f254a995da2ac1341f05d921778c064b49a5fcb2.tar.gz",
"sha256": "136liqr85agwz0byvlp31r7in1nx28lm5y9kk7qy2jamspyf52hy",
"msg": "Update from Hackage at 2022-07-18T21:55:34Z"
"commit": "155a57bcfc019c9972a44be54a407d0329dfb436",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/155a57bcfc019c9972a44be54a407d0329dfb436.tar.gz",
"sha256": "17pqq15b936gf8vm1lb1kmnnlmjd61a5bfld9v3cs7ydz764kg8w",
"msg": "Update from Hackage at 2022-07-21T21:13:45Z"
}

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

@ -1400,22 +1400,15 @@ self: super: {
# $PWD/dist/build/haskeline-examples-Test to $PATH.
haskeline_0_8_2 = dontCheck super.haskeline_0_8_2;
# Tests for list-t, superbuffer, and stm-containers
# depend on HTF and it is broken, 2020-08-23
list-t = dontCheck super.list-t;
superbuffer = dontCheck super.superbuffer;
stm-containers = dontCheck super.stm-containers;
# Too strict upper bound on HTF
# https://github.com/nikita-volkov/stm-containers/issues/29
stm-containers = doJailbreak super.stm-containers;
# Fails with "supports custom headers"
# Patch for GHC 9.0 support
Spock-core = dontCheck (appendPatches [
(fetchpatch {
name = "Spock-core-GHC-9.0.patch";
url = "https://github.com/agrafix/Spock/commit/25c75961c4aaaa2e81c9e2afd3d758f2b643f9df.patch";
sha256 = "sha256-JlliIpVYh2CYjJF2I119ab4/1oh6uvxMbRoxlUkKiGw=";
relative = "Spock-core";
})
] super.Spock-core);
# https://github.com/agrafix/Spock/issues/180
# Ignore Stackage LTS bound so we can compile Spock-core again. All other
# reverse dependencies of reroute are marked as broken in nixpkgs, so
# upgrading reroute is probably unproblematic.
reroute = doDistribute self.reroute_0_7_0_0;
# Test suite fails to compile https://github.com/agrafix/Spock/issues/177
Spock = dontCheck super.Spock;
@ -2577,6 +2570,27 @@ self: super: {
# https://github.com/klapaucius/vector-hashtables/issues/11
vector-hashtables = doJailbreak super.vector-hashtables;
# doctest-parallel is broken with v1-style cabal-install / Setup.hs
# https://github.com/martijnbastiaan/doctest-parallel/issues/22
doctest-parallel = dontCheck super.doctest-parallel;
clash-prelude = dontCheck super.clash-prelude;
# Ships a broken Setup.hs
# https://github.com/lehins/conduit-aeson/issues/1
conduit-aeson = overrideCabal (drv: {
postPatch = ''
${drv.postPatch or ""}
rm Setup.hs
'';
# doctest suite uses doctest-parallel which still doesn't work in nixpkgs
testTarget = "tests";
}) super.conduit-aeson;
# Disabling doctests.
regex-tdfa = overrideCabal {
testTarget = "regex-tdfa-unittest";
} super.regex-tdfa;
} // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super // (let
# We need to build purescript with these dependencies and thus also its reverse
# dependencies to avoid version mismatches in their dependency closure.
@ -2625,7 +2639,4 @@ in {
purescript-ast = purescriptStOverride super.purescript-ast;
purenix = purescriptStOverride super.purenix;
# tests use doctest-parallel which produces some errors during testing
clash-prelude = dontCheck super.clash-prelude;
})

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

@ -38,7 +38,8 @@ self: super: {
rts = null;
stm = null;
template-haskell = null;
terminfo = null;
# GHC only builds terminfo if it is a native compiler
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
text = null;
time = null;
transformers = null;
@ -139,4 +140,7 @@ self: super: {
# Not possible to build in the main GHC 9.0 package set
# https://github.com/awakesecurity/spectacle/issues/49
spectacle = doDistribute (markUnbroken super.spectacle);
# doctest-parallel dependency requires newer Cabal
regex-tdfa = dontCheck super.regex-tdfa;
}

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

@ -37,7 +37,8 @@ self: super: {
rts = null;
stm = null;
template-haskell = null;
terminfo = null;
# GHC only builds terminfo if it is a native compiler
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
text = null;
time = null;
transformers = null;

6
pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix
View File

@ -37,7 +37,8 @@ self: super: {
rts = null;
stm = null;
template-haskell = null;
terminfo = null;
# GHC only builds terminfo if it is a native compiler
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
text = null;
time = null;
transformers = null;
@ -167,4 +168,7 @@ self: super: {
# Depends on OneTuple for GHC < 9.0
universe-base = addBuildDepends [ self.OneTuple ] super.universe-base;
# doctest-parallel dependency requires newer Cabal
regex-tdfa = dontCheck super.regex-tdfa;
}

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

@ -39,7 +39,8 @@ self: super: {
rts = null;
stm = null;
template-haskell = null;
terminfo = null;
# GHC only builds terminfo if it is a native compiler
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
text = null;
time = null;
transformers = null;

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

@ -39,7 +39,8 @@ self: super: {
rts = null;
stm = null;
template-haskell = null;
terminfo = null;
# GHC only builds terminfo if it is a native compiler
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
text = null;
time = null;
transformers = null;

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

@ -47,7 +47,8 @@ self: super: {
rts = null;
stm = null;
template-haskell = null;
terminfo = null;
# GHC only builds terminfo if it is a native compiler
terminfo = if pkgs.stdenv.hostPlatform == pkgs.stdenv.buildPlatform then null else self.terminfo_0_4_1_5;
text = null;
time = null;
transformers = null;

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

@ -94,7 +94,6 @@ broken-packages:
- aeson-streams
- aeson-t
- aeson-toolkit
- aeson-typescript
- aeson-utils
- aeson-via
- aeson-with
@ -1177,7 +1176,6 @@ broken-packages:
- dockerfile-creator
- docrecords
- doctest-discover-configurator
- doctest-parallel
- doctest-prop
- docusign-example
- docvim
@ -3860,6 +3858,7 @@ broken-packages:
- persistent-odbc
- persistent-protobuf
- persistent-ratelimit
- persistent-stm
- persistent-template-classy
- persistent-typed-db
- persistent-zookeeper

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

@ -89,6 +89,8 @@ default-package-overrides:
- patch < 0.0.7
- reflex < 0.8.2.1
- reflex-dom-core < 0.7.0.2
# Downgrade hasql-dynamic-statements until hasql 1.6 is in Stackage
- hasql-dynamic-statements < 0.3.1.2
extra-packages:
- aeson < 2 # required by pantry-0.5.2

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

@ -1,4 +1,4 @@
# Stackage LTS 19.15
# Stackage LTS 19.16
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -16,8 +16,8 @@ default-package-overrides:
- adjunctions ==4.4.1
- adler32 ==0.1.2.0
- advent-of-code-api ==0.2.8.1
- aern2-mp ==0.2.8.0
- aern2-real ==0.2.8.0
- aern2-mp ==0.2.9.1
- aern2-real ==0.2.9.1
- aeson ==2.0.3.0
- aeson-attoparsec ==0.0.0
- aeson-better-errors ==0.9.1.1
@ -293,7 +293,7 @@ default-package-overrides:
- case-insensitive ==1.2.1.0
- cases ==0.1.4.1
- casing ==0.1.4.1
- cassava ==0.5.2.0
- cassava ==0.5.3.0
- cassava-conduit ==0.6.0
- cassava-megaparsec ==2.0.4
- cast ==0.1.0.2
@ -333,7 +333,7 @@ default-package-overrides:
- cipher-des ==0.0.6
- cipher-rc4 ==0.1.4
- circle-packing ==0.1.0.6
- circular ==0.4.0.2
- circular ==0.4.0.3
- citeproc ==0.6.0.1
- clash-ghc ==1.6.3
- clash-lib ==1.6.3
@ -581,7 +581,7 @@ default-package-overrides:
- di-monad ==1.3.1
- directory-tree ==0.12.1
- direct-sqlite ==2.3.27
- dirichlet ==0.1.0.6
- dirichlet ==0.1.0.7
- discount ==0.1.1
- discover-instances ==0.1.0.0
- discrimination ==0.4.1
@ -813,7 +813,7 @@ default-package-overrides:
- function-builder ==0.3.0.1
- functor-classes-compat ==2.0.0.2
- functor-combinators ==0.4.1.0
- fused-effects ==1.1.1.3
- fused-effects ==1.1.2.0
- fusion-plugin ==0.2.4
- fusion-plugin-types ==0.1.0
- fuzzcheck ==0.1.1
@ -898,6 +898,7 @@ default-package-overrides:
- 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
@ -909,7 +910,7 @@ default-package-overrides:
- gi-gtk ==3.0.38
- gi-gtk-hs ==0.3.12
- gi-gtksource ==3.0.25
- gi-harfbuzz ==0.0.5
- gi-harfbuzz ==0.0.6
- gi-javascriptcore ==4.0.24
- ginger ==0.10.4.0
- gi-pango ==1.0.26
@ -1036,7 +1037,7 @@ default-package-overrides:
- hedn ==0.3.0.4
- here ==1.2.13
- heredoc ==0.2.0.0
- heterocephalus ==1.0.5.6
- heterocephalus ==1.0.5.7
- hex ==0.2.0
- hexml ==0.3.4
- hexpat ==0.20.13
@ -1392,8 +1393,8 @@ default-package-overrides:
- lens-action ==0.2.6
- lens-aeson ==1.1.3
- lens-csv ==0.1.1.0
- lens-family ==2.1.1
- lens-family-core ==2.1.0
- lens-family ==2.1.2
- lens-family-core ==2.1.2
- lens-family-th ==0.5.2.1
- lens-misc ==0.0.2.0
- lens-process ==0.4.0.0
@ -1422,7 +1423,7 @@ default-package-overrides:
- linear-circuit ==0.1.0.4
- linebreak ==1.1.0.1
- linenoise ==0.3.2
- linux-capabilities ==0.1.0.0
- linux-capabilities ==0.1.1.0
- linux-file-extents ==0.2.0.0
- linux-namespaces ==0.1.3.0
- List ==0.6.2
@ -1430,7 +1431,7 @@ 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.2
- list-t ==1.0.5.3
- list-transformer ==1.0.8
- ListTree ==0.2.3
- ListZipper ==1.2.0.2
@ -1484,7 +1485,7 @@ default-package-overrides:
- massiv-persist ==1.0.0.3
- massiv-serialise ==1.0.0.2
- massiv-test ==1.0.0.0
- mathexpr ==0.3.0.0
- mathexpr ==0.3.1.0
- math-extras ==0.1.1.0
- math-functions ==0.3.4.2
- matplotlib ==0.7.7
@ -1539,7 +1540,7 @@ default-package-overrides:
- mintty ==0.1.4
- missing-foreign ==0.1.1
- MissingH ==1.5.0.1
- mixed-types-num ==0.5.9.1
- mixed-types-num ==0.5.10
- mmap ==0.5.9
- mmark ==0.0.7.6
- mmark-cli ==0.0.5.1
@ -1660,7 +1661,7 @@ default-package-overrides:
- network-wait ==0.1.2.0
- newtype ==0.2.2.0
- newtype-generics ==0.6.2
- nfc ==0.1.0
- nfc ==0.1.1
- nicify-lib ==1.0.1
- NineP ==0.0.2.1
- nix-derivation ==1.1.2
@ -1749,7 +1750,7 @@ default-package-overrides:
- pandoc ==2.17.1.1
- pandoc-csv2table ==1.0.9
- pandoc-dhall-decoder ==0.1.0.1
- pandoc-lua-marshal ==0.1.6.1
- pandoc-lua-marshal ==0.1.7
- pandoc-plot ==1.4.1
- pandoc-throw ==0.1.0.0
- pandoc-types ==1.22.2
@ -1785,7 +1786,7 @@ default-package-overrides:
- path-utils ==0.1.1.0
- pathwalk ==0.3.1.2
- pattern-arrows ==0.0.2
- pava ==0.1.1.3
- pava ==0.1.1.4
- pcg-random ==0.1.3.7
- pcre2 ==2.1.1.1
- pcre-heavy ==1.0.0.2
@ -2046,7 +2047,7 @@ default-package-overrides:
- regex-pcre-builtin ==0.95.2.3.8.44
- regex-posix ==0.96.0.1
- regex-posix-clib ==2.7
- regex-tdfa ==1.3.1.2
- regex-tdfa ==1.3.1.4
- regex-with-pcre ==1.1.0.2
- reinterpret-cast ==0.1.0
- rel8 ==1.3.1.0
@ -2070,7 +2071,7 @@ default-package-overrides:
- resource-pool ==0.2.3.2
- resourcet ==1.2.6
- result ==0.2.6.0
- retry ==0.9.2.1
- retry ==0.9.3.0
- rev-state ==0.1.2
- rfc1751 ==0.1.3
- rfc5051 ==0.2
@ -2117,7 +2118,7 @@ default-package-overrides:
- sample-frame ==0.0.3
- sample-frame-np ==0.0.4.1
- sampling ==0.3.5
- sandwich ==0.1.0.9
- sandwich ==0.1.0.10
- sandwich-quickcheck ==0.1.0.6
- sandwich-slack ==0.1.0.6
- say ==0.1.0.1

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

@ -1033,7 +1033,6 @@ dont-distribute-packages:
- condor
- conductive-hsc3
- conductive-song
- conduit-aeson
- conduit-throttle
- conduit-vfs-zip
- confcrypt
@ -3311,7 +3310,6 @@ dont-distribute-packages:
- regex-genex
- regex-pcre-text
- regex-pderiv
- regex-tdfa_1_3_2
- regex-xmlschema
- regexchar
- regexp-tries
@ -3534,7 +3532,6 @@ dont-distribute-packages:
- servant-streaming-server
- servant-swagger-tags
- servant-to-elm
- servant-typescript
- servant-util
- servant-util-beam-pg
- servant-waargonaut

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

@ -858,6 +858,16 @@ self: super: builtins.intersectAttrs super {
);
hercules-ci-cnix-store = super.hercules-ci-cnix-store.override { nix = pkgs.nixVersions.nix_2_9; };
# the testsuite fails because of not finding tsc without some help
aeson-typescript = overrideCabal (drv: {
testToolDepends = drv.testToolDepends or [] ++ [ pkgs.nodePackages.typescript ];
# the testsuite assumes that tsc is in the PATH if it thinks it's in
# CI, otherwise trying to install it.
#
# https://github.com/codedownio/aeson-typescript/blob/ee1a87fcab8a548c69e46685ce91465a7462be89/test/Util.hs#L27-L33
preCheck = "export CI=true";
}) super.aeson-typescript;
# Enable extra optimisations which increase build time, but also
# later compiler performance, so we should do this for user's benefit.
# Flag added in Agda 2.6.2
@ -978,7 +988,6 @@ self: super: builtins.intersectAttrs super {
hls-floskell-plugin
hls-fourmolu-plugin
hls-module-name-plugin
hls-ormolu-plugin
hls-pragmas-plugin
hls-splice-plugin;
# Tests have file permissions expections that don‘t work with the nix store.
@ -994,6 +1003,7 @@ self: super: builtins.intersectAttrs super {
hls-tactics-plugin = dontCheck super.hls-tactics-plugin;
hls-call-hierarchy-plugin = dontCheck super.hls-call-hierarchy-plugin;
hls-selection-range-plugin = dontCheck super.hls-selection-range-plugin;
hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin;
# Wants to execute cabal-install to (re-)build itself
hint = dontCheck super.hint;

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

File diff suppressed because it is too large Load Diff

2
pkgs/top-level/release-haskell.nix
View File

@ -326,6 +326,7 @@ let
random
QuickCheck
cabal2nix
terminfo # isn't bundled for cross
xhtml # isn't bundled for cross
;
};
@ -337,6 +338,7 @@ let
random
QuickCheck
cabal2nix
terminfo # isn't bundled for cross
xhtml # isn't bundled for cross
;
};