lix-project/lix
20
57
Fork 31
Code Issues 347 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge "Remove ancient let from 2 test files" into main

Browse source
This commit is contained in:
V. 2024-10-14 22:06:48 +00:00 committed by Gerrit Code Review
parent 4682e40183 31ff77b3f9
commit fbf7a8b440
2 changed files with 21 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
tests/functional/dependencies.nix
View file

@ -1,8 +1,7 @@
{ hashInvalidator ? "" }: { hashInvalidator ? "" }:
with import ./config.nix; with import ./config.nix;
let { let
input0 = mkDerivation { input0 = mkDerivation {
name = "dependencies-input-0"; name = "dependencies-input-0";
buildCommand = "mkdir $out; echo foo > $out/bar"; buildCommand = "mkdir $out; echo foo > $out/bar";
@ -32,17 +31,15 @@ let {
outputHashAlgo = "sha256"; outputHashAlgo = "sha256";
outputHash = "1dq9p0hnm1y75q2x40fws5887bq1r840hzdxak0a9djbwvx0b16d"; outputHash = "1dq9p0hnm1y75q2x40fws5887bq1r840hzdxak0a9djbwvx0b16d";
}; };
in
body = mkDerivation { mkDerivation {
name = "dependencies-top"; name = "dependencies-top";
builder = ./dependencies.builder0.sh + "/FOOBAR/../."; builder = ./dependencies.builder0.sh + "/FOOBAR/../.";
input1 = input1 + "/."; input1 = input1 + "/.";
input2 = "${input2}/."; input2 = "${input2}/.";
input1_drv = input1; input1_drv = input1;
input2_drv = input2; input2_drv = input2;
input0_drv = input0; input0_drv = input0;
fod_input_drv = fod_input; fod_input_drv = fod_input;
meta.description = "Random test package"; meta.description = "Random test package";
};
} }

21
tests/functional/hash-check.nix
View file

@ -1,5 +1,4 @@
let { let
input1 = derivation { input1 = derivation {
name = "dependencies-input-1"; name = "dependencies-input-1";
system = "i086-msdos"; system = "i086-msdos";
@ -16,14 +15,12 @@ let {
outputHashAlgo = "md5"; outputHashAlgo = "md5";
outputHash = "ffffffffffffffffffffffffffffffff"; outputHash = "ffffffffffffffffffffffffffffffff";
}; };
in
body = derivation { derivation {
name = "dependencies"; name = "dependencies";
system = "i086-msdos"; system = "i086-msdos";
builder = "/bar/sh"; builder = "/bar/sh";
args = ["-e" "-x" (./dummy + "/FOOBAR/../.")]; args = ["-e" "-x" (./dummy + "/FOOBAR/../.")];
input1 = input1 + "/."; input1 = input1 + "/.";
inherit input2; inherit input2;
};
} }