diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 03f14b56f8b8..5e5b89b8ae12 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1361,13 +1361,6 @@ self: super: { cabal-install-parsers = doJailbreak (dontCheck (super.cabal-install-parsers.override { 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 { diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 5b1edb725a68..464bbf27c58d 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -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 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 6f04b00479d2..d8ebe5bd9f6b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -53240,35 +53240,6 @@ self: { broken = true; }) {}; - "cabal-install-parsers_0_4_5" = callPackage - ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring - , binary, binary-instances, bytestring, Cabal, containers - , criterion, cryptohash-sha256, deepseq, directory, filepath, lukko - , network-uri, parsec, pretty, tar, tasty, tasty-golden - , tasty-hunit, text, time, transformers, tree-diff - }: - mkDerivation { - pname = "cabal-install-parsers"; - version = "0.4.5"; - sha256 = "0gdqr7ib22h6qfvkv179xm4s2lw6fj62y7hj5lg53zjkc7y8791j"; - libraryHaskellDepends = [ - aeson base base16-bytestring binary binary-instances bytestring - Cabal containers cryptohash-sha256 deepseq directory filepath lukko - network-uri parsec pretty tar text time transformers - ]; - testHaskellDepends = [ - ansi-terminal base base16-bytestring bytestring Cabal containers - directory filepath pretty tar tasty tasty-golden tasty-hunit - tree-diff - ]; - benchmarkHaskellDepends = [ - base bytestring Cabal containers criterion directory filepath - ]; - description = "Utilities to work with cabal-install files"; - license = "GPL-2.0-or-later AND BSD-3-Clause"; - hydraPlatforms = lib.platforms.none; - }) {}; - "cabal-install-parsers" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base16-bytestring , binary, binary-instances, bytestring, Cabal-syntax, containers diff --git a/pkgs/development/haskell-modules/patches/haskell-ci-optparse-applicative-0.17-ShellCheck-0.8.patch b/pkgs/development/haskell-modules/patches/haskell-ci-optparse-applicative-0.17-ShellCheck-0.8.patch deleted file mode 100644 index c1e1663627f7..000000000000 --- a/pkgs/development/haskell-modules/patches/haskell-ci-optparse-applicative-0.17-ShellCheck-0.8.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 0cc6f0f8de1776d0b5851459d22a0997dfd735ce Mon Sep 17 00:00:00 2001 -From: Oleg Grenrus -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 - ---- - 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