diff options
| author | Artturin <Artturin@artturin.com> | 2022-07-12 15:00:38 +0300 |
|---|---|---|
| committer | Artturin <Artturin@artturin.com> | 2022-07-12 15:00:38 +0300 |
| commit | ea8e40cd0ac3ae51324dc8f4bdcd89cf9cb1b422 (patch) | |
| tree | 602483f6f354306772e1760daa3ee0390f33bad1 | |
| parent | a05ef3b5f512b1713295e87950ee420045625a0b (diff) | |
Revert "release: add tests.packageTestsForChannelBlockers.curl.withCheck as a channel blocker"
This reverts commit 7141ab0f0b404a95509503e7b16a7f0072a66902.
reverting this for now to unblock staging-next
{UNKNOWN}: aggregate job ‘tested’ failed with the error: nixpkgs.tests.packageTestsForChannelBlockers.curl.withCheck.x86_64-linux: does not exist
at /nix/store/9i92scfqz5idhmjrmjnqhrvjgyydzfns-hydra-perl-deps/lib/perl5/site_perl/5.34.0/Catalyst/Model/DBIC/Schema.pm line 526
| -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, 0 insertions, 12 deletions
diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 626a16bd9e2db..7f81ca1c69b88 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -156,7 +156,6 @@ 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 bd1e1b95d1fb3..1d51b4e7f28f8 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -120,7 +120,6 @@ 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 f22bf46900cec..82975efb59172 100644 --- a/pkgs/test/default.nix +++ b/pkgs/test/default.nix @@ -24,14 +24,6 @@ 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 c2d21b196a8a8..bac3d1b1171dd 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -97,7 +97,6 @@ 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 @@ -134,7 +133,6 @@ 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 |