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

Merge pull request #156491 from NixOS/haskell-updates

Browse Source 
haskellPackages: update stackage and hackage
This commit is contained in:
maralorn 2022-01-27 18:01:42 +01:00 committed by GitHub
commit 037eb0a617
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 571 additions and 410 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": "6f406277d7106375f7148466c985061d20cb028b",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/6f406277d7106375f7148466c985061d20cb028b.tar.gz",
"sha256": "0jvxybgv975lmk268x12dlp8xxv12vmpwc00k3nv6qqp0xd9bwla",
"msg": "Update from Hackage at 2022-01-18T22:54:05Z"
"commit": "3034b8f1052c41d5b3c571cb2bedb5f62bbede65",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/3034b8f1052c41d5b3c571cb2bedb5f62bbede65.tar.gz",
"sha256": "0kqga1mf7vr292jcaqw8qk4s1bjwc2z1wwjih5xwli3hkk584l20",
"msg": "Update from Hackage at 2022-01-24T10:21:35Z"
}

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

@ -54,9 +54,9 @@ self: super: {
# There's an open PR updating the lower bound for `network`:
# > https://github.com/abhinav/pinch/pull/46
# With that said version tracked for `network` right now is 3.1.1.1 so we're
# replacing the network pinch uses with `network_3_1_2_5` for now.
# replacing the network pinch uses with `network_3_1_2_7` for now.
pinch = super.pinch.overrideScope (self : super: {
network = self.network_3_1_2_5;
network = self.network_3_1_2_7;
});
# We can remove this once fakedata version gets to 1.0.1 as the test suite
@ -1524,10 +1524,7 @@ self: super: {
# Upstream issue: https://github.com/haskell-servant/servant-swagger/issues/129
servant-swagger = dontCheck super.servant-swagger;
# substituteInPlace: https://github.com/hercules-ci/hercules-ci-agent/issues/363
hercules-ci-agent = overrideCabal { preConfigure = ''
substituteInPlace hercules-ci-agent/Hercules/Agent/Cachix/Init.hs --replace "Cachix.Client.Env" "Cachix.Client.Version"
''; } (generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent);
hercules-ci-agent = generateOptparseApplicativeCompletion "hercules-ci-agent" super.hercules-ci-agent;
hercules-ci-cli = pkgs.lib.pipe super.hercules-ci-cli [
unmarkBroken
@ -2065,11 +2062,11 @@ self: super: {
# Needs network >= 3.1.2
quic = super.quic.overrideScope (self: super: {
network = self.network_3_1_2_5;
network = self.network_3_1_2_7;
});
http3 = super.http3.overrideScope (self: super: {
network = self.network_3_1_2_5;
network = self.network_3_1_2_7;
});
# Fixes https://github.com/NixOS/nixpkgs/issues/140613
@ -2104,7 +2101,7 @@ self: super: {
# Needs brick > 0.64
nix-tree = super.nix-tree.override {
brick = self.brick_0_66;
brick = self.brick_0_66_1;
};
# build newer version for `pkgs.shellcheck`

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

@ -127,7 +127,7 @@ self: super: {
indexed-traversable-instances = doJailbreak super.indexed-traversable-instances;
lifted-async = doJailbreak super.lifted-async;
lukko = doJailbreak super.lukko;
network = super.network_3_1_2_5;
network = super.network_3_1_2_7;
ormolu = self.ormolu_0_4_0_0;
OneTuple = super.OneTuple_0_3_1;
parallel = doJailbreak super.parallel;

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

@ -2032,6 +2032,7 @@ broken-packages:
- hasql-dynamic-statements
- hasql-generic
- hasql-simple
- hasql-transaction-io
- hastache
- haste
- haste-prim
@ -2219,6 +2220,7 @@ broken-packages:
- hlongurl
- hlrdb-core
- hls-exactprint-utils
- hls-rename-plugin
- hlwm
- hmarkup
- hmatrix-banded
@ -2598,6 +2600,7 @@ broken-packages:
- introduction
- intro-prelude
- invert
- invertible
- invertible-syntax
- io-capture
- io-choice
@ -5378,6 +5381,7 @@ broken-packages:
- weather-api
- webapi
- webapp
- webauthn
- WebBits
- webby
- webcloud

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

@ -1,4 +1,4 @@
# Stackage LTS 18.22
# Stackage LTS 18.23
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -280,6 +280,7 @@ default-package-overrides:
- BNFC ==2.9.3
- BNFC-meta ==0.6.1
- board-games ==0.3
- bodhi ==0.1.0
- boltzmann-samplers ==0.1.1.0
- Boolean ==0.2.4
- boolean-like ==0.1.1.0
@ -337,6 +338,7 @@ default-package-overrides:
- cabal-flatpak ==0.1.0.2
- cabal-plan ==0.7.2.0
- cabal-rpm ==2.0.10
- Cabal-syntax ==3.6.0.0
- cache ==0.1.3.0
- cached-json-file ==0.1.1
- cacophony ==0.10.1
@ -478,6 +480,7 @@ default-package-overrides:
- control-monad-omega ==0.3.2
- convertible ==1.1.1.0
- cookie ==0.4.5
- copr-api ==0.1.0
- core-data ==0.2.1.11
- core-program ==0.2.12.0
- core-text ==0.3.5.0
@ -579,7 +582,7 @@ default-package-overrides:
- declarative ==0.5.4
- deepseq-generics ==0.2.0.0
- deepseq-instances ==0.1.0.1
- deferred-folds ==0.9.18
- deferred-folds ==0.9.18.1
- dejafu ==2.4.0.3
- dense-linear-algebra ==0.1.0.0
- dependent-map ==0.4.0.0
@ -964,14 +967,14 @@ default-package-overrides:
- guarded-allocation ==0.0.1
- H ==0.9.0.1
- hackage-db ==2.1.2
- hackage-security ==0.6.0.1
- hackage-security ==0.6.2.0
- haddock-library ==1.10.0
- hadoop-streaming ==0.2.0.3
- hakyll-convert ==0.3.0.4
- hal ==0.4.8
- half ==0.3.1
- hall-symbols ==0.1.0.6
- hamtsolo ==1.0.3
- hamtsolo ==1.0.4
- HandsomeSoup ==0.4.2
- hapistrano ==0.4.3.0
- happstack-server ==7.7.1.2
@ -981,7 +984,7 @@ default-package-overrides:
- hasbolt ==0.1.6.1
- hashable ==1.3.0.0
- hashable-time ==0.2.1
- hashids ==1.0.2.4
- hashids ==1.0.2.7
- hashing ==0.1.0.1
- hashmap ==1.3.3
- hashtables ==1.2.4.2
@ -999,7 +1002,7 @@ default-package-overrides:
- haskell-src ==1.0.3.1
- haskell-src-exts ==1.23.1
- haskell-src-exts-util ==0.2.5
- haskell-src-meta ==0.8.7
- haskell-src-meta ==0.8.8
- haskey-btree ==0.3.0.1
- hasktags ==0.72.0
- hasql ==1.4.5.3
@ -1016,7 +1019,7 @@ default-package-overrides:
- hdaemonize ==0.5.6
- HDBC ==2.4.0.3
- HDBC-session ==0.1.2.0
- headroom ==0.4.2.0
- headroom ==0.4.3.0
- heap ==1.0.4
- heaps ==0.4
- hebrew-time ==0.1.2
@ -1130,6 +1133,7 @@ default-package-overrides:
- hspec-parsec ==0
- hspec-smallcheck ==0.5.2
- hspec-tables ==0.0.1
- hspec-tmp-proc ==0.5.0.1
- hspec-wai ==0.11.0
- hspec-wai-json ==0.11.0
- hs-php-session ==0.0.9.3
@ -1335,7 +1339,7 @@ default-package-overrides:
- lambdabot-core ==5.3.0.2
- LambdaHack ==0.10.3.0
- lame ==0.2.0
- language-avro ==0.1.3.1
- language-avro ==0.1.4.0
- language-bash ==0.9.2
- language-c ==0.9.0.1
- language-c-quote ==0.13
@ -1706,6 +1710,7 @@ default-package-overrides:
- packdeps ==0.6.0.0
- pager ==0.1.1.0
- pagination ==0.2.2
- pagure ==0.1.0
- pagure-cli ==0.2
- pandoc ==2.14.0.3
- pandoc-dhall-decoder ==0.1.0.1
@ -1747,6 +1752,7 @@ default-package-overrides:
- pcre-heavy ==1.0.0.2
- pcre-light ==0.4.1.0
- pcre-utils ==0.1.8.2
- pdc ==0.1.1
- pdfinfo ==1.5.4
- peano ==0.1.0.1
- pem ==0.2.4
@ -1757,15 +1763,15 @@ default-package-overrides:
- persist ==0.1.1.5
- persistable-record ==0.6.0.5
- persistable-types-HDBC-pg ==0.0.3.5
- persistent ==2.13.2.1
- persistent ==2.13.2.2
- persistent-mtl ==0.2.2.0
- persistent-mysql ==2.13.0.2
- persistent-pagination ==0.1.1.2
- persistent-postgresql ==2.13.2.1
- persistent-qq ==2.12.0.1
- persistent-sqlite ==2.13.0.3
- persistent-postgresql ==2.13.2.2
- persistent-qq ==2.12.0.2
- persistent-sqlite ==2.13.0.4
- persistent-template ==2.12.0.0
- persistent-test ==2.13.0.3
- persistent-test ==2.13.0.4
- persistent-typed-db ==0.1.0.5
- pg-harness-client ==0.6.0
- pgp-wordlist ==0.1.0.3
@ -2429,13 +2435,14 @@ default-package-overrides:
- tinylog ==0.15.0
- titlecase ==1.0.1
- tldr ==0.9.2
- tls ==1.5.6
- tls ==1.5.7
- tls-debug ==0.4.8
- tls-session-manager ==0.0.4
- tlynx ==0.5.1.1
- tmapchan ==0.0.3
- tmapmvar ==0.0.4
- tmp-postgres ==1.34.1.0
- tmp-proc ==0.5.0.1
- tomland ==1.3.2.0
- tonalude ==0.1.1.1
- topograph ==1.0.0.1
@ -2576,7 +2583,7 @@ default-package-overrides:
- vector-split ==1.0.0.2
- vector-th-unbox ==0.2.2
- verbosity ==0.4.0.0
- versions ==5.0.1
- versions ==5.0.2
- vformat ==0.14.1.0
- vformat-aeson ==0.1.0.1
- vformat-time ==0.1.0.0
@ -2597,6 +2604,7 @@ default-package-overrides:
- wai-middleware-auth ==0.2.5.1
- wai-middleware-caching ==0.1.0.2
- wai-middleware-clacks ==0.1.0.1
- wai-middleware-delegate ==0.1.2.4
- wai-middleware-prometheus ==1.0.0.1
- wai-middleware-static ==0.9.1
- wai-rate-limit ==0.1.0.0
@ -2653,10 +2661,10 @@ default-package-overrides:
- X11 ==1.10.2
- X11-xft ==0.3.4
- x11-xim ==0.0.9.0
- x509 ==1.7.5
- x509-store ==1.6.7
- x509-system ==1.6.6
- x509-validation ==1.6.11
- x509 ==1.7.6
- x509-store ==1.6.9
- x509-system ==1.6.7
- x509-validation ==1.6.12
- Xauth ==0.1
- xdg-basedir ==0.2.2
- xdg-userdirs ==0.1.0.2

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

@ -481,7 +481,7 @@ dont-distribute-packages:
- atuin
- audiovisual
- aura
- aura_3_2_6
- aura_3_2_7
- authoring
- autonix-deps-kf5
- avers
@ -1030,6 +1030,7 @@ dont-distribute-packages:
- edges
- editable
- effective-aspects-mzv
- eflint
- egison
- egison-pattern-src-haskell-mode
- egison-pattern-src-th-mode
@ -1784,6 +1785,7 @@ dont-distribute-packages:
- introduction-test
- intset
- invertible-hlist
- invertible-hxt
- ion
- ip
- ipatch
@ -2546,6 +2548,7 @@ dont-distribute-packages:
- reactor
- readpyc
- reanimate
- reanimate_1_1_5_0
- record-aeson
- record-gl
- record-preprocessor
@ -3057,6 +3060,7 @@ dont-distribute-packages:
- trasa-reflex
- trasa-server
- trasa-th
- traverse-code
- treemap-html-tools
- treersec
- trek-app
@ -3210,6 +3214,7 @@ dont-distribute-packages:
- warped
- wavesurfer
- wavy
- web-inv-route
- web-mongrel2
- web-page
- web-rep

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

File diff suppressed because it is too large Load Diff