From bfe2facede727927a91bf19036430844df2f18b9 Mon Sep 17 00:00:00 2001 From: eldritch horrors Date: Wed, 6 Mar 2024 00:31:16 +0100 Subject: [PATCH] Merge pull request #9443 from ivan770/reproducibility doc: fix machine-specific capabilities leaking (cherry picked from commit dda0e34ecf16bb1c736d585414122a7e3587db70) Change-Id: I3d07cc5039ee954b215a7a27caa3bf7359d92c26 --- src/libstore/globals.hh | 14 +++++++++++--- src/libstore/store-api.hh | 6 ++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh index e07331d63..9614b612d 100644 --- a/src/libstore/globals.hh +++ b/src/libstore/globals.hh @@ -182,7 +182,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 @@ -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. 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 systemFeatures{ this, @@ -723,7 +728,10 @@ public: `apple-virt` if hardware virtualization is available on macOS, and the pseudo-features `nixos-test`, `benchmark` and `big-parallel` that are used in Nixpkgs to route builds to specific machines. - )", {}, false}; + )", + {}, + // Don't document the machine-specific default value + false}; Setting substituters{ this, diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh index f4a3ab0e3..3e49c3d95 100644 --- a/src/libstore/store-api.hh +++ b/src/libstore/store-api.hh @@ -164,8 +164,10 @@ struct StoreConfig : public Config Setting systemFeatures{this, getDefaultSystemFeatures(), "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, public virtual StoreConfig