max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-23 06:26:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'NixOS:master' into debug-exploratory-PR

Browse source
This commit is contained in:
Ben Burdette 2022-05-05 13:54:20 -06:00 committed by GitHub
commit 0ac121a094
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libexpr/eval-cache.cc
View file

@ -673,7 +673,8 @@ std::vector<std::string> AttrCursor::getListOfStrings()
for (auto & elem : v.listItems()) for (auto & elem : v.listItems())
res.push_back(std::string(root->state.forceStringNoCtx(*elem))); res.push_back(std::string(root->state.forceStringNoCtx(*elem)));
cachedValue = {root->db->setListOfStrings(getKey(), res), res}; if (root->db)
cachedValue = {root->db->setListOfStrings(getKey(), res), res};
return res; return res;
} }

7
tests/build.sh
View file

@ -56,6 +56,13 @@ nix build -f multiple-outputs.nix --json 'e^*' --no-link | jq --exit-status '
(.outputs | keys == ["a", "b", "c"])) (.outputs | keys == ["a", "b", "c"]))
' '
# Make sure that `--impure` works (regression test for https://github.com/NixOS/nix/issues/6488)
nix build --impure -f multiple-outputs.nix --json e --no-link | jq --exit-status '
(.[0] |
(.drvPath | match(".*multiple-outputs-e.drv")) and
(.outputs | keys == ["a", "b"]))
'
testNormalization () { testNormalization () {
clearStore clearStore
outPath=$(nix-build ./simple.nix --no-out-link) outPath=$(nix-build ./simple.nix --no-out-link)

49
tests/lang/eval-okay-fromjson.nix
View file

@ -1,36 +1,35 @@
# RFC 7159, section 13.
builtins.fromJSON builtins.fromJSON
'' ''
{ {
"Image": { "Video": {
"Width": 800, "Title": "The Penguin Chronicles",
"Height": 600, "Width": 1920,
"Title": "View from 15th Floor", "Height": 1080,
"Thumbnail": { "EmbeddedData": [3.14159, 23493,null, true ,false, -10],
"Url": "http://www.example.com/image/481989943", "Thumb": {
"Height": 125, "Url": "http://www.example.com/video/5678931",
"Width": 100 "Width": 200,
"Height": 250
}, },
"Animated" : false, "Subtitle" : false,
"IDs": [116, 943, 234, 38793, true ,false,null, -100], "Latitude": 46.2051,
"Latitude": 37.7668, "Longitude": 6.0723
"Longitude": -122.3959
} }
} }
'' ''
== ==
{ Image = { Video =
{ Width = 800; { Title = "The Penguin Chronicles";
Height = 600; Width = 1920;
Title = "View from 15th Floor"; Height = 1080;
Thumbnail = EmbeddedData = [ 3.14159 23493 null true false (0-10) ];
{ Url = http://www.example.com/image/481989943; Thumb =
Height = 125; { Url = "http://www.example.com/video/5678931";
Width = 100; Width = 200;
Height = 250;
}; };
Animated = false; Subtitle = false;
IDs = [ 116 943 234 38793 true false null (0-100) ]; Latitude = 46.2051;
Latitude = 37.7668; Longitude = 6.0723;
Longitude = -122.3959;
}; };
} }