about summary refs log tree commit diff
path: root/pkgs/top-level/release.nix
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2023-09-08 06:00:58 +0000
committerGitHub <noreply@github.com>2023-09-08 06:00:58 +0000
commitd987b47512b9db3928ce45b2bc7f43db860cd944 (patch)
tree2d9a63753f42b06b0643a9b553dfb7bbb6a1fa45 /pkgs/top-level/release.nix
parent542aa87231d98d70caeb56bef05028ecdc48a388 (diff)
parentd442dbe4872e60e04b6084ac68eb2f0969cc25f7 (diff)
downloadnixlib-d987b47512b9db3928ce45b2bc7f43db860cd944.tar
nixlib-d987b47512b9db3928ce45b2bc7f43db860cd944.tar.gz
nixlib-d987b47512b9db3928ce45b2bc7f43db860cd944.tar.bz2
nixlib-d987b47512b9db3928ce45b2bc7f43db860cd944.tar.lz
nixlib-d987b47512b9db3928ce45b2bc7f43db860cd944.tar.xz
nixlib-d987b47512b9db3928ce45b2bc7f43db860cd944.tar.zst
nixlib-d987b47512b9db3928ce45b2bc7f43db860cd944.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level/release.nix')
-rw-r--r--pkgs/top-level/release.nix42
1 files changed, 21 insertions, 21 deletions
diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index 1747a32030e8..a34b7e1ad548 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -89,9 +89,9 @@ let
 
               # Tests
               /*
-              jobs.tests.cc-wrapper.x86_64-darwin
-              jobs.tests.cc-wrapper-clang.x86_64-darwin
-              jobs.tests.cc-wrapper-libcxx.x86_64-darwin
+              jobs.tests.cc-wrapper.default.x86_64-darwin
+              jobs.tests.cc-wrapper.llvmPackages.clang.x86_64-darwin
+              jobs.tests.cc-wrapper.llvmPackages.libcxx.x86_64-darwin
               jobs.tests.stdenv-inputs.x86_64-darwin
               jobs.tests.macOSSierraShared.x86_64-darwin
               jobs.tests.stdenv.hooks.patch-shebangs.x86_64-darwin
@@ -124,18 +124,18 @@ let
               jobs.cachix.x86_64-linux
 
               /*
-              jobs.tests.cc-wrapper.x86_64-linux
-              jobs.tests.cc-wrapper-gcc7.x86_64-linux
-              jobs.tests.cc-wrapper-gcc8.x86_64-linux
+              jobs.tests.cc-wrapper.default.x86_64-linux
+              jobs.tests.cc-wrapper.gcc7Stdenv.x86_64-linux
+              jobs.tests.cc-wrapper.gcc8Stdenv.x86_64-linux
 
               # broken see issue #40038
 
-              jobs.tests.cc-wrapper-clang.x86_64-linux
-              jobs.tests.cc-wrapper-libcxx.x86_64-linux
-              jobs.tests.cc-wrapper-clang-5.x86_64-linux
-              jobs.tests.cc-wrapper-libcxx-5.x86_64-linux
-              jobs.tests.cc-wrapper-clang-6.x86_64-linux
-              jobs.tests.cc-wrapper-libcxx-6.x86_64-linux
+              jobs.tests.cc-wrapper.llvmPackages.clang.x86_64-linux
+              jobs.tests.cc-wrapper.llvmPackages.libcxx.x86_64-linux
+              jobs.tests.cc-wrapper.llvmPackages_5.clang.x86_64-linux
+              jobs.tests.cc-wrapper.llvmPackages_5.libcxx.x86_64-linux
+              jobs.tests.cc-wrapper.llvmPackages_6.clang.x86_64-linux
+              jobs.tests.cc-wrapper.llvmPackages_6.libcxx.x86_64-linux
               jobs.tests.cc-multilib-gcc.x86_64-linux
               jobs.tests.cc-multilib-clang.x86_64-linux
               jobs.tests.stdenv-inputs.x86_64-linux
@@ -158,15 +158,15 @@ let
               jobs.inkscape.x86_64-darwin
               jobs.qt5.qtmultimedia.x86_64-darwin
               /*
-              jobs.tests.cc-wrapper.x86_64-darwin
-              jobs.tests.cc-wrapper-gcc7.x86_64-darwin
-              # jobs.tests.cc-wrapper-gcc8.x86_64-darwin
-              jobs.tests.cc-wrapper-clang.x86_64-darwin
-              jobs.tests.cc-wrapper-libcxx.x86_64-darwin
-              jobs.tests.cc-wrapper-clang-5.x86_64-darwin
-              jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin
-              jobs.tests.cc-wrapper-clang-6.x86_64-darwin
-              jobs.tests.cc-wrapper-libcxx-6.x86_64-darwin
+              jobs.tests.cc-wrapper.default.x86_64-darwin
+              jobs.tests.cc-wrapper.gcc7Stdenv.x86_64-darwin
+              jobs.tests.cc-wrapper.gcc8Stdenv.x86_64-darwin
+              jobs.tests.cc-wrapper.llvmPackages.clang.x86_64-darwin
+              jobs.tests.cc-wrapper.llvmPackages.libcxx.x86_64-darwin
+              jobs.tests.cc-wrapper.llvmPackages_5.clang.x86_64-darwin
+              jobs.tests.cc-wrapper.llvmPackages_5.libcxx.x86_64-darwin
+              jobs.tests.cc-wrapper.llvmPackages_6.clang.x86_64-darwin
+              jobs.tests.cc-wrapper.llvmPackages_6.libcxx.x86_64-darwin
               jobs.tests.stdenv-inputs.x86_64-darwin
               jobs.tests.macOSSierraShared.x86_64-darwin
               jobs.tests.stdenv.hooks.patch-shebangs.x86_64-darwin