mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-21 20:49:52 +03:00
Merge pull request #157487 from tazjin/pass-through-passthru
streamLayeredImage: pass through passthru attributes
This commit is contained in:
commit
b48539da9a
@ -827,6 +827,8 @@ rec {
|
|||||||
# this on, but tooling may disable this to insert the store paths more
|
# this on, but tooling may disable this to insert the store paths more
|
||||||
# efficiently via other means, such as bind mounting the host store.
|
# efficiently via other means, such as bind mounting the host store.
|
||||||
includeStorePaths ? true
|
includeStorePaths ? true
|
||||||
|
, # Passthru arguments for the underlying derivation.
|
||||||
|
passthru ? {}
|
||||||
,
|
,
|
||||||
}:
|
}:
|
||||||
assert
|
assert
|
||||||
@ -987,7 +989,7 @@ rec {
|
|||||||
result = runCommand "stream-${baseName}"
|
result = runCommand "stream-${baseName}"
|
||||||
{
|
{
|
||||||
inherit (conf) imageName;
|
inherit (conf) imageName;
|
||||||
passthru = {
|
passthru = passthru // {
|
||||||
inherit (conf) imageTag;
|
inherit (conf) imageTag;
|
||||||
|
|
||||||
# Distinguish tarballs and exes at the Nix level so functions that
|
# Distinguish tarballs and exes at the Nix level so functions that
|
||||||
|
Loading…
Reference in New Issue
Block a user