Merge pull request #6259 from Artturin/nixbuildaddprintstorepaths
nix build: add --print-out-paths flag
This commit is contained in:
commit
7f814d6d9a
|
@ -6,3 +6,6 @@
|
||||||
* The path produced by `builtins.toFile` is now allowed to be imported or read
|
* The path produced by `builtins.toFile` is now allowed to be imported or read
|
||||||
even with restricted evaluation. Note that this will not work with a
|
even with restricted evaluation. Note that this will not work with a
|
||||||
read-only store.
|
read-only store.
|
||||||
|
|
||||||
|
* `nix build` has a new `--print-out-paths` flag to print the resulting output paths.
|
||||||
|
This matches the default behaviour of `nix-build`.
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
#include "shared.hh"
|
#include "shared.hh"
|
||||||
#include "store-api.hh"
|
#include "store-api.hh"
|
||||||
#include "local-fs-store.hh"
|
#include "local-fs-store.hh"
|
||||||
|
#include "progress-bar.hh"
|
||||||
|
|
||||||
#include <nlohmann/json.hpp>
|
#include <nlohmann/json.hpp>
|
||||||
|
|
||||||
|
@ -12,6 +13,7 @@ using namespace nix;
|
||||||
struct CmdBuild : InstallablesCommand, MixDryRun, MixJSON, MixProfile
|
struct CmdBuild : InstallablesCommand, MixDryRun, MixJSON, MixProfile
|
||||||
{
|
{
|
||||||
Path outLink = "result";
|
Path outLink = "result";
|
||||||
|
bool printOutputPaths = false;
|
||||||
BuildMode buildMode = bmNormal;
|
BuildMode buildMode = bmNormal;
|
||||||
|
|
||||||
CmdBuild()
|
CmdBuild()
|
||||||
|
@ -31,6 +33,12 @@ struct CmdBuild : InstallablesCommand, MixDryRun, MixJSON, MixProfile
|
||||||
.handler = {&outLink, Path("")},
|
.handler = {&outLink, Path("")},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
addFlag({
|
||||||
|
.longName = "print-out-paths",
|
||||||
|
.description = "Print the resulting output paths",
|
||||||
|
.handler = {&printOutputPaths, true},
|
||||||
|
});
|
||||||
|
|
||||||
addFlag({
|
addFlag({
|
||||||
.longName = "rebuild",
|
.longName = "rebuild",
|
||||||
.description = "Rebuild an already built package and compare the result to the existing store paths.",
|
.description = "Rebuild an already built package and compare the result to the existing store paths.",
|
||||||
|
@ -93,6 +101,22 @@ struct CmdBuild : InstallablesCommand, MixDryRun, MixJSON, MixProfile
|
||||||
}, buildable.raw());
|
}, buildable.raw());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (printOutputPaths) {
|
||||||
|
stopProgressBar();
|
||||||
|
for (auto & buildable : buildables) {
|
||||||
|
std::visit(overloaded {
|
||||||
|
[&](const BuiltPath::Opaque & bo) {
|
||||||
|
std::cout << store->printStorePath(bo.path) << std::endl;
|
||||||
|
},
|
||||||
|
[&](const BuiltPath::Built & bfd) {
|
||||||
|
for (auto & output : bfd.outputs) {
|
||||||
|
std::cout << store->printStorePath(output.second) << std::endl;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
}, buildable.raw());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
updateProfile(buildables);
|
updateProfile(buildables);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -25,6 +25,13 @@ R""(
|
||||||
lrwxrwxrwx 1 … result-1 -> /nix/store/rkfrm0z6x6jmi7d3gsmma4j53h15mg33-cowsay-3.03+dfsg2
|
lrwxrwxrwx 1 … result-1 -> /nix/store/rkfrm0z6x6jmi7d3gsmma4j53h15mg33-cowsay-3.03+dfsg2
|
||||||
```
|
```
|
||||||
|
|
||||||
|
* Build GNU Hello and print the resulting store path.
|
||||||
|
|
||||||
|
```console
|
||||||
|
# nix build nixpkgs#hello --print-out-paths
|
||||||
|
/nix/store/v5sv61sszx301i0x6xysaqzla09nksnd-hello-2.10
|
||||||
|
```
|
||||||
|
|
||||||
* Build a specific output:
|
* Build a specific output:
|
||||||
|
|
||||||
```console
|
```console
|
||||||
|
|
|
@ -34,6 +34,14 @@ outPath=$(readlink -f $TEST_ROOT/result)
|
||||||
|
|
||||||
grep 'FOO BAR BAZ' $TEST_ROOT/machine0/$outPath
|
grep 'FOO BAR BAZ' $TEST_ROOT/machine0/$outPath
|
||||||
|
|
||||||
|
testPrintOutPath=$(nix build -L -v -f $file --print-out-paths --max-jobs 0 \
|
||||||
|
--arg busybox $busybox \
|
||||||
|
--store $TEST_ROOT/machine0 \
|
||||||
|
--builders "$(join_by '; ' "${builders[@]}")"
|
||||||
|
)
|
||||||
|
|
||||||
|
[[ $testPrintOutPath =~ store.*build-remote ]]
|
||||||
|
|
||||||
set -o pipefail
|
set -o pipefail
|
||||||
|
|
||||||
# Ensure that input1 was built on store1 due to the required feature.
|
# Ensure that input1 was built on store1 due to the required feature.
|
||||||
|
|
Loading…
Reference in a new issue