diff options
| author | Artturin <Artturin@artturin.com> | 2022-06-29 17:38:34 +0300 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2022-07-02 03:38:15 +0300 |
| commit | 7141ab0f0b404a95509503e7b16a7f0072a66902 (patch) | |
| tree | c11399a58641426c4524a23271c68dc4c3f6077e | |
| parent | 47b58ff43ebaef0307f4ef2de4e760ced3066cbf (diff) | |
| download | nixpkgs-7141ab0f0b404a95509503e7b16a7f0072a66902.tar nixpkgs-7141ab0f0b404a95509503e7b16a7f0072a66902.tar.gz nixpkgs-7141ab0f0b404a95509503e7b16a7f0072a66902.tar.bz2 nixpkgs-7141ab0f0b404a95509503e7b16a7f0072a66902.tar.lz nixpkgs-7141ab0f0b404a95509503e7b16a7f0072a66902.tar.xz nixpkgs-7141ab0f0b404a95509503e7b16a7f0072a66902.tar.zst nixpkgs-7141ab0f0b404a95509503e7b16a7f0072a66902.zip | |
release: add tests.packageTestsForChannelBlockers.curl.withCheck as a channel blocker
we can't add 'nixpkgs.curl.tests' to hydra jobs due to 'tests' (and 'passthru') being stripped TODO: add a function in lib-release.nix to get derivations and add `.x86_64-linux` to them then we can just point release files to nixpkgs.tests.packageTestsForChannelBlockers instead of nixpkgs.tests.packageTestsForChannelBlockers.curl.withCheck
| -rw-r--r-- | nixos/release-combined.nix | 1 | ||||
| -rw-r--r-- | nixos/release-small.nix | 1 | ||||
| -rw-r--r-- | pkgs/test/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/release.nix | 2 |
4 files changed, 12 insertions, 0 deletions
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 7f81ca1c69b..626a16bd9e2 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -156,6 +156,7 @@ in rec { (onSystems ["i686-linux"] "nixos.tests.zfs.installer") (onFullSupported "nixpkgs.emacs") (onFullSupported "nixpkgs.jdk") + (onFullSupported "nixpkgs.tests.packageTestsForChannelBlockers.curl.withCheck") ["nixpkgs.tarball"] ]; }; diff --git a/nixos/release-small.nix b/nixos/release-small.nix index 1d51b4e7f28..bd1e1b95d1f 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -120,6 +120,7 @@ in rec { "nixos.tests.proxy.x86_64-linux" "nixos.tests.simple.x86_64-linux" "nixpkgs.jdk.x86_64-linux" + "nixpkgs.tests.packageTestsForChannelBlockers.curl.withCheck.x86_64-linux" "nixpkgs.tarball" ]; }; diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix index 48bd6ac7746..f78e8099e72 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -24,6 +24,14 @@ with pkgs; config = callPackage ./config.nix { }; + # we can't add 'nixpkgs.curl.tests' to hydra jobs due to 'tests' (and 'passthru') being stripped + # TODO: add a function in lib-release.nix to get derivations and add `.x86_64-linux` to them + # then we can just point release files to nixpkgs.tests.packageTestsForChannelBlockers instead of + # nixpkgs.tests.packageTestsForChannelBlockers.curl.withCheck + packageTestsForChannelBlockers = recurseIntoAttrs { + curl = recurseIntoAttrs pkgs.curl.tests; + }; + haskell = callPackage ./haskell { }; cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; }; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index bac3d1b1171..c2d21b196a8 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -97,6 +97,7 @@ let jobs.lib-tests jobs.pkgs-lib-tests jobs.stdenv.x86_64-linux + jobs.tests.packageTestsForChannelBlockers.curl.withCheck.x86_64-linux jobs.cargo.x86_64-linux jobs.go.x86_64-linux jobs.linux.x86_64-linux @@ -133,6 +134,7 @@ let ++ lib.collect lib.isDerivation jobs.stdenvBootstrapTools ++ lib.optionals supportDarwin.x86_64 [ jobs.stdenv.x86_64-darwin + jobs.tests.packageTestsForChannelBlockers.curl.withCheck.x86_64-darwin jobs.cargo.x86_64-darwin jobs.cachix.x86_64-darwin jobs.go.x86_64-darwin |