boulder: 2022-09-29 -> 2024-06-17a

2 files changed, 28 insertions, 31 deletions

diff --git a/pkgs/tools/admin/boulder/default.nix b/pkgs/tools/admin/boulder/default.nix
index ec42a0679b3d6..50325a6690cf9 100644
--- a/pkgs/tools/admin/boulder/default.nix
+++ b/pkgs/tools/admin/boulder/default.nix
@@ -1,13 +1,14 @@
-{ lib
-, fetchFromGitHub
-, buildGoModule
-, testers
-, boulder
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+  testers,
+  boulder,
 }:
 
 buildGoModule rec {
   pname = "boulder";
-  version = "2022-09-29";
+  version = "2024-06-17a";
 
   src = fetchFromGitHub {
     owner = "letsencrypt";
@@ -15,19 +16,18 @@ buildGoModule rec {
     rev = "release-${version}";
     leaveDotGit = true;
     postFetch = ''
-      cd $out
+      pushd $out
       git rev-parse --short=8 HEAD 2>/dev/null >$out/COMMIT
-      find "$out" -name .git -print0 | xargs -0 rm -rf
+      find $out -name .git -print0 | xargs -0 rm -rf
+      popd
     '';
-    hash = "sha256-MyJHTkt4qEHwD1UOkOfDNhNddcyFHPJvDzoT7kJ2qi4=";
+    hash = "sha256-kObCD9diy1ryyeLQNyfWNMJPfvtjAWVp8OVUO0MLV6A=";
   };
 
   vendorHash = null;
 
   subPackages = [ "cmd/boulder" ];
 
-  patches = [ ./no-build-id-test.patch ];
-
   ldflags = [
     "-s"
     "-w"
@@ -35,7 +35,7 @@ buildGoModule rec {
   ];
 
   preBuild = ''
-    ldflags+=" -X \"github.com/letsencrypt/boulder/core.BuildID=${src.rev} +$(cat COMMIT)\""
+    ldflags+=" -X \"github.com/letsencrypt/boulder/core.BuildID=${version} +$(cat COMMIT)\""
     ldflags+=" -X \"github.com/letsencrypt/boulder/core.BuildTime=$(date -u -d @0)\""
   '';
 
@@ -43,22 +43,32 @@ buildGoModule rec {
     # Test all targets.
     unset subPackages
 
-    # Disable tests that require additional services.
-    rm -rf \
+    # Disable tests that fail or require additional services.
+    rm -f \
       cmd/admin-revoker/main_test.go \
+      cmd/admin/cert_test.go \
+      cmd/admin/key_test.go \
       cmd/bad-key-revoker/main_test.go \
       cmd/cert-checker/main_test.go \
+      cmd/config_test.go \
       cmd/contact-auditor/main_test.go \
       cmd/expiration-mailer/main_test.go \
       cmd/expiration-mailer/send_test.go \
       cmd/id-exporter/main_test.go \
       cmd/rocsp-tool/client_test.go \
+      cmd/shell_test.go \
+      core/util_test.go \
       db/map_test.go \
       db/multi_test.go \
       db/rollback_test.go \
+      grpc/creds/creds_test.go \
       log/log_test.go \
       ocsp/updater/updater_test.go \
       ra/ra_test.go \
+      ratelimits/limiter_test.go \
+      ratelimits/source_redis_test.go \
+      ratelimits/source_test.go \
+      redis/lookup_test.go \
       rocsp/rocsp_test.go \
       sa/database_test.go \
       sa/model_test.go \
@@ -70,7 +80,9 @@ buildGoModule rec {
       va/dns_test.go \
       va/http_test.go \
       va/tlsalpn_test.go \
-      va/va_test.go
+      va/va_test.go \
+      wfe2/verify_test.go \
+      wfe2/wfe_test.go
   '';
 
   postInstall = ''
@@ -81,7 +93,6 @@ buildGoModule rec {
 
   passthru.tests.version = testers.testVersion {
     package = boulder;
-    command = "boulder --version";
     inherit version;
   };
 
@@ -96,6 +107,7 @@ buildGoModule rec {
       Let's Encrypt.
     '';
     license = licenses.mpl20;
+    mainProgram = "boulder";
     maintainers = with maintainers; [ azahi ];
   };
 }
diff --git a/pkgs/tools/admin/boulder/no-build-id-test.patch b/pkgs/tools/admin/boulder/no-build-id-test.patch
deleted file mode 100644
index 661ed2b4a5f2b..0000000000000
--- a/pkgs/tools/admin/boulder/no-build-id-test.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git i/core/util_test.go w/core/util_test.go
-index 8979edff..cfae13a4 100644
---- i/core/util_test.go
-+++ w/core/util_test.go
-@@ -56,10 +56,6 @@ func TestSerialUtils(t *testing.T) {
- 	fmt.Println(badSerial)
- }
- 
--func TestBuildID(t *testing.T) {
--	test.AssertEquals(t, "Unspecified", GetBuildID())
--}
--
- const JWK1JSON = `{
-   "kty": "RSA",
-   "n": "vuc785P8lBj3fUxyZchF_uZw6WtbxcorqgTyq-qapF5lrO1U82Tp93rpXlmctj6fyFHBVVB5aXnUHJ7LZeVPod7Wnfl8p5OyhlHQHC8BnzdzCqCMKmWZNX5DtETDId0qzU7dPzh0LP0idt5buU7L9QNaabChw3nnaL47iu_1Di5Wp264p2TwACeedv2hfRDjDlJmaQXuS8Rtv9GnRWyC9JBu7XmGvGDziumnJH7Hyzh3VNu-kSPQD3vuAFgMZS6uUzOztCkT0fpOalZI6hqxtWLvXUMj-crXrn-Maavz8qRhpAyp5kcYk3jiHGgQIi7QSK2JIdRJ8APyX9HlmTN5AQ",