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.
This commit is contained in:
parent
9bd1e62062
commit
b79286ea28
|
@ -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.)
|
# 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.
|
# 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"
|
package_list="$(nix-build -A haskell.package-list)/nixos-hackage-packages.csv"
|
||||||
username=$(grep "^username:" ~/.cabal/config | sed "s/^username: //")
|
username=$(grep "^username:" "$CABAL_DIR/config" | sed "s/^username: //")
|
||||||
password_command=$(grep "^password-command:" ~/.cabal/config | sed "s/^password-command: //")
|
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
|
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
|
echo
|
||||||
|
|
Loading…
Reference in a new issue