This is an automated email from the git hooks/post-receive script.
guix_mirror_bot pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 7b66b41ce5 daemon: Fix build failure with gcc@15.
7b66b41ce5 is described below
commit 7b66b41ce5cee48b14eb6cce3bb4b26f5b058652
Author: wrobell <[email protected]>
AuthorDate: Fri May 23 17:44:04 2025 +0100
daemon: Fix build failure with gcc@15.
* nix/libstore/build.cc (CompareGoalPtrs::operator): Add const keyword.
* nix/libstore/store-api.hh: Add missing include for uint64_t.
Change-Id: I56368da9eb10dc376f7e6eeae6a61746bb36c9cf
Signed-off-by: Andreas Enge <[email protected]>
---
nix/libstore/build.cc | 4 ++--
nix/libstore/store-api.hh | 1 +
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc
index 9701af8079..993876c6d1 100644
--- a/nix/libstore/build.cc
+++ b/nix/libstore/build.cc
@@ -103,7 +103,7 @@ typedef std::shared_ptr<Goal> GoalPtr;
typedef std::weak_ptr<Goal> WeakGoalPtr;
struct CompareGoalPtrs {
- bool operator() (const GoalPtr & a, const GoalPtr & b);
+ bool operator() (const GoalPtr & a, const GoalPtr & b) const;
};
/* Set of goals. */
@@ -201,7 +201,7 @@ protected:
};
-bool CompareGoalPtrs::operator() (const GoalPtr & a, const GoalPtr & b) {
+bool CompareGoalPtrs::operator() (const GoalPtr & a, const GoalPtr & b) const {
string s1 = a->key();
string s2 = b->key();
return s1 < s2;
diff --git a/nix/libstore/store-api.hh b/nix/libstore/store-api.hh
index 82a79e50e2..32a8f2c795 100644
--- a/nix/libstore/store-api.hh
+++ b/nix/libstore/store-api.hh
@@ -4,6 +4,7 @@
#include "serialise.hh"
#include <string>
+#include <cstdint>
#include <map>
#include <memory>