mirror of
https://github.com/NixOS/nix
synced 2024-10-18 00:16:11 -04:00
Change, document and test output order
This commit is contained in:
parent
d599b4f773
commit
3edc164a86
|
@ -803,18 +803,18 @@ StorePath Installable::toStorePath(
|
||||||
return *paths.begin();
|
return *paths.begin();
|
||||||
}
|
}
|
||||||
|
|
||||||
StorePathSet Installable::toDerivations(
|
StorePaths Installable::toDerivations(
|
||||||
ref<Store> store,
|
ref<Store> store,
|
||||||
const Installables & installables,
|
const Installables & installables,
|
||||||
bool useDeriver)
|
bool useDeriver)
|
||||||
{
|
{
|
||||||
StorePathSet drvPaths;
|
StorePaths drvPaths;
|
||||||
|
|
||||||
for (const auto & i : installables)
|
for (const auto & i : installables)
|
||||||
for (const auto & b : i->toDerivedPaths())
|
for (const auto & b : i->toDerivedPaths())
|
||||||
std::visit(overloaded {
|
std::visit(overloaded {
|
||||||
[&](const DerivedPath::Opaque & bo) {
|
[&](const DerivedPath::Opaque & bo) {
|
||||||
drvPaths.insert(
|
drvPaths.push_back(
|
||||||
bo.path.isDerivation()
|
bo.path.isDerivation()
|
||||||
? bo.path
|
? bo.path
|
||||||
: useDeriver
|
: useDeriver
|
||||||
|
@ -822,7 +822,7 @@ StorePathSet Installable::toDerivations(
|
||||||
: throw Error("argument '%s' did not evaluate to a derivation", i->what()));
|
: throw Error("argument '%s' did not evaluate to a derivation", i->what()));
|
||||||
},
|
},
|
||||||
[&](const DerivedPath::Built & bfd) {
|
[&](const DerivedPath::Built & bfd) {
|
||||||
drvPaths.insert(resolveDerivedPath(*store, *bfd.drvPath));
|
drvPaths.push_back(resolveDerivedPath(*store, *bfd.drvPath));
|
||||||
},
|
},
|
||||||
}, b.path.raw());
|
}, b.path.raw());
|
||||||
|
|
||||||
|
|
|
@ -186,7 +186,7 @@ struct Installable
|
||||||
OperateOn operateOn,
|
OperateOn operateOn,
|
||||||
ref<Installable> installable);
|
ref<Installable> installable);
|
||||||
|
|
||||||
static std::set<StorePath> toDerivations(
|
static std::vector<StorePath> toDerivations(
|
||||||
ref<Store> store,
|
ref<Store> store,
|
||||||
const Installables & installables,
|
const Installables & installables,
|
||||||
bool useDeriver = false);
|
bool useDeriver = false);
|
||||||
|
|
|
@ -9,18 +9,20 @@
|
||||||
|
|
||||||
using namespace nix;
|
using namespace nix;
|
||||||
|
|
||||||
static nlohmann::json storePathSetToJSON(const StorePathSet & paths, Store & store)
|
static nlohmann::json storePathSetToJSON(const StorePaths & paths, Store & store)
|
||||||
{
|
{
|
||||||
auto res = nlohmann::json::object();
|
nlohmann::json res;
|
||||||
for (auto & path : paths) {
|
for (auto & path : paths) {
|
||||||
res[store.printStorePath(path)] = nlohmann::json::object();
|
nlohmann::json entry;
|
||||||
|
entry["drvPath"] = store.printStorePath(path);
|
||||||
|
res.push_back(entry);
|
||||||
}
|
}
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO deduplicate with other code also setting such out links.
|
// TODO deduplicate with other code also setting such out links.
|
||||||
static void
|
static void
|
||||||
createOutLinks(const std::filesystem::path & outLink, const StorePathSet & derivations, LocalFSStore & store)
|
createOutLinks(const std::filesystem::path & outLink, const StorePaths & derivations, LocalFSStore & store)
|
||||||
{
|
{
|
||||||
for (const auto & [_i, drv] : enumerate(derivations)) {
|
for (const auto & [_i, drv] : enumerate(derivations)) {
|
||||||
auto i = _i;
|
auto i = _i;
|
||||||
|
|
|
@ -33,7 +33,53 @@ derivations are printed on standard output.
|
||||||
|
|
||||||
- `--json`
|
- `--json`
|
||||||
|
|
||||||
Dump a JSON object whose keys are the generated store derivations instread of
|
Dump a JSON list of objects containing at least a `drvPath` field with the
|
||||||
printing them directly on the output.
|
path to the produced store derivation.
|
||||||
|
|
||||||
|
# Examples
|
||||||
|
|
||||||
|
* Get the store derivation for a single installable, with a gc root
|
||||||
|
|
||||||
|
```console
|
||||||
|
$ nix derivation instantiate github:NixOS/nixpkgs#hello
|
||||||
|
/nix/store/af3rc6phyv80h7aq4y3d08awnq2ja8fp-hello-2.12.1.drv
|
||||||
|
$ ls -ld drv
|
||||||
|
lrwxrwxrwx [...] drv -> /nix/store/af3rc6phyv80h7aq4y3d08awnq2ja8fp-hello-2.12.1.drv
|
||||||
|
```
|
||||||
|
|
||||||
|
* Get the store derivations for multiple installables, in the same order as the
|
||||||
|
provided arguments.
|
||||||
|
|
||||||
|
```console
|
||||||
|
$ nix derivation instantiate github:NixOS/nixpkgs#{hello,xorg.xclock}
|
||||||
|
/nix/store/af3rc6phyv80h7aq4y3d08awnq2ja8fp-hello-2.12.1.drv
|
||||||
|
/nix/store/82w6jak6c7zldgvxyq5nwhclz3yp85zp-xclock-1.1.1.drv
|
||||||
|
```
|
||||||
|
|
||||||
|
* The same, with JSON output. The values also appear in the same order as CLI parameters.
|
||||||
|
|
||||||
|
```console
|
||||||
|
$ nix derivation instantiate github:NixOS/nixpkgs#{xorg.xclock,hello} --json | jq
|
||||||
|
[
|
||||||
|
{
|
||||||
|
"drvPath": "/nix/store/82w6jak6c7zldgvxyq5nwhclz3yp85zp-xclock-1.1.1.drv"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"drvPath": "/nix/store/af3rc6phyv80h7aq4y3d08awnq2ja8fp-hello-2.12.1.drv"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
```
|
||||||
|
|
||||||
|
# Notes
|
||||||
|
|
||||||
|
* JSON output format may be extended in the future with other fields.
|
||||||
|
|
||||||
|
* Order guarantees will always ensure that the following bash commands output
|
||||||
|
the same text.
|
||||||
|
|
||||||
|
```console
|
||||||
|
$ nix derivation instantiate [installables]
|
||||||
|
$ nix derivation instantiate [installables] --json | jq ".[] | .drvPath" -r
|
||||||
|
```
|
||||||
|
|
||||||
)""
|
)""
|
||||||
|
|
|
@ -41,7 +41,8 @@ struct CmdShowDerivation : InstallablesCommand
|
||||||
|
|
||||||
void run(ref<Store> store, Installables && installables) override
|
void run(ref<Store> store, Installables && installables) override
|
||||||
{
|
{
|
||||||
auto drvPaths = Installable::toDerivations(store, installables, true);
|
auto drvPathsList = Installable::toDerivations(store, installables, true);
|
||||||
|
StorePathSet drvPaths(drvPathsList.begin(), drvPathsList.end());
|
||||||
|
|
||||||
if (recursive) {
|
if (recursive) {
|
||||||
StorePathSet closure;
|
StorePathSet closure;
|
||||||
|
|
|
@ -11,6 +11,7 @@ test -f "$drvPath"
|
||||||
nix-store --delete "$drvPath"
|
nix-store --delete "$drvPath"
|
||||||
if test -f "$drvPath"; then false; fi
|
if test -f "$drvPath"; then false; fi
|
||||||
|
|
||||||
|
rm -f drv
|
||||||
drvPath=$(nix derivation instantiate --file simple.nix)
|
drvPath=$(nix derivation instantiate --file simple.nix)
|
||||||
test -f "$drvPath"
|
test -f "$drvPath"
|
||||||
test -e drv
|
test -e drv
|
||||||
|
@ -23,6 +24,7 @@ rm drv
|
||||||
nix-store --delete "$drvPath"
|
nix-store --delete "$drvPath"
|
||||||
if test -f "$drvPath"; then false; fi
|
if test -f "$drvPath"; then false; fi
|
||||||
|
|
||||||
|
rm -f foobar
|
||||||
drvPath=$(nix derivation instantiate --out-link foobar --file simple.nix)
|
drvPath=$(nix derivation instantiate --out-link foobar --file simple.nix)
|
||||||
test -e foobar
|
test -e foobar
|
||||||
[ "$(nix-store -q --roots "$drvPath")" = "$(realpath --no-symlinks foobar) -> $drvPath" ]
|
[ "$(nix-store -q --roots "$drvPath")" = "$(realpath --no-symlinks foobar) -> $drvPath" ]
|
||||||
|
@ -30,10 +32,11 @@ rm foobar
|
||||||
nix-store --delete "$drvPath"
|
nix-store --delete "$drvPath"
|
||||||
|
|
||||||
drvPathJson=$(nix derivation instantiate --json --no-link --file simple.nix)
|
drvPathJson=$(nix derivation instantiate --json --no-link --file simple.nix)
|
||||||
[ "$drvPathJson" = "{\"$drvPath\":{}}" ]
|
[ "$drvPathJson" = "[{\"drvPath\":\"$drvPath\"}]" ]
|
||||||
nix-store --delete "$drvPath"
|
nix-store --delete "$drvPath"
|
||||||
|
|
||||||
mapfile -t drvPaths < <(nix derivation instantiate --json --out-link multidrv --file check.nix | jq 'keys|.[]' -r)
|
rm -f multidrv*
|
||||||
|
mapfile -t drvPaths < <(nix derivation instantiate --json --out-link multidrv --file check.nix | jq '.[]|.drvPath' -r)
|
||||||
roots=(./multidrv*)
|
roots=(./multidrv*)
|
||||||
[ "${#roots[@]}" -gt 1 ]
|
[ "${#roots[@]}" -gt 1 ]
|
||||||
[ "${#roots[@]}" -eq "${#drvPaths[@]}" ]
|
[ "${#roots[@]}" -eq "${#drvPaths[@]}" ]
|
||||||
|
@ -41,4 +44,17 @@ mapfile -t rootedPaths < <(readlink "${roots[@]}")
|
||||||
[ "${rootedPaths[*]}" = "${drvPaths[*]}" ]
|
[ "${rootedPaths[*]}" = "${drvPaths[*]}" ]
|
||||||
rm -f multidrv*
|
rm -f multidrv*
|
||||||
|
|
||||||
|
# The order should always be the same in text and json outputs
|
||||||
|
jsonOutput=$(nix derivation instantiate --no-link --file check.nix --json | jq '.[]|.drvPath' -r)
|
||||||
|
textOutput=$(nix derivation instantiate --no-link --file check.nix)
|
||||||
|
[ "$jsonOutput" = "$textOutput" ]
|
||||||
|
|
||||||
|
# Test that the order is the same as on the command line, and that repeated
|
||||||
|
# inputs are present several times in the output, in the correct order
|
||||||
|
nix derivation instantiate --no-link --file multiple-outputs.nix a b a --json | jq --exit-status '
|
||||||
|
(.[0].drvPath | match(".*multiple-outputs-a.drv"))
|
||||||
|
and (.[1].drvPath | match(".*multiple-outputs-b.drv"))
|
||||||
|
and (.[2].drvPath | match(".*multiple-outputs-a.drv"))
|
||||||
|
'
|
||||||
|
|
||||||
nix-collect-garbage
|
nix-collect-garbage
|
||||||
|
|
Loading…
Reference in a new issue