From f6719032cf7d867fe85da5916793d263670dbd8b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 29 Jan 2024 15:22:44 +0100 Subject: [PATCH 1/2] Shut up a gcc warning --- tests/unit/libstore/serve-protocol.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/unit/libstore/serve-protocol.cc b/tests/unit/libstore/serve-protocol.cc index 597c0b570ee..b2fd0fb8248 100644 --- a/tests/unit/libstore/serve-protocol.cc +++ b/tests/unit/libstore/serve-protocol.cc @@ -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); }; From baff34d728844870e62deea7847bbe1e97dfe157 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 29 Jan 2024 16:30:29 +0100 Subject: [PATCH 2/2] Don't include store docs in every manpage --- doc/manual/generate-manpage.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/doc/manual/generate-manpage.nix b/doc/manual/generate-manpage.nix index ae31b2a1f61..ba5667a4305 100644 --- a/doc/manual/generate-manpage.nix +++ b/doc/manual/generate-manpage.nix @@ -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 `. 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 );