maintainers/update-{st,h}ackage.sh: drop support for --do-commit
This commit is contained in:
@@ -24,6 +24,11 @@
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
if [[ "${1:-}" == "--do-commit" ]]; then
|
||||
echo "$0: --do-commit is no longer supported. Use update-package-set.sh instead."
|
||||
exit 100
|
||||
fi
|
||||
|
||||
pin_file=pkgs/data/misc/hackage/pin.json
|
||||
current_commit="$(jq -r .commit $pin_file)"
|
||||
old_date="$(jq -r .msg $pin_file | sed 's/Update from Hackage at //')"
|
||||
@@ -48,15 +53,4 @@ else
|
||||
exit 0
|
||||
fi
|
||||
|
||||
version_diff="$old_date -> $new_date"
|
||||
|
||||
if [[ "${1:-}" == "--do-commit" ]]; then
|
||||
git add pkgs/data/misc/hackage/pin.json
|
||||
git commit -F - << EOF
|
||||
all-cabal-hashes: $version_diff
|
||||
|
||||
(generated by maintainers/scripts/haskell/update-hackage.sh)
|
||||
EOF
|
||||
else
|
||||
echo "$version_diff"
|
||||
fi
|
||||
echo "$old_date -> $new_date"
|
||||
|
||||
@@ -26,6 +26,11 @@
|
||||
|
||||
set -eu -o pipefail
|
||||
|
||||
if [[ "${1:-}" == "--do-commit" ]]; then
|
||||
echo "$0: --do-commit is no longer supported. Use update-package-set.sh instead."
|
||||
exit 100
|
||||
fi
|
||||
|
||||
# Stackage solver to use, LTS or Nightly
|
||||
# (should be capitalized like the display name)
|
||||
SOLVER=LTS
|
||||
@@ -100,15 +105,4 @@ sed -r \
|
||||
# ShellCheck: latest version of command-line dev tool.
|
||||
# Agda: The Agda community is fast-moving; we strive to always include the newest versions of Agda and the Agda packages in nixpkgs.
|
||||
|
||||
version_diff="$old_version -> $version"
|
||||
|
||||
if [[ "${1:-}" == "--do-commit" ]]; then
|
||||
git add $stackage_config
|
||||
git commit -F - << EOF
|
||||
haskellPackages: stackage $version_diff
|
||||
|
||||
(generated by maintainers/scripts/haskell/update-stackage.sh)
|
||||
EOF
|
||||
else
|
||||
echo "$version_diff"
|
||||
fi
|
||||
echo "$old_version -> $version"
|
||||
|
||||
Reference in New Issue
Block a user