3
0
Fork 0
forked from mirrors/nixpkgs

Merge pull request #225231 from NixOS/haskell-updates

haskellPackages: update stackage and hackage
This commit is contained in:
sternenseemann 2023-04-13 12:16:30 +02:00 committed by GitHub
commit e4050a496b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 1320 additions and 1020 deletions

View file

@ -112,6 +112,8 @@ The short version is this:
* We only do the merge if the [\`mergeable\`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/mergeable) job is succeeding on hydra.
* If a [\`maintained\`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/maintained) package is still broken at the time of merge, we will only merge if the maintainer has been pinged 7 days in advance. (If you care about a Haskell package, become a maintainer!)
More information about Haskell packages in nixpkgs can be found [in the nixpkgs manual](https://nixos.org/manual/nixpkgs/unstable/#haskell).
---
This is the follow-up to #${curr_haskell_updates_pr_num}. Come to [#haskell:nixos.org](https://matrix.to/#/#haskell:nixos.org) if you have any questions.

View file

@ -1,6 +1,6 @@
{
"commit": "cf82f82661a5662581a4385c693552b18009b7e2",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/cf82f82661a5662581a4385c693552b18009b7e2.tar.gz",
"sha256": "0wwyikl44dg5x6hirxxqdzbh4ixkpxknd4c0nacsc2mqpjm1wrwq",
"msg": "Update from Hackage at 2023-04-03T07:13:26Z"
"commit": "a88deb396b19367026b858afe79fa1d0e0c1bc4f",
"url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/a88deb396b19367026b858afe79fa1d0e0c1bc4f.tar.gz",
"sha256": "04l2jd0shw1aq74nv9hhvdn76bcwp2hsfm8x3frbxllwgkk740s4",
"msg": "Update from Hackage at 2023-04-07T21:49:23Z"
}

View file

@ -8,10 +8,10 @@
}:
mkDerivation {
pname = "cabal2nix";
version = "unstable-2023-02-27";
version = "unstable-2023-04-11";
src = fetchzip {
url = "https://github.com/NixOS/cabal2nix/archive/5e183d1ac819ea1beec3da6229d76d4185b026d0.tar.gz";
sha256 = "0picq2zzr3hnwzv86p07xymrp84kdb4q5b373a07xgqqqql1wn52";
url = "https://github.com/NixOS/cabal2nix/archive/010ff5c3b75d976d0f3a25b7caa0bc5bf2fdae9f.tar.gz";
sha256 = "1n38kmavdv6s1czqbiq6f6nagpv27s8xg0g0rvyh4l0x2my8wj4y";
};
postUnpack = "sourceRoot+=/cabal2nix; echo source root reset to $sourceRoot";
isLibrary = true;

View file

@ -284,7 +284,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 = "sha256-fZUQ/3q8w6BkFZRaezT7rpKQtAEGBR5qEc4rMm9I36c=";
sha256 = "0mz1b3vnschsndv42787mm6kybpb2yskkdss3rcm7xc6jjh815ik";
# 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
@ -1359,15 +1359,8 @@ self: super: {
# 2022-08-31: Jailbreak is done to allow aeson 2.0.*:
# https://github.com/haskell-CI/haskell-ci/commit/6ad0d5d701cbe101013335d597acaf5feadd3ab9#r82681900
cabal-install-parsers = doJailbreak (dontCheck (super.cabal-install-parsers.override {
Cabal-syntax = self.Cabal-syntax_3_8_1_0;
Cabal-syntax = self.Cabal-syntax_3_10_1_0;
}));
cabal-install-parsers_0_4_5 = doDistribute (
dontCheck (
super.cabal-install-parsers_0_4_5.override {
Cabal = self.Cabal_3_6_3_0;
}
)
);
# 2022-03-12: Pick patches from master for compat with Stackage Nightly
# 2022-12-07: Lift bounds to allow dependencies shipped with LTS-20
@ -2067,14 +2060,9 @@ self: super: {
gi-gtk-declarative = doJailbreak super.gi-gtk-declarative;
gi-gtk-declarative-app-simple = doJailbreak super.gi-gtk-declarative-app-simple;
# 2022-01-16 haskell-ci needs Cabal 3.6
haskell-ci = (appendPatches [
# Allow building with optparse-applicative 0.17* and ShellCheck 0.8.0
./patches/haskell-ci-optparse-applicative-0.17-ShellCheck-0.8.patch
] super.haskell-ci).overrideScope (self: super: {
Cabal = self.Cabal_3_6_3_0;
cabal-install-parsers = self.cabal-install-parsers_0_4_5;
ShellCheck = self.ShellCheck_0_8_0;
# 2023-04-09: haskell-ci needs Cabal-syntax 3.10
haskell-ci = super.haskell-ci.overrideScope (self: super: {
Cabal-syntax = self.Cabal-syntax_3_10_1_0;
});
large-hashable = lib.pipe (super.large-hashable.override {
@ -2554,6 +2542,15 @@ self: super: {
commonmark-extensions = lself.commonmark-extensions_0_2_3_2;
});
# Test files missing from sdist
# https://github.com/tweag/webauthn/issues/166
webauthn = dontCheck super.webauthn;
# Too strict lower bound on hspec
wai-token-bucket-ratelimiter =
assert lib.versionOlder self.hspec.version "2.10";
doJailbreak super.wai-token-bucket-ratelimiter;
# doctest <0.19
polysemy = doJailbreak super.polysemy;

View file

@ -207,8 +207,8 @@ in {
relative = "cborg";
}) super.cborg;
# https://github.com/tweag/ormolu/issues/941
ormolu = doDistribute self.ormolu_0_5_3_0;
# https://github.com/tweag/ormolu/issues/941
fourmolu = overrideCabal (drv: {
libraryHaskellDepends = drv.libraryHaskellDepends ++ [ self.file-embed ];
}) (disableCabalFlag "fixity-th" super.fourmolu_0_10_0_0);

View file

@ -1546,6 +1546,7 @@ broken-packages:
- fixer
- fixfile
- fixie
- fix-imports # dependency missing in job https://hydra.nixos.org/build/215306368 at 2023-04-11
- fix-symbols-gitit
- fizzbuzz
- fizzbuzz-as-a-service
@ -1707,6 +1708,7 @@ broken-packages:
- generic-match
- generic-maybe
- generic-override
- generic-persistence # failure in job https://hydra.nixos.org/build/215303659 at 2023-04-11
- generic-pretty
- generic-pretty-instances
- generic-records
@ -4243,6 +4245,7 @@ broken-packages:
- Proper
- properties
- property-list
- proquint # failure in job https://hydra.nixos.org/build/215308028 at 2023-04-11
- prosidy
- prosper
- proteaaudio

View file

@ -68,7 +68,6 @@ extra-packages:
- brick == 0.70.* # 2022-08-13: needed by matterhorn-50200.17.0
- brick-skylighting < 1.0 # 2022-08-13: needed by matterhorn-50200.17.0 to match brick
- brittany == 0.13.1.2 # 2022-09-20: needed for hls on ghc 8.8
- cabal-install-parsers < 0.5 # 2022-08-31: required by haskell-ci 0.14.3
- crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses
- dependent-map == 0.2.4.0 # required by Hasura 1.3.1, 2020-08-20
- dependent-sum == 0.4 # required by Hasura 1.3.1, 2020-08-20
@ -116,6 +115,7 @@ extra-packages:
- optparse-applicative < 0.16 # needed for niv-0.2.19
- ormolu == 0.1.4.1 # 2022-09-21: needed for hls on ghc 8.8
- ormolu == 0.2.* # 2022-02-21: For ghc 8.8 and 8.10
- ormolu == 0.5.* # 2022-04-12: For ghc 9.4
- pantry == 0.5.2.1 # needed for stack-2.7.3
- path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2
- relude == 0.7.0.0 # 2022-02-25: Needed for ema 0.6

View file

@ -1,4 +1,4 @@
# Stackage LTS 20.16
# Stackage LTS 20.17
# This file is auto-generated by
# maintainers/scripts/haskell/update-stackage.sh
default-package-overrides:
@ -10,7 +10,7 @@ default-package-overrides:
- ace ==0.6
- acid-state ==0.16.1.1
- action-permutations ==0.0.0.1
- active ==0.2.0.16
- active ==0.2.0.17
- ad ==4.5.4
- ad-delcont ==0.3.0.0
- adjunctions ==4.4.2
@ -64,7 +64,7 @@ default-package-overrides:
- ansi-wl-pprint ==0.6.9
- ANum ==0.2.0.2
- aos-signature ==0.1.1
- apecs ==0.9.4
- apecs ==0.9.5
- apecs-gloss ==0.2.4
- apecs-physics ==0.4.5
- api-field-json-th ==0.1.0.2
@ -166,7 +166,7 @@ default-package-overrides:
- bech32 ==1.1.2
- bech32-th ==1.1.1
- bench ==1.0.12
- benchpress ==0.2.2.21
- benchpress ==0.2.2.22
- bench-show ==0.3.2
- bencode ==0.6.1.1
- bencoding ==0.4.5.4
@ -624,7 +624,7 @@ default-package-overrides:
- doctemplates ==0.10.0.2
- doctest ==0.20.1
- doctest-discover ==0.2.0.0
- doctest-driver-gen ==0.3.0.6
- doctest-driver-gen ==0.3.0.7
- doctest-exitcode-stdio ==0.0
- doctest-lib ==0.1
- doctest-parallel ==0.2.6
@ -700,7 +700,7 @@ default-package-overrides:
- enum-text ==0.5.3.0
- envelope ==0.2.2.0
- envparse ==0.5.0
- envy ==2.1.1.0
- envy ==2.1.2.0
- eq ==4.3
- equational-reasoning ==0.7.0.1
- equivalence ==0.4.1
@ -742,7 +742,7 @@ default-package-overrides:
- extensible ==0.9
- extensible-effects ==5.0.0.1
- extensible-exceptions ==0.1.1.4
- extra ==1.7.12
- extra ==1.7.13
- extractable-singleton ==0.0.1
- extrapolate ==0.4.6
- fail ==4.9.0.0
@ -806,7 +806,7 @@ default-package-overrides:
- fmlist ==0.9.4
- fmt ==0.6.3.0
- fn ==0.3.0.2
- focus ==1.0.3
- focus ==1.0.3.1
- focuslist ==0.1.1.0
- foldl ==1.4.14
- folds ==0.7.8
@ -929,28 +929,28 @@ default-package-overrides:
- ghc-typelits-natnormalise ==0.7.8
- ghc-typelits-presburger ==0.6.2.0
- ghost-buster ==0.1.1.0
- gi-atk ==2.0.25
- gi-cairo ==1.0.27
- gi-atk ==2.0.27
- gi-cairo ==1.0.29
- gi-cairo-connector ==0.1.1
- gi-cairo-render ==0.1.2
- gi-dbusmenu ==0.4.11
- gi-dbusmenugtk3 ==0.4.12
- gi-freetype2 ==2.0.2
- gi-gdk ==3.0.26
- gi-gdkpixbuf ==2.0.29
- gi-gdkx11 ==3.0.13
- gi-gio ==2.0.30
- gi-glib ==2.0.27
- gi-gmodule ==2.0.3
- gi-gobject ==2.0.28
- gi-graphene ==1.0.5
- gi-gtk ==3.0.39
- gi-gtk-hs ==0.3.13
- gi-gtksource ==3.0.26
- gi-harfbuzz ==0.0.7
- gi-javascriptcore ==4.0.25
- gi-dbusmenu ==0.4.13
- gi-dbusmenugtk3 ==0.4.14
- gi-freetype2 ==2.0.4
- gi-gdk ==3.0.28
- gi-gdkpixbuf ==2.0.31
- gi-gdkx11 ==3.0.15
- gi-gio ==2.0.32
- gi-glib ==2.0.29
- gi-gmodule ==2.0.5
- gi-gobject ==2.0.30
- gi-graphene ==1.0.7
- gi-gtk ==3.0.41
- gi-gtk-hs ==0.3.14
- gi-gtksource ==3.0.28
- gi-harfbuzz ==0.0.9
- gi-javascriptcore ==4.0.27
- gio ==0.13.8.2
- gi-pango ==1.0.27
- gi-pango ==1.0.29
- githash ==0.1.6.3
- github ==0.28.0.1
- github-release ==2.0.0.5
@ -961,8 +961,8 @@ default-package-overrides:
- git-lfs ==1.2.0
- gitlib ==3.1.3
- gitrev ==1.3.1
- gi-vte ==2.91.30
- gi-xlib ==2.0.12
- gi-vte ==2.91.31
- gi-xlib ==2.0.13
- gl ==0.9
- glasso ==0.1.0
- GLFW-b ==3.3.0.0
@ -1391,7 +1391,7 @@ default-package-overrides:
- kan-extensions ==5.2.5
- kanji ==3.5.0
- kansas-comet ==0.4.1
- katip ==0.8.7.3
- katip ==0.8.7.4
- katip-logstash ==0.1.0.2
- katip-wai ==0.1.2.1
- kazura-queue ==0.1.0.4
@ -1644,7 +1644,7 @@ default-package-overrides:
- monads-tf ==0.1.0.3
- monad-time ==0.3.1.0
- mongoDB ==2.7.1.2
- monoidal-containers ==0.6.3.0
- monoidal-containers ==0.6.4.0
- monoid-extras ==0.6.2
- monoid-subclasses ==1.1.3
- monoid-transformer ==0.0.4
@ -2030,7 +2030,7 @@ default-package-overrides:
- pulse-simple ==0.1.14
- pureMD5 ==2.1.4
- purescript-bridge ==0.14.0.0
- pusher-http-haskell ==2.1.0.12
- pusher-http-haskell ==2.1.0.13
- pvar ==1.0.0.0
- pwstore-fast ==2.4.4
- PyF ==0.11.1.1
@ -2105,7 +2105,7 @@ default-package-overrides:
- redis-resp ==1.0.0
- reducers ==3.12.4
- refact ==0.3.0.2
- ref-fd ==0.5
- ref-fd ==0.5.0.1
- refined ==0.8
- reflection ==2.1.7
- reform ==0.2.7.5
@ -2487,7 +2487,7 @@ default-package-overrides:
- swish ==0.10.4.0
- syb ==0.7.2.3
- syb-with-class ==0.6.1.14
- sydtest ==0.13.0.2
- sydtest ==0.13.0.4
- sydtest-aeson ==0.1.0.0
- sydtest-amqp ==0.1.0.0
- sydtest-autodocodec ==0.0.0.0
@ -2958,11 +2958,11 @@ default-package-overrides:
- xml-picklers ==0.3.6
- xml-to-json-fast ==2.0.0
- xml-types ==0.3.8
- xmonad ==0.17.1
- xmonad ==0.17.2
- xmonad-contrib ==0.17.1
- xmonad-extras ==0.17.0
- xor ==0.0.1.1
- xss-sanitize ==0.3.7.1
- xss-sanitize ==0.3.7.2
- xxhash-ffi ==0.2.0.0
- yaml ==0.11.11.0
- yaml-unscrambler ==0.1.0.13

View file

@ -330,6 +330,7 @@ dont-distribute-packages:
- RNAlien
- RNAwolf
- Ranka
- ReplaceUmlaut
- RollingDirectory
- S3
- SBench
@ -1145,6 +1146,7 @@ dont-distribute-packages:
- cuckoo
- cv-combinators
- cypher
- daino
- dapi
- darcs-benchmark
- darcs-beta
@ -2168,6 +2170,7 @@ dont-distribute-packages:
- hist-pl-lmf
- hit
- hit-graph
- hix
- hjsonschema
- hjugement-cli
- hlcm
@ -3189,6 +3192,7 @@ dont-distribute-packages:
- prefork
- prelate
- presto-hdbc
- prettychart
- preview
- primal-memory
- primitive-containers
@ -3819,8 +3823,10 @@ dont-distribute-packages:
- sydtest-amqp
- sydtest-autodocodec
- sydtest-hedgehog
- sydtest-hedgehog_0_4_0_0
- sydtest-hedis
- sydtest-hspec
- sydtest-hspec_0_4_0_0
- sydtest-mongo
- sydtest-persistent
- sydtest-persistent-postgresql
@ -3927,6 +3933,7 @@ dont-distribute-packages:
- tinkoff-invest-sdk
- tintin
- tinytools
- tinytools-vty
- tip-haskell-frontend
- tip-lib
- titan

File diff suppressed because it is too large Load diff

View file

@ -1,54 +0,0 @@
From 0cc6f0f8de1776d0b5851459d22a0997dfd735ce Mon Sep 17 00:00:00 2001
From: Oleg Grenrus <oleg.grenrus@iki.fi>
Date: Wed, 25 May 2022 14:09:49 +0300
Subject: [PATCH] Use ShellCheck-0.8.0 and optparse-applicative-0.17
Adapted from 0cc6f0f8de1776d0b5851459d22a0997dfd735ce to apply on top of
haskell-ci-0.14.3.
Co-Authored-By: sternenseemann <sternenseemann@systemli.org>
---
haskell-ci.cabal | 4 ++--
src/HaskellCI/GitHub.hs | 7 ++++---
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/haskell-ci.cabal b/haskell-ci.cabal
index 273bd422..6848402c 100644
--- a/haskell-ci.cabal
+++ b/haskell-ci.cabal
@@ -167,14 +167,14 @@ library haskell-ci-internal
, ini ^>=0.4.1
, lattices ^>=2
, network-uri ^>=2.6.1.0
- , optparse-applicative ^>=0.16.1.0
+ , optparse-applicative ^>=0.17.0.0
, temporary ^>=1.3
, unordered-containers ^>=0.2.10.0
, zinza ^>=0.2
-- ShellCheck. Would need newer transformers for older GHC
if flag(shellcheck)
- build-depends: ShellCheck ==0.7.2
+ build-depends: ShellCheck ==0.8.0
executable haskell-ci
main-is: Main.hs
diff --git a/src/HaskellCI/GitHub.hs b/src/HaskellCI/GitHub.hs
index f1a402e6..a2c6e4f6 100644
--- a/src/HaskellCI/GitHub.hs
+++ b/src/HaskellCI/GitHub.hs
@@ -653,9 +653,10 @@ makeGitHub _argv config@Config {..} gitconfig prj jobs@JobVersions {..} = do
setup hvrppa ghcup
| allGHCUP = traverse_ liftSh ghcup
| not anyGHCUP = traverse_ liftSh hvrppa
- -- 2192: ${{ ...}} will match (ShellCheck think it doesn't)
- -- 2129: individual redirects
- | otherwise = sh' [2193, 2129] $ unlines $
+ -- SC2192: ${{ ...}} will match (ShellCheck think it doesn't)
+ -- SC2129: individual redirects
+ -- SC2296: Parameter expansions can't start with {. Double check syntax. -- ${{ }} in YAML templating.
+ | otherwise = sh' [2193, 2129, 2296] $ unlines $
[ "if [ \"${{ matrix.setup-method }}\" = ghcup ]; then"
] ++
[ " " ++ shToString s

View file

@ -497,8 +497,6 @@ let
haskell-language-server = lib.subtractLists [
# Support ceased as of 1.9.0.0
compilerNames.ghc884
# https://github.com/haskell/haskell-language-server/issues/3502
compilerNames.ghc961
] released;
hoogle = lib.subtractLists [
compilerNames.ghc961