From 6a5c6a9e079e7a913dee97bd5020109fad1114f7 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 3 Jan 2023 15:16:01 +0000 Subject: [PATCH 1/4] unstable: include nix explicitly --- pkgs/top-level/release.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 6f9db1f5769b..5a32f6ee3ae7 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -120,6 +120,7 @@ let jobs.cargo.x86_64-linux jobs.go.x86_64-linux jobs.linux.x86_64-linux + jobs.nix.x86_64-linux jobs.pandoc.x86_64-linux jobs.python3.x86_64-linux # Needed by contributors to test PRs (by inclusion of the PR template) @@ -158,6 +159,7 @@ let jobs.go.x86_64-darwin jobs.python3.x86_64-darwin jobs.nixpkgs-review.x86_64-darwin + jobs.nix.x86_64-darwin jobs.nix-info.x86_64-darwin jobs.nix-info-tested.x86_64-darwin jobs.git.x86_64-darwin From 0255c3a1ef580b7e2202875faf227554920a4145 Mon Sep 17 00:00:00 2001 From: Graham Christensen Date: Tue, 3 Jan 2023 15:16:19 +0000 Subject: [PATCH 2/4] nixpkgs release: explicitly add aarch64-darwin blockers --- pkgs/top-level/release.nix | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 5a32f6ee3ae7..2932540bea33 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -182,6 +182,36 @@ let jobs.tests.macOSSierraShared.x86_64-darwin jobs.tests.stdenv.hooks.patch-shebangs.x86_64-darwin */ + ] + ++ lib.optionals supportDarwin.aarch64 [ + jobs.stdenv.aarch64-darwin + jobs.cargo.aarch64-darwin + jobs.cachix.aarch64-darwin + jobs.go.aarch64-darwin + jobs.python3.aarch64-darwin + jobs.nixpkgs-review.aarch64-darwin + jobs.nix.aarch64-darwin + jobs.nix-info.aarch64-darwin + jobs.nix-info-tested.aarch64-darwin + jobs.git.aarch64-darwin + jobs.mariadb.aarch64-darwin + jobs.vim.aarch64-darwin + jobs.inkscape.aarch64-darwin + jobs.qt5.qtmultimedia.aarch64-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.stdenv-inputs.x86_64-darwin + jobs.tests.macOSSierraShared.x86_64-darwin + jobs.tests.patch-shebangs.x86_64-darwin + */ ]; }; From 9321e71d93f652879c8fce2d27763aeded710a60 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 11 Oct 2023 14:27:59 +0200 Subject: [PATCH 3/4] nixpkgs release: replace outdated comment --- pkgs/top-level/release.nix | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 2932540bea33..8aa03b166872 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -198,20 +198,7 @@ let jobs.vim.aarch64-darwin jobs.inkscape.aarch64-darwin jobs.qt5.qtmultimedia.aarch64-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.stdenv-inputs.x86_64-darwin - jobs.tests.macOSSierraShared.x86_64-darwin - jobs.tests.patch-shebangs.x86_64-darwin - */ + /* consider adding tests, as suggested above for x86_64-darwin */ ]; }; From 4ff8491ac0c4f02d15d6089d2d1de169c9b78198 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 11 Oct 2023 14:32:18 +0200 Subject: [PATCH 4/4] nixpkgs release: leave breadcrumb about commented tests Wish I could do more rn, so adding this to help the next person. --- pkgs/top-level/release.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 8aa03b166872..f66179d2e90d 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -133,6 +133,8 @@ let jobs.cachix.x86_64-linux /* + TODO: re-add tests; context: https://github.com/NixOS/nixpkgs/commit/36587a587ab191eddd868179d63c82cdd5dee21b + jobs.tests.cc-wrapper.default.x86_64-linux jobs.tests.cc-wrapper.gcc7Stdenv.x86_64-linux jobs.tests.cc-wrapper.gcc8Stdenv.x86_64-linux