From 25833baaa4556f09f30a63b7ddbebfe6a8dfffd1 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Fri, 21 Feb 2025 12:11:56 -0800 Subject: [PATCH] testers.testBuildFailure': use default.nix and move recurseIntoAttrs into tests.nix --- pkgs/build-support/testers/default.nix | 2 +- .../testers/testBuildFailurePrime/{tester.nix => default.nix} | 0 pkgs/build-support/testers/testBuildFailurePrime/tests.nix | 4 +++- 3 files changed, 4 insertions(+), 2 deletions(-) rename pkgs/build-support/testers/testBuildFailurePrime/{tester.nix => default.nix} (100%) diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix index 0fcbeff9f0d0..4e0be62cc886 100644 --- a/pkgs/build-support/testers/default.nix +++ b/pkgs/build-support/testers/default.nix @@ -37,7 +37,7 @@ # See https://nixos.org/manual/nixpkgs/unstable/#tester-testBuildFailurePrime # or doc/build-helpers/testers.chapter.md # NOTE: Must be `import`-ed rather than `callPackage`-d to preserve the `override` attribute. - testBuildFailure' = import ./testBuildFailurePrime/tester.nix { inherit lib stdenvNoCC testers; }; + testBuildFailure' = import ./testBuildFailurePrime { inherit lib stdenvNoCC testers; }; # See https://nixos.org/manual/nixpkgs/unstable/#tester-testEqualDerivation # or doc/build-helpers/testers.chapter.md diff --git a/pkgs/build-support/testers/testBuildFailurePrime/tester.nix b/pkgs/build-support/testers/testBuildFailurePrime/default.nix similarity index 100% rename from pkgs/build-support/testers/testBuildFailurePrime/tester.nix rename to pkgs/build-support/testers/testBuildFailurePrime/default.nix diff --git a/pkgs/build-support/testers/testBuildFailurePrime/tests.nix b/pkgs/build-support/testers/testBuildFailurePrime/tests.nix index 1f1adadccb32..2664f752cd89 100644 --- a/pkgs/build-support/testers/testBuildFailurePrime/tests.nix +++ b/pkgs/build-support/testers/testBuildFailurePrime/tests.nix @@ -1,12 +1,14 @@ { emptyDirectory, hello, + lib, overrideStructuredAttrs, runCommand, stdenvNoCC, testers, }: let + inherit (lib.attrsets) recurseIntoAttrs; final = { # NOTE: This example is used in the docs. # See https://nixos.org/manual/nixpkgs/unstable/#tester-testBuildFailurePrime @@ -144,4 +146,4 @@ let logNegativeTestStructuredAttrs = overrideStructuredAttrs true final.logNegativeTest; }; in -final +recurseIntoAttrs final