diff options
| author | Alyssa Ross <hi@alyssa.is> | 2024-01-10 01:11:23 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2024-01-10 01:11:23 +0100 |
| commit | c8d05d8abadb244bc4e6cee75d450978d1f09a61 (patch) | |
| tree | 2d710425b8e3f78e84d5e46abb3397cb1b34ec18 /nixpkgs/maintainers | |
| parent | ad899504860973e98351c922ecb934595f2c0f19 (diff) | |
| parent | 0ed96eed101462bf05e1e99e1bbadcd49b4eb302 (diff) | |
| download | nixlib-c8d05d8abadb244bc4e6cee75d450978d1f09a61.tar nixlib-c8d05d8abadb244bc4e6cee75d450978d1f09a61.tar.gz nixlib-c8d05d8abadb244bc4e6cee75d450978d1f09a61.tar.bz2 nixlib-c8d05d8abadb244bc4e6cee75d450978d1f09a61.tar.lz nixlib-c8d05d8abadb244bc4e6cee75d450978d1f09a61.tar.xz nixlib-c8d05d8abadb244bc4e6cee75d450978d1f09a61.tar.zst nixlib-c8d05d8abadb244bc4e6cee75d450978d1f09a61.zip | |
Merge branch 'nixos-unstable-small' of https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/maintainers')
| -rw-r--r-- | nixpkgs/maintainers/maintainer-list.nix | 6 | ||||
| -rwxr-xr-x | nixpkgs/maintainers/scripts/haskell/update-stackage.sh | 5 |
2 files changed, 10 insertions, 1 deletions
diff --git a/nixpkgs/maintainers/maintainer-list.nix b/nixpkgs/maintainers/maintainer-list.nix index 23975a5a33a6..fe4e8bdf24b5 100644 --- a/nixpkgs/maintainers/maintainer-list.nix +++ b/nixpkgs/maintainers/maintainer-list.nix @@ -17018,6 +17018,12 @@ fingerprint = "ADF4 C13D 0E36 1240 BD01 9B51 D1DE 6D7F 6936 63A5"; }]; }; + Silver-Golden = { + name = "Brendan Golden"; + email = "github+nixpkgs@brendan.ie"; + github = "Silver-Golden"; + githubId = 7858375; + }; simarra = { name = "simarra"; email = "loic.martel@protonmail.com"; diff --git a/nixpkgs/maintainers/scripts/haskell/update-stackage.sh b/nixpkgs/maintainers/scripts/haskell/update-stackage.sh index 881cf5fd4837..5dc52abdd668 100755 --- a/nixpkgs/maintainers/scripts/haskell/update-stackage.sh +++ b/nixpkgs/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")" |