diff options
| author | Joe Hermaszewski <git@monoid.al> | 2021-06-30 23:18:16 +0800 |
|---|---|---|
| committer | Joe Hermaszewski <git@monoid.al> | 2021-06-30 23:18:49 +0800 |
| commit | df8f2736d54dfc8eac8f648b05f87b5eac2c1241 (patch) | |
| tree | 566e4a9b3a528d785d0c24572e195ee679b2752b /maintainers/scripts | |
| parent | 79fb3e33c5129a49870070016486ad95ab27ac7d (diff) | |
| download | nixpkgs-df8f2736d54dfc8eac8f648b05f87b5eac2c1241.tar nixpkgs-df8f2736d54dfc8eac8f648b05f87b5eac2c1241.tar.gz nixpkgs-df8f2736d54dfc8eac8f648b05f87b5eac2c1241.tar.bz2 nixpkgs-df8f2736d54dfc8eac8f648b05f87b5eac2c1241.tar.lz nixpkgs-df8f2736d54dfc8eac8f648b05f87b5eac2c1241.tar.xz nixpkgs-df8f2736d54dfc8eac8f648b05f87b5eac2c1241.tar.zst nixpkgs-df8f2736d54dfc8eac8f648b05f87b5eac2c1241.zip | |
maintainers/scripts/haskell: clear environment while regenerating
Also misc shellcheck fixes
Diffstat (limited to 'maintainers/scripts')
| -rwxr-xr-x | maintainers/scripts/haskell/mark-broken.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/maintainers/scripts/haskell/mark-broken.sh b/maintainers/scripts/haskell/mark-broken.sh index 58433abe662..71568ef6f20 100755 --- a/maintainers/scripts/haskell/mark-broken.sh +++ b/maintainers/scripts/haskell/mark-broken.sh @@ -17,9 +17,9 @@ trap "rm ${tmpfile}" 0 echo "Remember that you need to manually run 'maintainers/scripts/haskell/hydra-report.hs get-report' sometime before running this script." echo "Generating a list of broken builds and displaying for manual confirmation ..." -maintainers/scripts/haskell/hydra-report.hs mark-broken-list | sort -i > $tmpfile +maintainers/scripts/haskell/hydra-report.hs mark-broken-list | sort -i > "$tmpfile" -$EDITOR $tmpfile +$EDITOR "$tmpfile" tail -n +3 "$broken_config" >> "$tmpfile" @@ -28,10 +28,11 @@ broken-packages: # These packages don't compile. EOF +# clear environment here to avoid things like allowing broken builds in sort -iu "$tmpfile" >> "$broken_config" -maintainers/scripts/haskell/regenerate-hackage-packages.sh -maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh -maintainers/scripts/haskell/regenerate-hackage-packages.sh +env -i maintainers/scripts/haskell/regenerate-hackage-packages.sh +env -i maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh +env -i maintainers/scripts/haskell/regenerate-hackage-packages.sh if [[ "${1:-}" == "--do-commit" ]]; then git add $broken_config |