diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-01-31 00:12:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-31 00:12:49 +0000 |
| commit | 99d08bb8776e23f6cc0b0a4fcd2cd00596a85e52 (patch) | |
| tree | 7cccbe3f0570baad7977c4ca06011da685ea4623 /pkgs/test | |
| parent | b0233d387cce36e7f5f9d94d86539972a5bbd2e3 (diff) | |
| parent | 5a09b85268509aaffa0f1bb8160b5023fa7bdffb (diff) | |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/test')
| -rw-r--r-- | pkgs/test/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 8526b26ab15cf..f6a1b0286cb4f 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -15,6 +15,8 @@ with pkgs; (filter (n: n != "llvmPackages_git")) (filter (n: n != "llvmPackages_6")) (filter (n: n != "llvmPackages_7")) + (filter (n: n != "llvmPackages_8")) + (filter (n: n != "llvmPackages_10")) ]; tests = lib.genAttrs pkgSets (name: recurseIntoAttrs { clang = callPackage ./cc-wrapper { stdenv = pkgs.${name}.stdenv; }; @@ -66,9 +68,7 @@ with pkgs; # libcxxStdenv broken # fix in https://github.com/NixOS/nixpkgs/pull/216273 ] ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ - (filterAttrs (n: _: n != "llvmPackages_8")) (filterAttrs (n: _: n != "llvmPackages_9")) - (filterAttrs (n: _: n != "llvmPackages_10")) ]); in toJSON sets; |