Merge pull request #207764 from qowoz/shellcheck

shellcheck: add override for newer version

maintainers/scripts/haskell/update-stackage.sh

@@ -62,10 +62,12 @@ sed -r \
     -e '/ lsp-types /d' \
     -e '/ lsp-test /d' \
     -e '/ hie-bios /d' \
+    -e '/ ShellCheck /d' \
     < "${tmpfile_new}" >> $stackage_config
 # Explanations:
 # cabal2nix, distribution-nixpkgs, jailbreak-cabal, language-nix: These are our packages and we know what we are doing.
 # lsp, lsp-types, lsp-test, hie-bios: These are tightly coupled to hls which is not in stackage. They have no rdeps in stackage.
+# ShellCheck: latest version of command-line dev tool.
 
 if [[ "${1:-}" == "--do-commit" ]]; then
 git add $stackage_config

pkgs/development/haskell-modules/configuration-common.nix

@@ -1817,6 +1817,7 @@ self: super: {
   ] 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;
   });
 
   large-hashable = lib.pipe (super.large-hashable.override {

pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml

@@ -159,6 +159,7 @@ extra-packages:
   - weeder == 2.2.*                     # 2022-02-21: preserve for GHC 8.10.7
   - weeder == 2.3.*                     # 2022-05-31: preserve for GHC 9.0.2
   - commonmark-extensions < 0.2.3.3     # 2022-12-17: required by emanote 1.0.0.0 (to avoid a bug in 0.2.3.3)
+  - ShellCheck == 0.8.0                 # 2022-12-28: required by haskell-ci 0.14.3
 
 package-maintainers:
   abbradar:
@@ -446,6 +447,8 @@ package-maintainers:
     - time-domain
   utdemir:
     - nix-tree
+  zowoq:
+    - ShellCheck
 
 unsupported-platforms:
   Allure:                                       [ platforms.darwin ]

pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml

@@ -2315,7 +2315,6 @@ default-package-overrides:
   - shakespeare ==2.0.30
   - shakespeare-text ==1.1.0
   - shared-memory ==0.2.0.0
-  - ShellCheck ==0.8.0
   - shell-conduit ==5.0.0
   - shell-escape ==0.2.0
   - shellmet ==0.0.4.1

pkgs/development/haskell-modules/hackage-packages.nix

@@ -18857,7 +18857,7 @@ self: {
        hydraPlatforms = lib.platforms.none;
      }) {};
 
-  "ShellCheck" = callPackage
+  "ShellCheck_0_8_0" = callPackage
     ({ mkDerivation, aeson, array, base, bytestring, containers
      , deepseq, Diff, directory, filepath, mtl, parsec, process
      , QuickCheck, regex-tdfa
@@ -18884,10 +18884,12 @@ self: {
        ];
        description = "Shell script analysis tool";
        license = lib.licenses.gpl3Only;
+       hydraPlatforms = lib.platforms.none;
        mainProgram = "shellcheck";
+       maintainers = [ lib.maintainers.zowoq ];
      }) {};
 
-  "ShellCheck_0_9_0" = callPackage
+  "ShellCheck" = callPackage
     ({ mkDerivation, aeson, array, base, bytestring, containers
      , deepseq, Diff, directory, fgl, filepath, mtl, parsec, process
      , QuickCheck, regex-tdfa, transformers
@@ -18912,8 +18914,8 @@ self: {
        ];
        description = "Shell script analysis tool";
        license = lib.licenses.gpl3Only;
-       hydraPlatforms = lib.platforms.none;
        mainProgram = "shellcheck";
+       maintainers = [ lib.maintainers.zowoq ];
      }) {};
 
   "Shellac" = callPackage

pkgs/development/tools/shellcheck/default.nix

@@ -46,6 +46,6 @@ let
 
 in
   overrideMeta shellcheck (old: {
-    maintainers = with lib.maintainers; [ Profpatsch ];
+    maintainers = with lib.maintainers; [ Profpatsch zowoq ];
     outputsToInstall = [ "bin" "man" "doc" ];
   })