Merge pull request #9443 from ivan770/reproducibility

doc: fix machine-specific capabilities leaking
This commit is contained in:
John Ericson 2023-11-24 22:59:38 -05:00 committed by GitHub
commit dda0e34ecf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 4 deletions

View file

@ -183,7 +183,9 @@ public:
command line switch and defaults to `1`. The value `0` means that
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
@ -699,7 +701,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.
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{
this,
@ -744,7 +749,10 @@ public:
[nspawn]: https://github.com/NixOS/nix/blob/67bcb99700a0da1395fa063d7c6586740b304598/tests/systemd-nspawn.nix.
Included by default on Linux if the [`auto-allocate-uids`](#conf-auto-allocate-uids) setting is enabled.
)", {}, false};
)",
{},
// Don't document the machine-specific default value
false};
Setting<Strings> substituters{
this,

View file

@ -167,7 +167,10 @@ struct StoreConfig : public Config
Optional [system features](@docroot@/command-ref/conf-file.md#conf-system-features) available on the system this store uses to build derivations.
Example: `"kvm"`
)" };
)",
{},
// Don't document the machine-specific default value
false};
};
class Store : public std::enable_shared_from_this<Store>, public virtual StoreConfig