lix-project/lix
20
57
Fork 31
Code Issues 350 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge pull request #9443 from ivan770/reproducibility

Browse source 
doc: fix machine-specific capabilities leaking
(cherry picked from commit dda0e34ecf16bb1c736d585414122a7e3587db70)
Change-Id: I3d07cc5039ee954b215a7a27caa3bf7359d92c26
This commit is contained in:
eldritch horrors 2024-03-06 00:31:16 +01:00
parent e8f1acfb18
commit bfe2facede
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/libstore/globals.hh
View file

@ -182,7 +182,9 @@ public:
command line switch and defaults to `1`. The value `0` means that command line switch and defaults to `1`. The value `0` means that
the builder should use all available CPU cores in the system. the builder should use all available CPU cores in the system.
)", )",
{"build-cores"}, false}; {"build-cores"},
// Don't document the machine-specific default value
false};
/** /**
* Read-only mode. Don't copy stuff to the store, don't change * Read-only mode. Don't copy stuff to the store, don't change
@ -702,7 +704,10 @@ public:
Build systems will usually detect the target platform to be the current physical system and therefore produce machine code incompatible with what may be intended in the derivation. Build systems will usually detect the target platform to be the current physical system and therefore produce machine code incompatible with what may be intended in the derivation.
You should design your derivation's `builder` accordingly and cross-check the results when using this option against natively-built versions of your derivation. You should design your derivation's `builder` accordingly and cross-check the results when using this option against natively-built versions of your derivation.
)", {}, false}; )",
{},
// Don't document the machine-specific default value
false};
Setting<StringSet> systemFeatures{ Setting<StringSet> systemFeatures{
this, this,
@ -723,7 +728,10 @@ public:
`apple-virt` if hardware virtualization is available on macOS, `apple-virt` if hardware virtualization is available on macOS,
and the pseudo-features `nixos-test`, `benchmark` and `big-parallel` and the pseudo-features `nixos-test`, `benchmark` and `big-parallel`
that are used in Nixpkgs to route builds to specific machines. that are used in Nixpkgs to route builds to specific machines.
)", {}, false}; )",
{},
// Don't document the machine-specific default value
false};
Setting<Strings> substituters{ Setting<Strings> substituters{
this, this,

6
src/libstore/store-api.hh
View file

@ -164,8 +164,10 @@ struct StoreConfig : public Config
Setting<StringSet> systemFeatures{this, getDefaultSystemFeatures(), Setting<StringSet> systemFeatures{this, getDefaultSystemFeatures(),
"system-features", "system-features",
"Optional features that the system this store builds on implements (like \"kvm\")."}; "Optional features that the system this store builds on implements (like \"kvm\").",
{},
// Don't document the machine-specific default value
false};
}; };
class Store : public std::enable_shared_from_this<Store>, public virtual StoreConfig class Store : public std::enable_shared_from_this<Store>, public virtual StoreConfig