From d46e72d04392a20abd88a75bf14dda325ef9bab6 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Wed, 21 Jul 2021 12:41:24 +0800 Subject: [PATCH] maintainers/scripts/haskell: Better env clearing while regenerating --- maintainers/scripts/haskell/mark-broken.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/maintainers/scripts/haskell/mark-broken.sh b/maintainers/scripts/haskell/mark-broken.sh index 71568ef6f20..97dd5be8aaa 100755 --- a/maintainers/scripts/haskell/mark-broken.sh +++ b/maintainers/scripts/haskell/mark-broken.sh @@ -30,9 +30,10 @@ EOF # clear environment here to avoid things like allowing broken builds in sort -iu "$tmpfile" >> "$broken_config" -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 +clear="env -u HOME -u NIXPKGS_CONFIG" +$clear maintainers/scripts/haskell/regenerate-hackage-packages.sh +$clear maintainers/scripts/haskell/regenerate-transitive-broken-packages.sh +$clear maintainers/scripts/haskell/regenerate-hackage-packages.sh if [[ "${1:-}" == "--do-commit" ]]; then git add $broken_config