Merge pull request #171763 from NixOS/haskell-updates

haskellPackages: update stackage and hackage
This commit is contained in:
Ellie Hermaszewska 2022-05-10 21:57:02 +08:00 committed by GitHub
commit 67c5e7275c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 522 additions and 611 deletions

View file

@ -1,6 +1,6 @@
{
"commit": "08ae12813ead00810e00ffe9dae284fcafe6a08a",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/08ae12813ead00810e00ffe9dae284fcafe6a08a.tar.gz",
"sha256": "00jc08pifnp791s1scscdhgwlf75v9682a7vjis1djnhj3y5s3ny",
"msg": "Update from Hackage at 2022-05-01T06:09:30Z"
"commit": "78324aa49909392e169c86bbfd204694523907e8",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/78324aa49909392e169c86bbfd204694523907e8.tar.gz",
"sha256": "15k5ag36asswwv8yazq53lkj9blnz4hzlq23cznvvk5pkjpdm0ni",
"msg": "Update from Hackage at 2022-05-05T15:07:55Z"
}

View file

@ -8,10 +8,10 @@
}:
mkDerivation {
pname = "cabal2nix";
version = "unstable-2021-10-23";
version = "unstable-2022-04-27";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/8aeef87436468a416e5908b48ec82ac3f15eb885.tar.gz";
sha256 = "1w6wabp0v2fii5i28nsp0ss6dsz222p94mmxrrns3q0df82s2cm1";
url = "https://github.com/NixOS/cabal2nix/archive/40823c793b4b8588fcfedc8fb147c1a92cfa577d.tar.gz";
sha256 = "0gr8hafa282m4qw5y5wrqiwm1a3fl3b7xicnzixss6nlmxmi2skp";
};
isLibrary = true;
isExecutable = true;

View file

@ -105,12 +105,9 @@ self: super: {
# We disable profiling on aarch64, so tests naturally fail
ghc-prof = dontCheck super.ghc-prof;
} // lib.optionalAttrs (pkgs.stdenv.hostPlatform.isAarch64 && builtins.compareVersions super.ghc.version "9.2" < 0) {
# Some aarch64 issues have been fixed since 9.2
# Similar RTS issue in test suite:
# rts/linker/elf_reloc_aarch64.c:98: encodeAddendAarch64: Assertion `isInt64(21+12, addend)' failed.
# Fixed since 9.2
# These still fail sporadically on ghc 9.2
hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin;
hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin;
hls-rename-plugin = dontCheck super.hls-rename-plugin;

View file

@ -99,7 +99,7 @@ self: super: {
name = "git-annex-${super.git-annex.version}-src";
url = "git://git-annex.branchable.com/";
rev = "refs/tags/" + super.git-annex.version;
sha256 = "066gs2lkkiz9z9n6rjg33wmgi04qmn6xpnx86j0x3d56r1110id4";
sha256 = "sha256-NYe34bsq2v0rlmcSMgYvU9ec94meXFFJoWo0sIjX/bY=";
# delete android and Android directories which cause issues on
# darwin (case insensitive directory). Since we don't need them
# during the build process, we can delete it to prevent a hash

View file

@ -117,6 +117,7 @@ broken-packages:
- alerta
- alex-prelude
- alfred
- alfred-margaret
- alga
- algebra-dag
- algebraic-classes
@ -1013,6 +1014,7 @@ broken-packages:
- dbf
- DBlimited
- dbm
- dbmigrations
- dbmigrations-mysql
- dbmigrations-postgresql
- dbmigrations-sqlite
@ -1914,6 +1916,7 @@ broken-packages:
- HandlerSocketClient
- handsy
- Hangman
- HangmanAscii
- hannahci
- hans
- hanspell
@ -2905,6 +2908,7 @@ broken-packages:
- layers
- layout
- layout-bootstrap
- layout-rules
- lazify
- lazyarray
- lazyboy
@ -3913,6 +3917,7 @@ broken-packages:
- plzwrk
- pngload-fixed
- pocket
- podenv
- pointedalternative
- pointfree-fancy
- pointful
@ -4628,6 +4633,7 @@ broken-packages:
- simple-templates
- simple-ui
- simple-units
- simple-vec3
- simplexmq
- simple-zipper
- simplistic-generics

View file

@ -83,7 +83,7 @@ default-package-overrides:
- hnix < 0.15
# needs http-client >= 0.7.11 which isn't part of Stackage LTS 18
- http-client-restricted < 0.0.5
# Needs dhall 1.41.*, Stackage Nightly has 1.40
# Needs dhall 1.41.*, Stackage LTS 19 has 1.40
- dhall-nix < 1.1.24
extra-packages:

View file

@ -1,4 +1,4 @@
# Stackage LTS 19.5
# Stackage LTS 19.6
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -56,7 +56,7 @@ default-package-overrides:
- amqp ==0.22.1
- amqp-utils ==0.6.3.2
- annotated-wl-pprint ==0.7.0
- ansi-terminal ==0.11.1
- ansi-terminal ==0.11.3
- ansi-terminal-game ==1.8.0.0
- ansi-wl-pprint ==0.6.9
- ANum ==0.2.0.2
@ -427,10 +427,9 @@ default-package-overrides:
- convertible ==1.1.1.0
- cookie ==0.4.5
- copr-api ==0.1.0
- core-data ==0.3.2.1
- core-program ==0.4.5.1
- core-telemetry ==0.1.9.3
- core-text ==0.3.5.0
- core-data ==0.3.2.2
- core-program ==0.4.6.1
- core-text ==0.3.7.1
- countable ==1.0
- covariance ==0.1.0.6
- cpphs ==1.20.9.1
@ -700,7 +699,7 @@ default-package-overrides:
- every ==0.0.1
- evm-opcodes ==0.1.1
- exact-combinatorics ==0.2.0.11
- exact-pi ==0.5.0.1
- exact-pi ==0.5.0.2
- exception-hierarchy ==0.1.0.6
- exception-mtl ==0.4.0.1
- exception-transformers ==0.4.0.11
@ -1012,7 +1011,7 @@ default-package-overrides:
- hasql-optparse-applicative ==0.3.0.8
- hasql-pool ==0.5.2.2
- hasql-queue ==1.2.0.2
- hasql-th ==0.4.0.12
- hasql-th ==0.4.0.14
- hasql-transaction ==1.0.1.1
- has-transformers ==0.1.0.4
- hasty-hamiltonian ==1.3.4
@ -1883,7 +1882,7 @@ default-package-overrides:
- postgresql-schema ==0.1.14
- postgresql-simple ==0.6.4
- postgresql-simple-url ==0.2.1.0
- postgresql-syntax ==0.4.0.2
- postgresql-syntax ==0.4.1
- postgresql-typed ==0.6.2.1
- post-mess-age ==0.2.1.0
- pptable ==0.3.0.0
@ -1948,7 +1947,7 @@ default-package-overrides:
- psql-helpers ==0.1.0.0
- psqueues ==0.2.7.3
- pthread ==0.2.1
- ptr-poker ==0.1.2.5
- ptr-poker ==0.1.2.8
- pulse-simple ==0.1.14
- pureMD5 ==2.1.4
- purescript-bridge ==0.14.0.0
@ -2079,7 +2078,7 @@ default-package-overrides:
- rhine ==0.7.1
- rhine-gloss ==0.7.1
- riak-protobuf ==0.25.0.0
- rio ==0.1.21.0
- rio ==0.1.22.0
- rio-orphans ==0.1.2.0
- rio-prettyprint ==0.1.1.0
- rng-utils ==0.3.1
@ -2212,7 +2211,7 @@ default-package-overrides:
- shake ==0.19.6
- shake-language-c ==0.12.0
- shake-plus ==0.3.4.0
- shakespeare ==2.0.26
- shakespeare ==2.0.27
- shared-memory ==0.2.0.0
- ShellCheck ==0.8.0
- shell-conduit ==5.0.0
@ -2229,7 +2228,7 @@ default-package-overrides:
- silently ==1.2.5.2
- simple-affine-space ==0.1.1
- simple-cabal ==0.1.3
- simple-cmd ==0.2.4
- simple-cmd ==0.2.5
- simple-cmd-args ==0.1.7
- simple-log ==0.9.12
- simple-media-timestamp ==0.2.0.0
@ -2259,8 +2258,8 @@ default-package-overrides:
- slist ==0.2.0.0
- slynx ==0.6.1.1
- smallcheck ==1.2.1
- smash ==0.1.2
- smash-microlens ==0.1.0.0
- smash ==0.1.3
- smash-microlens ==0.1.0.2
- smtp-mail ==0.3.0.0
- snap-blaze ==0.2.1.5
- snap-core ==1.0.5.0
@ -2338,7 +2337,7 @@ default-package-overrides:
- storable-record ==0.0.6
- storable-tuple ==0.0.3.3
- storablevector ==0.2.13.1
- store ==0.7.14
- store ==0.7.15
- store-core ==0.4.4.4
- store-streaming ==0.2.0.3
- Stream ==0.4.7.2
@ -2639,7 +2638,7 @@ default-package-overrides:
- unix-bytestring ==0.3.7.6
- unix-compat ==0.5.4
- unix-time ==0.4.7
- unliftio ==0.2.21.0
- unliftio ==0.2.22.0
- unliftio-core ==0.2.0.1
- unliftio-path ==0.0.2.0
- unliftio-pool ==0.2.1.1
@ -2664,14 +2663,14 @@ default-package-overrides:
- valida-base ==0.2.0
- validate-input ==0.5.0.0
- validation ==1.1.2
- validity ==0.12.0.0
- validity ==0.12.0.1
- validity-bytestring ==0.4.1.1
- validity-containers ==0.5.0.4
- validity-path ==0.4.0.1
- validity-persistent ==0.0.0.0
- validity-primitive ==0.0.0.1
- validity-scientific ==0.2.0.3
- validity-text ==0.3.1.2
- validity-text ==0.3.1.3
- validity-time ==0.5.0.0
- validity-unordered-containers ==0.2.0.3
- validity-uuid ==0.1.0.3
@ -2841,7 +2840,7 @@ default-package-overrides:
- yesod-auth-hashdb ==1.7.1.7
- yesod-auth-oauth2 ==0.7.0.1
- yesod-bin ==1.6.2.1
- yesod-core ==1.6.23
- yesod-core ==1.6.23.1
- yesod-eventsource ==1.6.0.1
- yesod-form ==1.7.0
- yesod-form-bootstrap4 ==3.0.1

View file

@ -666,7 +666,7 @@ dont-distribute-packages:
- ascii
- ascii-cows
- ascii-table
- ascii_1_2_2_0
- ascii_1_2_3_0
- asic
- asif
- assert4hs-hspec

File diff suppressed because it is too large Load diff