From 4cb228c88c6d45d025da3776c79be143f0e3c1b9 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 28 Dec 2022 08:52:34 +1000 Subject: [PATCH 1/4] shellcheck, haskellPackages.ShellCheck: add maintainer --- .../haskell-modules/configuration-hackage2nix/main.yaml | 2 ++ pkgs/development/tools/shellcheck/default.nix | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index bc676fba5460..563be6fa4337 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -444,6 +444,8 @@ package-maintainers: - time-domain utdemir: - nix-tree + zowoq: + - ShellCheck unsupported-platforms: Allure: [ platforms.darwin ] diff --git a/pkgs/development/tools/shellcheck/default.nix b/pkgs/development/tools/shellcheck/default.nix index 4bf5113ec1a6..59b744e21df1 100644 --- a/pkgs/development/tools/shellcheck/default.nix +++ b/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" ]; }) From 232b50805970de8453532dfdbc52375f80175bf3 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 28 Dec 2022 08:52:35 +1000 Subject: [PATCH 2/4] haskellPackages.ShellCheck: unpin --- maintainers/scripts/haskell/update-stackage.sh | 2 ++ .../haskell-modules/configuration-hackage2nix/stackage.yaml | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh index f1f04cdf4504..426c371d1d35 100755 --- a/maintainers/scripts/haskell/update-stackage.sh +++ b/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 diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml index a4364b7d8183..1d1d297cf588 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/stackage.yaml +++ b/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 From 5cf58a844e313f61f6138d9c3126949d0c1b5f0f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 28 Dec 2022 10:30:36 +1000 Subject: [PATCH 3/4] haskellPackages.haskell-ci: pin to ShellCheck_0_8_0 --- pkgs/development/haskell-modules/configuration-common.nix | 1 + .../haskell-modules/configuration-hackage2nix/main.yaml | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index e1ac8503a13f..2a18901d9407 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1814,6 +1814,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 { diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 563be6fa4337..fad4d57fdcec 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -157,6 +157,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: From 3bc05714b6fd12bbef6bb34bf40d863610b92649 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 28 Dec 2022 10:34:58 +1000 Subject: [PATCH 4/4] haskellPackages: regenerate package set based on current config This commit has been generated by maintainers/scripts/haskell/regenerate-hackage-packages.sh --- pkgs/development/haskell-modules/hackage-packages.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 568110a0f171..399344887717 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/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