Skip to content

Commit

Permalink
New "indexed" installable syntax: <drvPath>!<outputName>
Browse files Browse the repository at this point in the history
Being conservative and only doing a single output name for now.
  • Loading branch information
Ericson2314 committed Feb 12, 2021
1 parent 7f15593 commit 13ef605
Show file tree
Hide file tree
Showing 5 changed files with 77 additions and 4 deletions.
45 changes: 44 additions & 1 deletion src/libcmd/installables.cc
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,33 @@ struct InstallableStorePath : Installable
}
};

struct InstallableIndexedStorePath : Installable
{
ref<Store> store;
StorePath storePath;
std::string outputName;

InstallableIndexedStorePath(ref<Store> store, StorePath && storePath, std::string && outputName)
: store(store), storePath(std::move(storePath)), outputName(std::move(outputName)) { }

std::string what() override
{
return store->printStorePath(storePath) + "!" + outputName;
}

Buildables toBuildables() override
{
return {
BuildableFromDrv {
.drvPath = storePath,
.outputs = {
{ outputName, {} },
},
}
};
}
};

Buildables InstallableValue::toBuildables()
{
Buildables res;
Expand Down Expand Up @@ -636,7 +663,23 @@ std::vector<std::shared_ptr<Installable>> SourceExprCommand::parseInstallables(
ex = std::current_exception();
}

if (s.find('/') != std::string::npos) {
auto found = s.find('!');
if (found != std::string::npos) {
try {
result.push_back(std::make_shared<InstallableIndexedStorePath>(
store,
store->followLinksToStorePath(s.substr(0, found)),
s.substr(found + 1)));
continue;
} catch (BadStorePath &) {
} catch (...) {
if (!ex)
ex = std::current_exception();
}
}

found = s.find('/');
if (found != std::string::npos) {
try {
result.push_back(std::make_shared<InstallableStorePath>(store, store->followLinksToStorePath(s)));
continue;
Expand Down
10 changes: 10 additions & 0 deletions src/nix/nix.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,16 @@ the Nix store. Here are the recognised types of installables:
If you want to operate on the store derivation itself, pass the
`--derivation` flag.

* **Indexed store derivations**: `/nix/store/p7gp6lxdg32h4ka1q398wd9r2zkbbz2v-hello-2.10.drv!out`

Store derivations can be indexed with a specific output name. This
allows finer control versus just specifying a derivation (without
`--derivation`) and getting all the outputs.

This is especially useful for (currently unstable) floating content
addressed derivations, which do not have precomputed output paths that
can be used instead.

* **Nix attributes**: `--file /path/to/nixpkgs hello`

When the `-f` / `--file` *path* option is given, installables are
Expand Down
18 changes: 18 additions & 0 deletions tests/build-explicit-output.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
source common.sh

drv=$(nix eval -f multiple-outputs.nix --raw a.drvPath)
if nix build "$drv!not-an-output" --json; then
fail "'not-an-output' should fail to build"
fi

nix build "$drv!first" --json
nix build "$drv!first" --json | jq --exit-status '
(.[0] |
(.drvPath | match(".*multiple-outputs-a.drv")) and
(.outputs |
( .first ) and
( has("second") | not )))
'
# TODO use
# ( .first | match(".*multiple-outputs-a-first")) and
# once we make it put the result paths in the buildables.
5 changes: 3 additions & 2 deletions tests/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@ expectedJSONRegex='\[\{"drvPath":".*multiple-outputs-a.drv","outputs":\{"first":
nix build -f multiple-outputs.nix --json a.all b.all | jq --exit-status '
(.[0] |
(.drvPath | match(".*multiple-outputs-a.drv")) and
(.outputs.first | match(".*multiple-outputs-a-first")) and
(.outputs.second | match(".*multiple-outputs-a-second")))
(.outputs |
( .first | match(".*multiple-outputs-a-first")) and
( .second | match(".*multiple-outputs-a-second"))))
and (.[1] |
(.drvPath | match(".*multiple-outputs-b.drv")) and
(.outputs.out | match(".*multiple-outputs-b")))
Expand Down
3 changes: 2 additions & 1 deletion tests/local.mk
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ nix_tests = \
describe-stores.sh \
flakes.sh \
content-addressed.sh \
build.sh
build.sh \
build-explicit-output.sh
# parallel.sh
# build-remote-content-addressed-fixed.sh \
Expand Down

0 comments on commit 13ef605

Please sign in to comment.