gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge #264581: formats.libconfig: fix store path dependency in test

Browse Source
This commit is contained in:
Vladimír Čunát
2023-11-01 15:34:15 +01:00
parent d9493be7c8 faf4e7b2dc
commit de4eef27dc
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/pkgs-lib/formats/libconfig/test/comprehensive/default.nix
+7 -7
View File
@@ -6,12 +6,9 @@ let
val = 1;
};
include_file = (writeText "libconfig-test-include" ''
include_file = writeText "libconfig-test-include" ''
val=1;
'').overrideAttrs {
outputHashAlgo = "sha256";
outputHashMode = "flat";
};
'';
expression = {
simple_top_level_attr = "1.0";
@@ -63,12 +60,15 @@ in
doCheck = true;
checkPhase = ''
diff -U3 ${./expected.txt} ${libconfig-test-cfg}
cp ${./expected.txt} expected.txt
substituteInPlace expected.txt \
--subst-var-by include_file "${include_file}"
diff -U3 ./expected.txt ${libconfig-test-cfg}
'';
installPhase = ''
mkdir $out
cp ${./expected.txt} $out/expected.txt
cp expected.txt $out
cp ${libconfig-test-cfg} $out/libconfig-test.cfg
cp ${libconfig-test-cfg.passthru.json} $out/libconfig-test.json
'';
pkgs/pkgs-lib/formats/libconfig/test/comprehensive/expected.txt
+1 -1
View File
@@ -1,6 +1,6 @@
array1d=[1, 5, 2];array2d=([1, 2], [2, 1]);list1d=(1, "mixed!", 5, 2);list2d=(1, (1, 1.2, "foo"), ("bar", 1.2, 1));nasty_string="\"@
\\ ^*bf
0\";'''$";nested={attrset={has={a={integer={value=100;};};};};};simple_top_level_attr="1.0";some_floaty=29.95;weirderTypes={
@include "/nix/store/jdz5yhzbbj4j77yrr7l20x1cs4kbwkj2-libconfig-test-include"
@include "@include_file@"
array_of_ints=[0732, 0xa3, 1234];bigint=9223372036854775807;float=0.0012;hex=0x1fc3;list_of_weird_types=(3.141592654, 9223372036854775807, 0x1fc3, 027, 1.2e-32, 1.0);octal=027;pi=3.141592654;};