diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2024-01-07 16:14:41 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2024-01-07 16:14:41 +0100 |
| commit | ff42d23313880d627c7dea5addf744db4562dee5 (patch) | |
| tree | c9b37f000821c6e8e2e39d983ce8ea25a56e949c /maintainers | |
| parent | 798690dc6b55c17705f9f2faab07d5b86b6d50d4 (diff) | |
| parent | 9ea3a3cfaa995c201b68c1cd3877bd35e1d7dd04 (diff) | |
Merge branch 'master' into staging-next
Conflicts: pkgs/development/python-modules/dbt-core/default.nix pkgs/development/python-modules/dbt-semantic-interfaces/default.nix Still broken by pydantic 2 bump, though.
Diffstat (limited to 'maintainers')
| -rwxr-xr-x | maintainers/scripts/haskell/update-stackage.sh | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/maintainers/scripts/haskell/update-stackage.sh b/maintainers/scripts/haskell/update-stackage.sh index 881cf5fd48376..5dc52abdd668b 100755 --- a/maintainers/scripts/haskell/update-stackage.sh +++ b/maintainers/scripts/haskell/update-stackage.sh @@ -7,8 +7,11 @@ set -eu -o pipefail # Stackage solver to use, LTS or Nightly # (should be capitalized like the display name) SOLVER=LTS +# Stackage solver verson, if any. Use latest if empty +VERSION=21 TMP_TEMPLATE=update-stackage.XXXXXXX readonly SOLVER +readonly VERSION readonly TMP_TEMPLATE toLower() { @@ -23,7 +26,7 @@ stackage_config="pkgs/development/haskell-modules/configuration-hackage2nix/stac trap 'rm "${tmpfile}" "${tmpfile_new}"' 0 touch "$tmpfile" "$tmpfile_new" # Creating files here so that trap creates no errors. -curl -L -s "https://stackage.org/$(toLower "$SOLVER")/cabal.config" >"$tmpfile" +curl -L -s "https://stackage.org/$(toLower "$SOLVER")${VERSION:+-$VERSION}/cabal.config" >"$tmpfile" old_version=$(grep '^# Stackage' $stackage_config | sed -e 's/.\+ \([A-Za-z]\+ [0-9.-]\+\)$/\1/g') version="$SOLVER $(sed -rn "s/^--.*http:..(www.)?stackage.org.snapshot.$(toLower "$SOLVER")-//p" "$tmpfile")" |