pyrox.dev
lol
boulder: 2022-07-11 -> 2022-08-29
+62
-12
+47
-12
pkgs/tools/admin/boulder/default.nix
+47
-12
pkgs/tools/admin/boulder/default.nix
···
1
1
{ lib
2
2
, fetchFromGitHub
3
3
, buildGoModule
4
-
, gitUpdater
4
+
, testers
5
+
, boulder
5
6
}:
6
7
7
8
buildGoModule rec {
8
9
pname = "boulder";
9
-
version = "2022-07-11";
10
+
version = "2022-08-29";
10
11
11
12
src = fetchFromGitHub {
12
13
owner = "letsencrypt";
13
14
repo = "boulder";
14
15
rev = "release-${version}";
15
-
sha256 = "sha256-fDKB7q2e+qdHt+t/BQWX7LkpyiZQtZSHp/x5uv0/c7c=";
16
16
leaveDotGit = true;
17
17
postFetch = ''
18
18
cd $out
19
-
git rev-parse HEAD > $out/COMMIT
19
+
git rev-parse --short=8 HEAD 2>/dev/null >$out/COMMIT
20
20
find "$out" -name .git -print0 | xargs -0 rm -rf
21
21
'';
22
+
hash = "sha256-DiO7sOcTd8aOld4Pqd0D7yTPrRh/Mhg25I63Vb/gHhM=";
22
23
};
23
24
24
-
vendorSha256 = null;
25
+
vendorHash = null;
25
26
26
27
subPackages = [ "cmd/boulder" ];
27
28
29
+
patches = [ ./no-build-id-test.patch ];
30
+
28
31
ldflags = [
29
32
"-s"
30
33
"-w"
···
32
35
];
33
36
34
37
preBuild = ''
35
-
ldflags+=" -X \"github.com/letsencrypt/boulder/core.BuildID=$(cat COMMIT)\""
38
+
ldflags+=" -X \"github.com/letsencrypt/boulder/core.BuildID=${src.rev} +$(cat COMMIT)\""
36
39
ldflags+=" -X \"github.com/letsencrypt/boulder/core.BuildTime=$(date -u -d @0)\""
37
40
'';
38
41
42
+
preCheck = ''
43
+
# Test all targets.
44
+
unset subPackages
45
+
46
+
# Disable tests that require additional services.
47
+
rm -rf \
48
+
cmd/admin-revoker/main_test.go \
49
+
cmd/bad-key-revoker/main_test.go \
50
+
cmd/cert-checker/main_test.go \
51
+
cmd/contact-auditor/main_test.go \
52
+
cmd/expiration-mailer/main_test.go \
53
+
cmd/expiration-mailer/send_test.go \
54
+
cmd/id-exporter/main_test.go \
55
+
cmd/rocsp-tool/client_test.go \
56
+
db/map_test.go \
57
+
db/multi_test.go \
58
+
db/rollback_test.go \
59
+
log/log_test.go \
60
+
ocsp/updater/updater_test.go \
61
+
ra/ra_test.go \
62
+
rocsp/rocsp_test.go \
63
+
sa/database_test.go \
64
+
sa/model_test.go \
65
+
sa/precertificates_test.go \
66
+
sa/rate_limits_test.go \
67
+
sa/sa_test.go \
68
+
test/load-generator/acme/directory_test.go \
69
+
va/caa_test.go \
70
+
va/dns_test.go \
71
+
va/http_test.go \
72
+
va/tlsalpn_test.go \
73
+
va/va_test.go
74
+
'';
75
+
39
76
postInstall = ''
40
77
for i in $($out/bin/boulder --list); do
41
78
ln -s $out/bin/boulder $out/bin/$i
42
79
done
43
80
'';
44
81
45
-
# There are no tests for cmd/boulder.
46
-
doCheck = false;
47
-
48
-
passthru.updateScript = gitUpdater {
49
-
inherit pname version;
50
-
rev-prefix = "release-";
82
+
passthru.tests.version = testers.testVersion {
83
+
package = boulder;
84
+
command = "boulder --version";
85
+
inherit version;
51
86
};
52
87
53
88
meta = with lib; {
+15
pkgs/tools/admin/boulder/no-build-id-test.patch
+15
pkgs/tools/admin/boulder/no-build-id-test.patch
···
1
+
diff --git i/core/util_test.go w/core/util_test.go
2
+
index 8979edff..cfae13a4 100644
3
+
--- i/core/util_test.go
4
+
+++ w/core/util_test.go
5
+
@@ -56,10 +56,6 @@ func TestSerialUtils(t *testing.T) {
6
+
fmt.Println(badSerial)
7
+
}
8
+
9
+
-func TestBuildID(t *testing.T) {
10
+
- test.AssertEquals(t, "Unspecified", GetBuildID())
11
+
-}
12
+
-
13
+
const JWK1JSON = `{
14
+
"kty": "RSA",
15
+
"n": "vuc785P8lBj3fUxyZchF_uZw6WtbxcorqgTyq-qapF5lrO1U82Tp93rpXlmctj6fyFHBVVB5aXnUHJ7LZeVPod7Wnfl8p5OyhlHQHC8BnzdzCqCMKmWZNX5DtETDId0qzU7dPzh0LP0idt5buU7L9QNaabChw3nnaL47iu_1Di5Wp264p2TwACeedv2hfRDjDlJmaQXuS8Rtv9GnRWyC9JBu7XmGvGDziumnJH7Hyzh3VNu-kSPQD3vuAFgMZS6uUzOztCkT0fpOalZI6hqxtWLvXUMj-crXrn-Maavz8qRhpAyp5kcYk3jiHGgQIi7QSK2JIdRJ8APyX9HlmTN5AQ",