pyrox.dev
Merge pull request #215133 from IndeedNotJames/xcaddy
undefined
+10
-3
pkgs/servers/caddy/xcaddy/default.nix
+10
-3
pkgs/servers/caddy/xcaddy/default.nix
···
2
2
3
3
buildGoModule rec {
4
4
pname = "xcaddy";
5
-
version = "0.3.1";
5
+
version = "0.3.2";
6
6
7
7
subPackages = [ "cmd/xcaddy" ];
8
8
···
10
10
owner = "caddyserver";
11
11
repo = pname;
12
12
rev = "v${version}";
13
-
hash = "sha256-oGTtS5UlEebIqv4SM4q0YclASJNu8DNOLrGLRRAtkd8=";
13
+
hash = "sha256-M0eMI/TtUNVqE4F1ifizVb0e4ACGa+yLkG3pJLaaDNs=";
14
14
};
15
15
16
16
patches = [
17
+
./inject_version_info.diff
17
18
./use_tmpdir_on_darwin.diff
18
19
];
19
20
21
+
ldflags = [
22
+
"-s"
23
+
"-w"
24
+
"-X github.com/caddyserver/xcaddy/cmd.customVersion=v${version}"
25
+
];
26
+
20
27
vendorHash = "sha256-RpbnoXyTrqGOI7DpgkO+J47P17T4QCVvM1CfS6kRO9Y=";
21
28
22
29
meta = with lib; {
23
30
homepage = "https://github.com/caddyserver/xcaddy";
24
31
description = "Build Caddy with plugins";
25
32
license = licenses.asl20;
26
-
maintainers = with maintainers; [ tjni ];
33
+
maintainers = with maintainers; [ tjni indeednotjames ];
27
34
};
28
35
}
+16
pkgs/servers/caddy/xcaddy/inject_version_info.diff
+16
pkgs/servers/caddy/xcaddy/inject_version_info.diff
···
1
+
diff --git a/cmd/main.go b/cmd/main.go
2
+
index ede7cd8..c553140 100644
3
+
--- a/cmd/main.go
4
+
+++ b/cmd/main.go
5
+
@@ -401,8 +401,11 @@ func splitWith(arg string) (module, version, replace string, err error) {
6
+
return
7
+
}
8
+
9
+
+var customVersion string
10
+
+
11
+
// xcaddyVersion returns a detailed version string, if available.
12
+
func xcaddyVersion() string {
13
+
+ return customVersion
14
+
mod := goModule()
15
+
ver := mod.Version
16
+
if mod.Sum != "" {