diff options
author | sternenseemann <sternenseemann@systemli.org> | 2023-04-13 12:28:34 +0200 |
---|---|---|
committer | sternenseemann <sternenseemann@systemli.org> | 2023-04-14 18:35:33 +0200 |
commit | b79286ea28bd91de5d7b734fc26eddb6560324df (patch) | |
tree | 3106d64c9492395c514efb1ef3cb73ed7c65f679 /maintainers | |
parent | 9bd1e62062d8b0831fd219285f0f199e569bbb29 (diff) |
maintainers/haskell/upload-package-list: support 3.10 config dir
cabal-install 3.10 has some quirky new logic for config, cache, … directory discovery. We reimplement this in this simple bash script, additionally respecting the CABAL_DIR environment variable.
Diffstat (limited to 'maintainers')
-rwxr-xr-x | maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh | 25 |
1 files changed, 23 insertions, 2 deletions
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 8c39d289f7aaa..86fecbc3d87c9 100755 --- a/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh +++ b/maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh @@ -15,8 +15,29 @@ # password-command: pass hackage.haskell.org (this can be any command, but not an arbitrary shell expression. Like cabal we only read the first output line and ignore the rest.) # Those fields are specified under `upload` on the `cabal` man page. +if test -z "$CABAL_DIR"; then + dirs=( + "$HOME/.cabal" + "${XDG_CONFIG_HOME:-$HOME/.config}/cabal" + ) + missing=true + + for dir in "${dirs[@]}"; do + if test -d "$dir"; then + export CABAL_DIR="$dir" + missing=false + break + fi + done + + if $missing; then + echo "Could not find the cabal configuration directory in any of: ${dirs[@]}" >&2 + exit 101 + fi +fi + 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: //") +username=$(grep "^username:" "$CABAL_DIR/config" | sed "s/^username: //") +password_command=$(grep "^password-command:" "$CABAL_DIR/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 |