ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 05:43:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #231162 from NixOS/haskell-updates

Browse Source 
haskellPackages: update stackage and hackage
This commit is contained in:
sternenseemann 2023-05-20 01:43:15 +02:00 committed by GitHub
commit f5f6305d8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 779 additions and 833 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
maintainers/scripts/haskell/merge-and-open-pr.sh
View File

@ -53,6 +53,10 @@ if ! gh auth status 2>/dev/null ; then
die "You must setup the \`gh\` command. Run \`gh auth login\`."
fi
# Make sure this is configured before we start doing anything
push_remote="$(git config branch.haskell-updates.pushRemote \
|| die 'Can'\''t determine pushRemote for haskell-updates. Please set using `git config branch.haskell-updates.pushremote <remote name>`.')"
# Fetch nixpkgs to get an up-to-date origin/haskell-updates branch.
echo "Fetching origin..."
git fetch origin >/dev/null
@ -89,8 +93,8 @@ echo "Regenerating Hackage packages..."
./maintainers/scripts/haskell/regenerate-hackage-packages.sh --fast --do-commit
# Push these new commits to the haskell-updates branch
echo "Pushing commits just created to the remote haskell-updates branch..."
git push
echo "Pushing commits just created to the remote $push_remote/haskell-updates branch..."
git push "$push_remote" haskell-updates
# Open new PR
new_pr_body=$(cat <<EOF

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

@ -1,6 +1,6 @@
{
"commit": "54b1e8a3a0447c7b969fd97816c4c0821ba9fec1",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/54b1e8a3a0447c7b969fd97816c4c0821ba9fec1.tar.gz",
"sha256": "1lryj166qysqkmdy9ll15dvg9f797zmy8brzpbavxb149pa6b0j9",
"msg": "Update from Hackage at 2023-04-29T17:51:14Z"
"commit": "c607134983625cc3fc664211145b7f31dff95d1c",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/c607134983625cc3fc664211145b7f31dff95d1c.tar.gz",
"sha256": "10frbz00cbklr3k0y45qd0wb9rwln7ivm05nb9lq7vl9a9dxx93w",
"msg": "Update from Hackage at 2023-05-10T18:33:26Z"
}

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

@ -209,9 +209,6 @@ self: super: {
### END HASKELL-LANGUAGE-SERVER SECTION ###
###########################################
# Remove when Stackage LTS advances to this version, should be LTS-20.20
utility-ht = doDistribute self.utility-ht_0_0_17;
vector = overrideCabal (old: {
# Too strict bounds on doctest which isn't used, but is part of the configuration
jailbreak = true;
@ -732,6 +729,14 @@ self: super: {
# https://github.com/commercialhaskell/stackage/issues/6584#issuecomment-1326522815
tasty-discover = assert super.tasty-discover.version == "4.2.2"; dontCheck super.tasty-discover;
# Too strict lower bound on tasty-hedgehog
# https://github.com/qfpl/tasty-hedgehog/issues/70
tasty-sugar = doJailbreak super.tasty-sugar;
# Too strict lower bound on aeson
# https://github.com/input-output-hk/hedgehog-extras/issues/39
hedgehog-extras = doJailbreak super.hedgehog-extras;
# Known issue with nondeterministic test suite failure
# https://github.com/nomeata/tasty-expected-failure/issues/21
tasty-expected-failure = dontCheck super.tasty-expected-failure;

4
pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
View File

@ -81,8 +81,8 @@ in {
dec = doJailbreak super.dec;
ed25519 = doJailbreak super.ed25519;
ghc-byteorder = doJailbreak super.ghc-byteorder;
ghc-lib = doDistribute self.ghc-lib-parser_9_4_4_20221225;
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_4_4_20221225;
ghc-lib = doDistribute self.ghc-lib_9_4_5_20230430;
ghc-lib-parser = doDistribute self.ghc-lib-parser_9_4_5_20230430;
ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_4_0_0;
hackage-security = doJailbreak super.hackage-security;
hashable-time = doJailbreak super.hashable-time;

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

@ -620,6 +620,7 @@ broken-packages:
- cassava-conduit
- cassava-records
- cassette
- castagnoli # failure in job https://hydra.nixos.org/build/219826672 at 2023-05-19
- castle
- catamorphism
- Catana
@ -5021,7 +5022,6 @@ broken-packages:
- sqlvalue-list
- srcinst
- srt-dhall
- srtree # dependency missing in job https://hydra.nixos.org/build/219208055 at 2023-05-10
- sscan
- ssh
- ssh-tunnel

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

@ -1,4 +1,4 @@
# Stackage LTS 20.19
# Stackage LTS 20.20
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -35,7 +35,7 @@ default-package-overrides:
- aeson-qq ==0.8.4
- aeson-schemas ==1.4.0.1
- aeson-typescript ==0.4.2.0
- aeson-value-parser ==0.19.7
- aeson-value-parser ==0.19.7.1
- aeson-yak ==0.1.1.3
- aeson-yaml ==1.1.0.1
- agda2lagda ==0.2021.6.1
@ -43,7 +43,7 @@ default-package-overrides:
- al ==0.1.4.2
- alarmclock ==0.7.0.6
- alerts ==0.1.2.0
- alex ==3.2.7.3
- alex ==3.2.7.4
- alex-meta ==0.3.0.13
- algebra ==4.3.1
- algebraic-graphs ==0.6.1
@ -257,7 +257,7 @@ default-package-overrides:
- butcher ==1.3.3.2
- bv ==0.5
- byteable ==0.1.1
- bytebuild ==0.3.12.0
- bytebuild ==0.3.13.0
- byte-count-reader ==0.10.1.10
- bytedump ==1.0
- bytehash ==0.1.0.0
@ -631,7 +631,7 @@ default-package-overrides:
- doldol ==0.4.1.2
- do-list ==1.0.1
- domain ==0.1.1.4
- domain-aeson ==0.1.1
- domain-aeson ==0.1.1.1
- domain-cereal ==0.1
- domain-core ==0.1.0.3
- domain-optics ==0.1.0.3
@ -658,7 +658,7 @@ default-package-overrides:
- dyre ==0.9.1
- eap ==0.9.0.2
- Earley ==0.13.0.1
- easy-file ==0.2.4
- easy-file ==0.2.5
- easy-logger ==0.1.0.7
- Ebnf2ps ==1.0.15
- echo ==0.1.4
@ -683,12 +683,12 @@ default-package-overrides:
- elm-bridge ==0.8.2
- elm-core-sources ==1.0.0
- elm-export ==0.6.0.1
- elynx ==0.7.1.0
- elynx-markov ==0.7.1.0
- elynx-nexus ==0.7.1.0
- elynx-seq ==0.7.1.0
- elynx-tools ==0.7.1.0
- elynx-tree ==0.7.1.0
- elynx ==0.7.2.0
- elynx-markov ==0.7.2.0
- elynx-nexus ==0.7.2.0
- elynx-seq ==0.7.2.0
- elynx-tools ==0.7.2.0
- elynx-tree ==0.7.2.0
- emacs-module ==0.1.1.1
- email-validate ==2.3.2.18
- emojis ==0.1.2
@ -858,7 +858,7 @@ default-package-overrides:
- generic-constraints ==1.1.1.1
- generic-data ==1.0.0.1
- generic-data-surgery ==0.3.0.0
- generic-deriving ==1.14.3
- generic-deriving ==1.14.4
- generic-functor ==1.1.0.0
- generic-lens ==2.2.2.0
- generic-lens-core ==2.2.1.0
@ -1089,7 +1089,7 @@ default-package-overrides:
- hgeometry-combinatorial ==0.14
- hidapi ==0.1.8
- hierarchical-clustering ==0.4.7
- hi-file-parser ==0.1.3.0
- hi-file-parser ==0.1.4.0
- highlighting-kate ==0.6.4
- hindent ==5.3.4
- hinfo ==0.0.3.0
@ -1370,7 +1370,7 @@ default-package-overrides:
- jl ==0.1.0
- jmacro ==0.6.18
- jose ==0.9
- jose-jwt ==0.9.4
- jose-jwt ==0.9.5
- js-chart ==2.9.4.1
- js-dgtable ==0.5.2
- js-flot ==0.8.3
@ -1504,6 +1504,7 @@ default-package-overrides:
- logstash ==0.1.0.3
- loop ==0.3.0
- lpeg ==1.0.4
- LPFP ==1.1
- lrucache ==1.2.0.1
- lrucaching ==0.3.3
- lua ==2.2.1
@ -1546,7 +1547,7 @@ default-package-overrides:
- matrix-market-attoparsec ==0.1.1.3
- matrix-static ==0.3
- maximal-cliques ==0.1.1
- mcmc ==0.8.1.0
- mcmc ==0.8.2.0
- mcmc-types ==1.0.3
- median-stream ==0.7.0.0
- med-module ==0.1.2.2
@ -1576,7 +1577,7 @@ default-package-overrides:
- microlens-mtl ==0.2.0.3
- microlens-platform ==0.4.2.1
- microlens-process ==0.2.0.2
- microlens-th ==0.4.3.12
- microlens-th ==0.4.3.13
- microspec ==0.2.1.3
- microstache ==1.0.2.3
- midair ==0.2.0.1
@ -1652,15 +1653,15 @@ default-package-overrides:
- mono-traversable-instances ==0.1.1.0
- mono-traversable-keys ==0.2.0
- more-containers ==0.2.2.2
- morpheus-graphql ==0.27.2
- morpheus-graphql-app ==0.27.2
- morpheus-graphql-client ==0.27.2
- morpheus-graphql-code-gen ==0.27.2
- morpheus-graphql-code-gen-utils ==0.27.2
- morpheus-graphql-core ==0.27.2
- morpheus-graphql-server ==0.27.2
- morpheus-graphql-subscriptions ==0.27.2
- morpheus-graphql-tests ==0.27.2
- morpheus-graphql ==0.27.3
- morpheus-graphql-app ==0.27.3
- morpheus-graphql-client ==0.27.3
- morpheus-graphql-code-gen ==0.27.3
- morpheus-graphql-code-gen-utils ==0.27.3
- morpheus-graphql-core ==0.27.3
- morpheus-graphql-server ==0.27.3
- morpheus-graphql-subscriptions ==0.27.3
- morpheus-graphql-tests ==0.27.3
- moss ==0.2.0.1
- mountpoints ==1.0.2
- mpi-hs ==0.7.2.0
@ -1677,7 +1678,7 @@ default-package-overrides:
- murmur3 ==1.0.5
- murmur-hash ==0.1.0.10
- MusicBrainz ==0.4.1
- mustache ==2.4.1
- mustache ==2.4.2
- mutable-containers ==0.3.4.1
- mwc-probability ==2.3.1
- mwc-random ==0.15.0.2
@ -1712,7 +1713,7 @@ default-package-overrides:
- netwire ==5.0.3
- netwire-input ==0.0.7
- netwire-input-glfw ==0.0.11
- network ==3.1.2.8
- network ==3.1.2.9
- network-bsd ==2.8.1.0
- network-byte-order ==0.1.6
- network-conduit-tls ==1.3.2
@ -1864,7 +1865,7 @@ default-package-overrides:
- pattern-arrows ==0.0.2
- pava ==0.1.1.4
- pcf-font ==0.2.2.1
- pcg-random ==0.1.3.7
- pcg-random ==0.1.4.0
- pcre2 ==2.1.1.1
- pcre-heavy ==1.0.0.3
- pcre-light ==0.4.1.0
@ -1902,7 +1903,7 @@ default-package-overrides:
- phatsort ==0.5.0.1
- picosat ==0.1.6
- pid1 ==0.1.3.1
- pinch ==0.4.2.0
- pinch ==0.4.3.0
- pipes ==4.3.16
- pipes-attoparsec ==0.5.1.5
- pipes-bytestring ==2.1.7
@ -2035,7 +2036,7 @@ default-package-overrides:
- PyF ==0.11.1.1
- qchas ==1.1.0.1
- qm-interpolated-string ==0.3.1.0
- qrcode-core ==0.9.7
- qrcode-core ==0.9.8
- qrcode-juicypixels ==0.8.5
- quadratic-irrational ==0.1.1
- QuasiText ==0.1.2.6
@ -2180,7 +2181,7 @@ default-package-overrides:
- rss-conduit ==0.6.0.1
- run-haskell-module ==0.0.2
- runmemo ==1.0.0.1
- run-st ==0.1.1.0
- run-st ==0.1.3.0
- rvar ==0.3.0.2
- s3-signer ==0.5.0.0
- safe ==0.3.19
@ -2204,7 +2205,7 @@ default-package-overrides:
- sampling ==0.3.5
- sandi ==0.5
- sandwich ==0.1.3.2
- sandwich-hedgehog ==0.1.1.0
- sandwich-hedgehog ==0.1.3.0
- sandwich-quickcheck ==0.1.0.7
- sandwich-slack ==0.1.1.0
- sandwich-webdriver ==0.1.2.0
@ -2334,6 +2335,7 @@ default-package-overrides:
- simple-media-timestamp ==0.2.1.0
- simple-media-timestamp-attoparsec ==0.1.0.0
- simple-media-timestamp-formatting ==0.1.1.0
- simple-prompt ==0.1.0
- simple-reflect ==0.3.3
- simple-sendfile ==0.2.31
- simple-vec3 ==0.6.0.1
@ -2359,7 +2361,7 @@ default-package-overrides:
- skylighting-format-latex ==0.1
- slack-progressbar ==0.1.0.1
- slave-thread ==1.1.0.2
- slynx ==0.7.1.0
- slynx ==0.7.2.0
- smallcheck ==1.2.1
- smtp-mail ==0.3.0.0
- snowflake ==0.1.1.1
@ -2490,7 +2492,7 @@ default-package-overrides:
- sydtest-aeson ==0.1.0.0
- sydtest-amqp ==0.1.0.0
- sydtest-autodocodec ==0.0.0.0
- sydtest-discover ==0.0.0.2
- sydtest-discover ==0.0.0.3
- sydtest-hedgehog ==0.3.0.1
- sydtest-hedis ==0.0.0.0
- sydtest-hspec ==0.3.0.2
@ -2540,7 +2542,7 @@ default-package-overrides:
- tasty-hedgehog ==1.3.1.0
- tasty-hslua ==1.0.2
- tasty-hspec ==1.2.0.2
- tasty-html ==0.4.1.4
- tasty-html ==0.4.2.1
- tasty-hunit ==0.10.0.3
- tasty-hunit-compat ==0.2.0.1
- tasty-inspection-testing ==0.1.0.1
@ -2562,7 +2564,7 @@ default-package-overrides:
- teardown ==0.5.0.1
- telegram-bot-simple ==0.6.2
- template ==0.2.0.10
- template-haskell-compat-v0208 ==0.1.9.1
- template-haskell-compat-v0208 ==0.1.9.2
- temporary ==1.3
- temporary-rc ==1.2.0.3
- temporary-resourcet ==0.1.0.1
@ -2640,7 +2642,7 @@ default-package-overrides:
- tidal-link ==1.0.1
- tile ==0.3.0.0
- time-compat ==1.9.6.1
- time-domain ==0.1.0.1
- time-domain ==0.1.0.2
- timeit ==2.0
- timelens ==0.2.0.2
- time-lens ==0.4.0.2
@ -2662,7 +2664,7 @@ default-package-overrides:
- tls ==1.5.8
- tls-debug ==0.4.8
- tls-session-manager ==0.0.4
- tlynx ==0.7.1.0
- tlynx ==0.7.2.0
- tmapchan ==0.0.3
- tmapmvar ==0.0.4
- tmp-postgres ==1.34.1.0
@ -2786,7 +2788,7 @@ default-package-overrides:
- users-postgresql-simple ==0.5.0.2
- users-test ==0.5.0.1
- utf8-string ==1.0.2
- utility-ht ==0.0.16
- utility-ht ==0.0.17
- uuid ==1.3.15
- uuid-types ==1.0.5
- valida ==1.1.0
@ -2882,9 +2884,9 @@ default-package-overrides:
- webdriver ==0.10.0.1
- webex-teams-api ==0.2.0.1
- webex-teams-conduit ==0.2.0.1
- webgear-core ==1.0.4
- webgear-openapi ==1.0.4
- webgear-server ==1.0.4
- webgear-core ==1.0.5
- webgear-openapi ==1.0.5
- webgear-server ==1.0.5
- webpage ==0.0.5.1
- web-plugins ==0.4.1
- web-routes ==0.27.15

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

@ -1283,7 +1283,6 @@ dont-distribute-packages:
- doc-review
- domain
- domain-aeson
- domain-aeson_0_1_1_1
- domain-cereal
- domaindriven
- dormouse-client
@ -1448,6 +1447,7 @@ dont-distribute-packages:
- feature-flipper-postgres
- fedora-composes
- fedora-img-dl
- fedora-repoquery
- feed-gipeda
- feed-translator
- feed2lj
@ -1514,7 +1514,7 @@ dont-distribute-packages:
- fpnla-examples
- frame-markdown
- freckle-app
- freckle-app_1_9_0_0
- freckle-app_1_9_0_1
- free-functors
- free-game
- free-theorems-counterexamples
@ -3007,7 +3007,6 @@ dont-distribute-packages:
- pandoc-crossref_0_3_15_2
- pandoc-highlighting-extensions
- pandoc-japanese-filters
- pandoc-symreg
- pandora-io
- papa
- papa-base

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

File diff suppressed because it is too large Load Diff