diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-12-17 00:07:55 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-17 00:07:55 +0000 |
| commit | 2189a53dad0e48ea7211c32cc1832a82001d976b (patch) | |
| tree | 8cfc1958f4b2c91963fd43ee9628dafd535db234 | |
| parent | 82ecb2df7f40b82748f0a6120549546fb2a9ad35 (diff) | |
| parent | de27156be068d0f0b54c546e76f19ae714fa13f0 (diff) | |
Merge master into haskell-updates
121 files changed, 1281 insertions, 14330 deletions
diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 445f0fcbaf8f..28e20d6c9458 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -31,7 +31,8 @@ jobs: - uses: cachix/install-nix-action@v16 with: # nixpkgs commit is pinned so that it doesn't break - nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/f93ecc4f6bc60414d8b73dbdf615ceb6a2c604df.tar.gz + # editorconfig-checker 2.4.0 + nix_path: nixpkgs=https://github.com/NixOS/nixpkgs/archive/c473cc8714710179df205b153f4e9fa007107ff9.tar.gz - name: install editorconfig-checker run: nix-env -iA editorconfig-checker -f '<nixpkgs>' - name: Checking EditorConfig diff --git a/lib/systems/supported.nix b/lib/systems/supported.nix index ef429454f046..a1c038a5c8bc 100644 --- a/lib/systems/supported.nix +++ b/lib/systems/supported.nix @@ -4,7 +4,9 @@ { lib }: rec { # List of systems that are built by Hydra. - hydra = tier1 ++ tier2 ++ tier3; + hydra = tier1 ++ tier2 ++ tier3 ++ [ + "aarch64-darwin" + ]; tier1 = [ "x86_64-linux" @@ -16,7 +18,6 @@ rec { ]; tier3 = [ - "aarch64-darwin" "armv6l-linux" "armv7l-linux" "i686-linux" diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 5c6dea91e63e..377fc02fef5a 100644 --- a/m |