picnoir
/
Nix
1
0
Fork 0
Code Issues Pull Requests 1 Releases Wiki Activity

Merge pull request #9876 from edolstra/store-settings 

Don't include store docs in every manpage
This commit is contained in:
Eelco Dolstra 2024-01-29 17:01:24 +01:00 committed by GitHub
parent 44a0d04483 baff34d728
commit e9c8e859db
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/manual/generate-manpage.nix
View File

@ -93,9 +93,6 @@ let
maybeProse =
# FIXME: this is a horrible hack to keep `nix help-stores` working.
# the correct answer to this is to remove that command and replace it
# by statically generated manpages or the output of something like `nix
# store info <store type>`.
let
help-stores = ''
${index}
@ -121,7 +118,7 @@ let
};
in
optionalString (details ? doc) (
if match "@store-types@" details.doc != [ ]
if match ".*@store-types@.*" details.doc != null
then help-stores
else details.doc
);

4
tests/unit/libstore/serve-protocol.cc
View File

@ -412,7 +412,7 @@ TEST_F(ServeProtoTest, handshake_log)
toClient.create();
toServer.create();
ServeProto::Version clientResult, serverResult;
ServeProto::Version clientResult;
auto thread = std::thread([&]() {
FdSink out { toServer.writeSide.get() };
@ -425,7 +425,7 @@ TEST_F(ServeProtoTest, handshake_log)
{
FdSink out { toClient.writeSide.get() };
FdSource in { toServer.readSide.get() };
serverResult = ServeProto::BasicServerConnection::handshake(
ServeProto::BasicServerConnection::handshake(
out, in, defaultVersion);
};