From 52a744b7f89a9add978bc1d6cc5d92352580eca4 Mon Sep 17 00:00:00 2001 From: Artturin Date: Wed, 20 Apr 2022 05:50:27 +0300 Subject: [PATCH] testers.testEqualDerivation: move from build-support/test-equal-derivation.nix --- pkgs/applications/misc/hello/default.nix | 4 ++-- pkgs/build-support/testers/default.nix | 4 ++++ pkgs/build-support/{ => testers}/test-equal-derivation.nix | 0 pkgs/top-level/all-packages.nix | 4 ++-- 4 files changed, 8 insertions(+), 4 deletions(-) create mode 100644 pkgs/build-support/testers/default.nix rename pkgs/build-support/{ => testers}/test-equal-derivation.nix (100%) diff --git a/pkgs/applications/misc/hello/default.nix b/pkgs/applications/misc/hello/default.nix index ce49cfd69ca..ecb78928217 100644 --- a/pkgs/applications/misc/hello/default.nix +++ b/pkgs/applications/misc/hello/default.nix @@ -3,7 +3,7 @@ , fetchurl , nixos , testVersion -, testEqualDerivation +, testers , hello }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { version = testVersion { package = hello; }; invariant-under-noXlibs = - testEqualDerivation + testers.testEqualDerivation "hello must not be rebuilt when environment.noXlibs is set." hello (nixos { environment.noXlibs = true; }).pkgs.hello; diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix new file mode 100644 index 00000000000..1d1effa3730 --- /dev/null +++ b/pkgs/build-support/testers/default.nix @@ -0,0 +1,4 @@ +{ pkgs, lib, callPackage }: +{ + testEqualDerivation = callPackage ./test-equal-derivation.nix { }; +} diff --git a/pkgs/build-support/test-equal-derivation.nix b/pkgs/build-support/testers/test-equal-derivation.nix similarity index 100% rename from pkgs/build-support/test-equal-derivation.nix rename to pkgs/build-support/testers/test-equal-derivation.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 789360728df..04f02c4685a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -904,6 +904,8 @@ with pkgs; # lib functions depending on pkgs inherit (import ../pkgs-lib { inherit lib pkgs; }) formats; + testers = callPackage ../build-support/testers {}; + ### TOOLS _3llo = callPackage ../tools/misc/3llo { }; @@ -10650,8 +10652,6 @@ with pkgs; termplay = callPackage ../tools/misc/termplay { }; - testEqualDerivation = callPackage ../build-support/test-equal-derivation.nix { }; - tetrd = callPackage ../applications/networking/tetrd { }; tewisay = callPackage ../tools/misc/tewisay { };