From 0545642ebb66294593da3048abe7f23a20129cff Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Mon, 14 Jul 2025 22:58:35 +0200
Subject: [PATCH] maintainers/update-{st,h}ackage.sh: drop support for
 --do-commit

---
 maintainers/scripts/haskell/update-hackage.sh  | 18 ++++++------------
 maintainers/scripts/haskell/update-stackage.sh | 18 ++++++------------
 2 files changed, 12 insertions(+), 24 deletions(-)

diff --git a/maintainers/scripts/haskell/update-hackage.sh b/maintainers/scripts/haskell/update-hackage.sh
index 5aad07c1b331..e6cf7fa2bea7 100755
--- a/maintainers/scripts/haskell/update-hackage.sh
+++ b/maintainers/scripts/haskell/update-hackage.sh
@@ -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"
diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh
index 81b11363da91..5a91d3dc9cbc 100755
--- a/maintainers/scripts/haskell/update-stackage.sh
+++ b/maintainers/scripts/haskell/update-stackage.sh
@@ -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"