b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

testers.testEqualDerivation: move from build-support/test-equal-derivation.nix

Browse source
This commit is contained in:
Artturin 2022-04-20 05:50:27 +03:00
parent 4a28d0f3bd
commit 52a744b7f8
4 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/applications/misc/hello/default.nix
View file

@ -3,7 +3,7 @@
, fetchurl , fetchurl
, nixos , nixos
, testVersion , testVersion
, testEqualDerivation , testers
, hello , hello
}: }:
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
version = testVersion { package = hello; }; version = testVersion { package = hello; };
invariant-under-noXlibs = invariant-under-noXlibs =
testEqualDerivation testers.testEqualDerivation
"hello must not be rebuilt when environment.noXlibs is set." "hello must not be rebuilt when environment.noXlibs is set."
hello hello
(nixos { environment.noXlibs = true; }).pkgs.hello; (nixos { environment.noXlibs = true; }).pkgs.hello;

4
pkgs/build-support/testers/default.nix Normal file
View file

@ -0,0 +1,4 @@
{ pkgs, lib, callPackage }:
{
testEqualDerivation = callPackage ./test-equal-derivation.nix { };
}

0
pkgs/build-support/test-equal-derivation.nix → pkgs/build-support/testers/test-equal-derivation.nix
View file

4
pkgs/top-level/all-packages.nix
View file

@ -904,6 +904,8 @@ with pkgs;
# lib functions depending on pkgs # lib functions depending on pkgs
inherit (import ../pkgs-lib { inherit lib pkgs; }) formats; inherit (import ../pkgs-lib { inherit lib pkgs; }) formats;
testers = callPackage ../build-support/testers {};
### TOOLS ### TOOLS
_3llo = callPackage ../tools/misc/3llo { }; _3llo = callPackage ../tools/misc/3llo { };
@ -10650,8 +10652,6 @@ with pkgs;
termplay = callPackage ../tools/misc/termplay { }; termplay = callPackage ../tools/misc/termplay { };
testEqualDerivation = callPackage ../build-support/test-equal-derivation.nix { };
tetrd = callPackage ../applications/networking/tetrd { }; tetrd = callPackage ../applications/networking/tetrd { };
tewisay = callPackage ../tools/misc/tewisay { }; tewisay = callPackage ../tools/misc/tewisay { };