From ee6ba1c420cff7a641f7b60134bdbe428ae06405 Mon Sep 17 00:00:00 2001 From: jopejoe1 Date: Sat, 2 Aug 2025 02:10:56 +0200 Subject: [PATCH] tests: recourse into makes it so nixpkgs-review is running tests --- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/packages-config.nix | 3 +++ pkgs/top-level/release.nix | 2 -- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15b7b79653f42..69c3ee1a00ff1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -119,7 +119,7 @@ with pkgs; You should not evaluate entire Nixpkgs without measures to handle failing packages. ''; - tests = callPackages ../test { }; + tests = lib.recurseIntoAttrs (callPackages ../test { }); defaultPkgConfigPackages = # We don't want nix-env -q to enter this, because all of these are aliases. diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix index 7cf415ac80504..b90bbcb080a8e 100644 --- a/pkgs/top-level/packages-config.nix +++ b/pkgs/top-level/packages-config.nix @@ -43,5 +43,8 @@ # show up in search results or repository tracking services that consume our # packages.json https://github.com/NixOS/nixpkgs/issues/244966 minimal-bootstrap = { }; + + # This makes it so that tests are not appering on search.nixos.org + tests = { }; }; } diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index ce84a3b25f42a..79912d1cdab38 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -419,8 +419,6 @@ let "aarch64-linux" ]; - tests = packagePlatforms pkgs.tests; - # Language packages disabled in https://github.com/NixOS/nixpkgs/commit/ccd1029f58a3bb9eca32d81bf3f33cb4be25cc66 #emacsPackages = packagePlatforms pkgs.emacsPackages;