mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-09-29 15:43:00 +00:00
haskell-ci: allow Stackage LTS-20 dependency version
This commit is contained in:
parent
d3df35b7b2
commit
446357bcca
@ -2112,10 +2112,12 @@ 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, ShellCheck 0.7.2
|
||||
haskell-ci = super.haskell-ci.overrideScope (self: super: {
|
||||
# 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;
|
||||
ShellCheck = self.ShellCheck_0_7_2;
|
||||
cabal-install-parsers = self.cabal-install-parsers_0_4_5;
|
||||
});
|
||||
|
||||
|
@ -100,7 +100,6 @@ extra-packages:
|
||||
- Cabal == 3.4.* # required for cabal-install etc.
|
||||
- Cabal == 3.6.* # required for cabal-install-parsers etc.
|
||||
- Diff < 0.4 # required by liquidhaskell-0.8.10.2: https://github.com/ucsd-progsys/liquidhaskell/issues/1729
|
||||
- ShellCheck == 0.7.2 # 2022-02-20: haskell-ci 0.14 needs this
|
||||
- aeson < 2 # required by pantry-0.5.2
|
||||
- attoparsec == 0.13.* # 2022-02-23: Needed to compile elm for now
|
||||
- base16-bytestring < 1 # required for cabal-install etc.
|
||||
|
@ -18790,37 +18790,6 @@ self: {
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
}) {};
|
||||
|
||||
"ShellCheck_0_7_2" = callPackage
|
||||
({ mkDerivation, aeson, array, base, bytestring, containers
|
||||
, deepseq, Diff, directory, filepath, mtl, parsec, process
|
||||
, QuickCheck, regex-tdfa
|
||||
}:
|
||||
mkDerivation {
|
||||
pname = "ShellCheck";
|
||||
version = "0.7.2";
|
||||
sha256 = "0wl43njaq95l35y5mvipwp1db9vr551nz9wl0xy83j1x1kc38xgz";
|
||||
revision = "1";
|
||||
editedCabalFile = "1w65zcr97mghraif6bgcdabzy2dp72gasaad57a9b5yp9i27p2rl";
|
||||
isLibrary = true;
|
||||
isExecutable = true;
|
||||
libraryHaskellDepends = [
|
||||
aeson array base bytestring containers deepseq Diff directory
|
||||
filepath mtl parsec process QuickCheck regex-tdfa
|
||||
];
|
||||
executableHaskellDepends = [
|
||||
aeson array base bytestring containers deepseq Diff directory
|
||||
filepath mtl parsec QuickCheck regex-tdfa
|
||||
];
|
||||
testHaskellDepends = [
|
||||
aeson array base bytestring containers deepseq Diff directory
|
||||
filepath mtl parsec QuickCheck regex-tdfa
|
||||
];
|
||||
description = "Shell script analysis tool";
|
||||
license = lib.licenses.gpl3Only;
|
||||
hydraPlatforms = lib.platforms.none;
|
||||
mainProgram = "shellcheck";
|
||||
}) {};
|
||||
|
||||
"ShellCheck" = callPackage
|
||||
({ mkDerivation, aeson, array, base, bytestring, containers
|
||||
, deepseq, Diff, directory, filepath, mtl, parsec, process
|
||||
|
@ -0,0 +1,54 @@
|
||||
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
|
Loading…
Reference in New Issue
Block a user