diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-06 18:30:33 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-06 18:30:33 +0000 |
| commit | 0093d2d2d82933bcd174b5ca77ec3c42c55ff3da (patch) | |
| tree | 926e0a88d417da1aff661430eaa7bfcbc0054dc2 /maintainers | |
| parent | 6076dbb0855cf11aff185dbbfca477be1546ae89 (diff) | |
| parent | b45f157f0321290b4f4f840b1dbd1cd8e87c57d7 (diff) | |
| download | nixpkgs-0093d2d2d82933bcd174b5ca77ec3c42c55ff3da.tar nixpkgs-0093d2d2d82933bcd174b5ca77ec3c42c55ff3da.tar.gz nixpkgs-0093d2d2d82933bcd174b5ca77ec3c42c55ff3da.tar.bz2 nixpkgs-0093d2d2d82933bcd174b5ca77ec3c42c55ff3da.tar.lz nixpkgs-0093d2d2d82933bcd174b5ca77ec3c42c55ff3da.tar.xz nixpkgs-0093d2d2d82933bcd174b5ca77ec3c42c55ff3da.tar.zst nixpkgs-0093d2d2d82933bcd174b5ca77ec3c42c55ff3da.zip | |
Merge master into staging-next
Diffstat (limited to 'maintainers')
| -rwxr-xr-x | maintainers/scripts/haskell/regenerate-hackage-packages.sh | 4 | ||||
| -rw-r--r-- | maintainers/team-list.nix | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/maintainers/scripts/haskell/regenerate-hackage-packages.sh b/maintainers/scripts/haskell/regenerate-hackage-packages.sh index 1effa5e2596..e7f91f2d79d 100755 --- a/maintainers/scripts/haskell/regenerate-hackage-packages.sh +++ b/maintainers/scripts/haskell/regenerate-hackage-packages.sh @@ -14,6 +14,8 @@ set -euo pipefail +HACKAGE2NIX="${HACKAGE2NIX:-hackage2nix}" + # To prevent hackage2nix fails because of encoding. # See: https://github.com/NixOS/nixpkgs/pull/122023 export LC_ALL=C.UTF-8 @@ -23,7 +25,7 @@ unpacked_hackage="$(nix-build -E "$extraction_derivation" --no-out-link)" config_dir=pkgs/development/haskell-modules/configuration-hackage2nix echo "Starting hackage2nix to regenerate pkgs/development/haskell-modules/hackage-packages.nix ..." -hackage2nix \ +"$HACKAGE2NIX" \ --hackage "$unpacked_hackage" \ --preferred-versions <(for n in "$unpacked_hackage"/*/preferred-versions; do cat "$n"; echo; done) \ --nixpkgs "$PWD" \ diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index ab05ab7a5b2..3e6843f0e57 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -155,7 +155,6 @@ with lib.maintainers; { matrix = { members = [ ma27 - pacien fadenb mguentner ekleog |