diff options
author | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-05-09 10:00:21 +0200 |
---|---|---|
committer | sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> | 2021-05-09 12:05:18 +0200 |
commit | 2f2c1ca08e97762d371f4085a7228649d9baa639 (patch) | |
tree | 79a71241cdaabee586d6dc13fea9d62e4c131086 | |
parent | 227cfc24fef11b4ad179c0cadcd9d9da5f785f2d (diff) | |
download | nixpkgs-2f2c1ca08e97762d371f4085a7228649d9baa639.tar nixpkgs-2f2c1ca08e97762d371f4085a7228649d9baa639.tar.gz nixpkgs-2f2c1ca08e97762d371f4085a7228649d9baa639.tar.bz2 nixpkgs-2f2c1ca08e97762d371f4085a7228649d9baa639.tar.lz nixpkgs-2f2c1ca08e97762d371f4085a7228649d9baa639.tar.xz nixpkgs-2f2c1ca08e97762d371f4085a7228649d9baa639.tar.zst nixpkgs-2f2c1ca08e97762d371f4085a7228649d9baa639.zip |
haskell-ci: provide ShellCheck 0.7.1 to fix build
haskell-ci pins a specific version of ShellCheck as ShellCheck adds new checks with new minor versions which may break CI checks.
3 files changed, 35 insertions, 0 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index d8f5348f5ad..0f2aa45b4bc 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1864,4 +1864,10 @@ self: super: { # 2021-05-09: Restrictive bound on hspec-golden. Dep removed in newer versions. tomland = assert super.tomland.version == "1.3.2.0"; doJailbreak super.tomland; + # 2021-05-09 haskell-ci pins ShellCheck 0.7.1 + # https://github.com/haskell-CI/haskell-ci/issues/507 + haskell-ci = super.haskell-ci.override { + ShellCheck = self.ShellCheck_0_7_1; + }; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index fe22ee7ea6d..7019f200999 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -104,6 +104,7 @@ extra-packages: - gi-gdk == 3.0.24 # 2021-05-07: For haskell-gi 0.25 without gtk4 - gi-gtk < 4.0 # 2021-05-07: For haskell-gi 0.25 without gtk4 - gi-gdkx11 == 3.0.11 # 2021-05-07: For haskell-gi 0.25 without gtk4 + - ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version package-maintainers: peti: diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 5e4c95a3283..4dd57eb6edf 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -16918,6 +16918,34 @@ self: { license = lib.licenses.mpl20; }) {}; + "ShellCheck_0_7_1" = callPackage + ({ mkDerivation, aeson, array, base, bytestring, containers + , deepseq, Diff, directory, filepath, mtl, parsec, process + , QuickCheck, regex-tdfa + }: + mkDerivation { + pname = "ShellCheck"; + version = "0.7.1"; + sha256 = "06m4wh891nah3y0br4wh3adpsb16zawkb2ijgf1vcz61fznj6ps1"; + 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; + }) {}; + "ShellCheck" = callPackage ({ mkDerivation, aeson, array, base, bytestring, containers , deepseq, Diff, directory, filepath, mtl, parsec, process |