diff options
| author | sternenseemann <sternenseemann@systemli.org> | 2023-05-10 22:45:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-10 22:45:32 +0200 |
| commit | b3fb03d00fac7fb2013f4b7467d76b8d9620e483 (patch) | |
| tree | 7d31432b2f403ee46bcfe18ebf1e7f36971d48c8 /maintainers | |
| parent | e7d6e5b740a9b284429044b274216d31191417af (diff) | |
| parent | 6a1d55d380982217afb867e158c175f1fdacdba1 (diff) | |
Merge pull request #228965 from NixOS/haskell-updates
haskellPackages: update stackage and hackage
Diffstat (limited to 'maintainers')
| -rw-r--r-- | maintainers/maintainer-list.nix | 6 | ||||
| -rwxr-xr-x | maintainers/scripts/haskell/merge-and-open-pr.sh | 3 | ||||
| -rwxr-xr-x | maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh | 15 |
3 files changed, 21 insertions, 3 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0a68f64f6238b..9ac5164d4f865 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14362,6 +14362,12 @@ githubId = 487050; name = "Shea Levy"; }; + shlok = { + email = "sd-nix-maintainer@quant.is"; + github = "shlok"; + githubId = 3000933; + name = "Shlok Datye"; + }; shmish111 = { email = "shmish111@gmail.com"; github = "shmish111"; diff --git a/maintainers/scripts/haskell/merge-and-open-pr.sh b/maintainers/scripts/haskell/merge-and-open-pr.sh index 044151305e355..8b292ca50c8c9 100755 --- a/maintainers/scripts/haskell/merge-and-open-pr.sh +++ b/maintainers/scripts/haskell/merge-and-open-pr.sh @@ -85,7 +85,8 @@ echo "Updating Stackage..." echo "Updating Hackage hashes..." ./maintainers/scripts/haskell/update-hackage.sh --do-commit echo "Regenerating Hackage packages..." -./maintainers/scripts/haskell/regenerate-hackage-packages.sh --do-commit +# Using fast here because after the hackage-update eval errors will likely break the transitive dependencies check. +./maintainers/scripts/haskell/regenerate-hackage-packages.sh --fast --do-commit # Push these new commits to the haskell-updates branch echo "Pushing commits just created to the remote haskell-updates branch..." diff --git a/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh b/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh index 5a17b05183571..a317dba4d4e77 100755 --- a/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh +++ b/maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh @@ -1,9 +1,18 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p coreutils jq nix -I nixpkgs=. +set -euo pipefail + +TMP_TEMPLATE=transitive-broken.XXXXXXX +readonly TMP_TEMPLATE + +tmpfile=$(mktemp "$TMP_TEMPLATE") + +trap 'rm -f "${tmpfile}"' 0 + config_file=pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml -cat > $config_file << EOF +cat > $tmpfile << EOF # This file is automatically generated by # maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh # It is supposed to list all haskellPackages that cannot evaluate because they @@ -11,4 +20,6 @@ cat > $config_file << EOF dont-distribute-packages: EOF -nix-instantiate --eval --option restrict-eval true -I . --strict --json maintainers/scripts/haskell/transitive-broken-packages.nix | jq -r . | LC_ALL=C.UTF-8 sort -i >> $config_file +nix-instantiate --eval --option restrict-eval true -I . --strict --json maintainers/scripts/haskell/transitive-broken-packages.nix | jq -r . | LC_ALL=C.UTF-8 sort -i >> $tmpfile + +mv $tmpfile $config_file |