From 20f6559fda57a87c8bfcce81b9d38595dff90864 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Tue, 25 Jun 2024 07:50:03 +0200
Subject: [PATCH 1/2] pebble: fix version info

---
 pkgs/tools/admin/pebble/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/admin/pebble/default.nix b/pkgs/tools/admin/pebble/default.nix
index 384cc0f3d928..6a644e0448da 100644
--- a/pkgs/tools/admin/pebble/default.nix
+++ b/pkgs/tools/admin/pebble/default.nix
@@ -1,5 +1,4 @@
 { lib
-, stdenv
 , buildGoModule
 , fetchFromGitHub
 , nixosTests
@@ -18,6 +17,11 @@ buildGoModule rec {
 
   vendorHash = null;
 
+  ldflags = [
+    "-s" "-w"
+    "-X main.version=${version}"
+  ];
+
   passthru.tests = {
     smoke-test = nixosTests.acme;
   };
@@ -26,8 +30,10 @@ buildGoModule rec {
     # ca/ca.go:374:67: 9223372038 (untyped int constant) overflows uint
     broken = stdenv.hostPlatform.is32bit;
     homepage = "https://github.com/letsencrypt/pebble";
-    description = "Miniature version of Boulder, Pebble is a small RFC 8555 ACME test server not suited for a production CA";
+    description = "Small RFC 8555 ACME test server";
+    longDescription = "Miniature version of Boulder, Pebble is a small RFC 8555 ACME test server not suited for a production CA";
     license = [ lib.licenses.mpl20 ];
+    mainProgram = "pebble";
     maintainers = lib.teams.acme.members;
   };
 }

From e373cc2c0d83bdf7623e6494a4b0a1643a4ef848 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Tue, 25 Jun 2024 07:50:17 +0200
Subject: [PATCH 2/2] pebble: 2.4.0 -> 2.6.0

---
 pkgs/tools/admin/pebble/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/admin/pebble/default.nix b/pkgs/tools/admin/pebble/default.nix
index 6a644e0448da..6820431808ff 100644
--- a/pkgs/tools/admin/pebble/default.nix
+++ b/pkgs/tools/admin/pebble/default.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "pebble";
-  version = "2.4.0";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "letsencrypt";
     repo = pname;
     rev = "v${version}";
-    sha256 = "0sh67bzq3hlagk73w2kp45viq15g2rcxm760jk9fqshamq784m6m";
+    hash = "sha256-YPU/bl7h6rOWg+5ut0Thn2UupeKpJ7u4KXc2svIeZEM=";
   };
 
   vendorHash = null;
@@ -27,8 +27,6 @@ buildGoModule rec {
   };
 
   meta = {
-    # ca/ca.go:374:67: 9223372038 (untyped int constant) overflows uint
-    broken = stdenv.hostPlatform.is32bit;
     homepage = "https://github.com/letsencrypt/pebble";
     description = "Small RFC 8555 ACME test server";
     longDescription = "Miniature version of Boulder, Pebble is a small RFC 8555 ACME test server not suited for a production CA";