diff options
author | (cdep)illabout <cdep.illabout@gmail.com> | 2021-09-20 09:52:30 +0900 |
---|---|---|
committer | (cdep)illabout <cdep.illabout@gmail.com> | 2021-09-20 09:55:22 +0900 |
commit | 64511038ff924342c3a40b24760322a9287fad7a (patch) | |
tree | d4f0fd4febb222ad8069bc3f7a2d9eb5bb8c9385 /maintainers/scripts | |
parent | 5ecf5108337f2ef55aad3c445140e160ef05b3db (diff) | |
download | nixlib-64511038ff924342c3a40b24760322a9287fad7a.tar nixlib-64511038ff924342c3a40b24760322a9287fad7a.tar.gz nixlib-64511038ff924342c3a40b24760322a9287fad7a.tar.bz2 nixlib-64511038ff924342c3a40b24760322a9287fad7a.tar.lz nixlib-64511038ff924342c3a40b24760322a9287fad7a.tar.xz nixlib-64511038ff924342c3a40b24760322a9287fad7a.tar.zst nixlib-64511038ff924342c3a40b24760322a9287fad7a.zip |
haskell: small improvements to script for merging haskell-updates PR
Diffstat (limited to 'maintainers/scripts')
-rwxr-xr-x | maintainers/scripts/haskell/merge-and-open-pr.sh | 5 | ||||
-rwxr-xr-x | maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/maintainers/scripts/haskell/merge-and-open-pr.sh b/maintainers/scripts/haskell/merge-and-open-pr.sh index 66c336f199c8..070d6c3cc8e3 100755 --- a/maintainers/scripts/haskell/merge-and-open-pr.sh +++ b/maintainers/scripts/haskell/merge-and-open-pr.sh @@ -76,6 +76,7 @@ echo "Merging https://github.com/NixOS/nixpkgs/pull/${curr_haskell_updates_pr_nu 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 @@ -87,7 +88,7 @@ echo "Regenerating Hackage packages..." ./maintainers/scripts/haskell/regenerate-hackage-packages.sh --do-commit # Push these new commits to the haskell-updates branch -echo "Pushing commits just created to the haskell-updates branch" +echo "Pushing commits just created to the remote haskell-updates branch..." git push # Open new PR @@ -117,5 +118,5 @@ This is the follow-up to #${curr_haskell_updates_pr_num}. Come to [#haskell:nixo EOF ) -echo "Opening a PR for the next haskell-updates merge cycle" +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" diff --git a/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh b/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh index 9e243052f25a..8c39d289f7aa 100755 --- a/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh +++ b/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh @@ -19,3 +19,4 @@ package_list="$(nix-build -A haskell.package-list)/nixos-hackage-packages.csv" username=$(grep "^username:" ~/.cabal/config | sed "s/^username: //") password_command=$(grep "^password-command:" ~/.cabal/config | sed "s/^password-command: //") curl -u "$username:$($password_command | head -n1)" --digest -H "Content-type: text/csv" -T "$package_list" http://hackage.haskell.org/distro/NixOS/packages.csv +echo |