From b3d74de2a1ba47f6e3f0c37f9d7d6b4a116ef6a3 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Tue, 11 Feb 2025 21:48:03 +0100
Subject: [PATCH] maintainers/haskell/merge-and-open-pr.sh: target staging

We can't update the package list after the merge since it may be weeks
until the changes propagate to master and the channels.
---
 maintainers/scripts/haskell/merge-and-open-pr.sh | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/maintainers/scripts/haskell/merge-and-open-pr.sh b/maintainers/scripts/haskell/merge-and-open-pr.sh
index 62565d24d623..ea985acfc9a0 100755
--- a/maintainers/scripts/haskell/merge-and-open-pr.sh
+++ b/maintainers/scripts/haskell/merge-and-open-pr.sh
@@ -1,8 +1,8 @@
 #! /usr/bin/env nix-shell
 #! nix-shell -i bash -p git gh -I nixpkgs=.
 #
-# Script to merge the currently open haskell-updates PR into master, bump the
-# Stackage version and Hackage versions, and open the next haskell-updates PR.
+# Script to merge the currently open haskell-updates PR , bump the Stackage
+# version and Hackage versions, and open the next haskell-updates PR.
 
 set -eu -o pipefail
 
@@ -79,10 +79,6 @@ fi
 echo "Merging https://github.com/NixOS/nixpkgs/pull/${curr_haskell_updates_pr_num}..."
 gh pr merge --repo NixOS/nixpkgs --merge "$curr_haskell_updates_pr_num"
 
-# Update the list of Haskell package versions in NixOS on Hackage.
-echo "Updating list of Haskell package versions in NixOS on Hackage..."
-./maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh
-
 # Update stackage, Hackage hashes, and regenerate Haskell package set
 echo "Updating Stackage..."
 ./maintainers/scripts/haskell/update-stackage.sh --do-commit
@@ -100,7 +96,7 @@ git push "$push_remote" haskell-updates
 new_pr_body=$(cat <<EOF
 ### This Merge
 
-This PR is the regular merge of the \`haskell-updates\` branch into \`master\`.
+This PR is the regular merge of the \`haskell-updates\` branch into \`staging\`.
 
 This branch is being continually built and tested by hydra at https://hydra.nixos.org/jobset/nixpkgs/haskell-updates. You may be able to find an up-to-date Hydra build report at [cdepillabout/nix-haskell-updates-status](https://github.com/cdepillabout/nix-haskell-updates-status).
 
@@ -113,7 +109,7 @@ Our workflow is currently described in [\`pkgs/development/haskell-modules/HACKI
 The short version is this:
 * We regularly update the Stackage and Hackage pins on \`haskell-updates\` (normally at the beginning of a merge window).
 * The community fixes builds of Haskell packages on that branch.
-* We aim at at least one merge of \`haskell-updates\` into \`master\` every two weeks.
+* We aim at at least one merge of \`haskell-updates\` into \`staging\` every two weeks.
 * We only do the merge if the [\`mergeable\`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/mergeable) job is succeeding on hydra.
 * If a [\`maintained\`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/maintained) package is still broken at the time of merge, we will only merge if the maintainer has been pinged 7 days in advance. (If you care about a Haskell package, become a maintainer!)
 
@@ -126,4 +122,4 @@ EOF
 )
 
 echo "Opening a PR for the next haskell-updates merge cycle..."
-gh pr create --repo NixOS/nixpkgs --base master --head haskell-updates --title "haskellPackages: update stackage and hackage" --body "$new_pr_body"
+gh pr create --repo NixOS/nixpkgs --base staging --head haskell-updates --title "haskellPackages: update stackage and hackage" --body "$new_pr_body"