pyrox.dev
Merge pull request #195845 from techknowlogick/caddy-262
caddy: 2.6.1 -> 2.6.2
authored by Mario Rodas and committed by GitHub 8dcae204 8455e33f
+4
-8
pkgs/servers/caddy/default.nix
+4
-8
pkgs/servers/caddy/default.nix
···
7
, installShellFiles
8
}:
9
let
10
-
version = "2.6.1";
11
dist = fetchFromGitHub {
12
owner = "caddyserver";
13
repo = "dist";
···
23
owner = "caddyserver";
24
repo = "caddy";
25
rev = "v${version}";
26
-
sha256 = "sha256-Z8MiMhXH1er+uYvmDQiamF/jSxHbTMwjo61qbH0ioEo=";
27
};
28
29
-
vendorSha256 = "sha256-6UTErIPB/z4RfndPSLKFJDFweLB3ax8WxEDA+3G5asI=";
30
-
31
-
patches = [
32
-
./inject_version.diff
33
-
];
34
35
subPackages = [ "cmd/caddy" ];
36
37
ldflags = [
38
"-s" "-w"
39
-
"-X github.com/caddyserver/caddy/v2.ShortVersion=${version}"
40
];
41
42
nativeBuildInputs = [ installShellFiles ];
···
7
, installShellFiles
8
}:
9
let
10
+
version = "2.6.2";
11
dist = fetchFromGitHub {
12
owner = "caddyserver";
13
repo = "dist";
···
23
owner = "caddyserver";
24
repo = "caddy";
25
rev = "v${version}";
26
+
sha256 = "sha256-Tbf6RB3106OEZGc/Wx7vk+I82Z8/Q3WqnID4f8uZ6z0=";
27
};
28
29
+
vendorSha256 = "sha256-YxGXk3Q1qw6uZxrGc8l2lKExP2GP+nm3eYbHDoEbgdY=";
30
31
subPackages = [ "cmd/caddy" ];
32
33
ldflags = [
34
"-s" "-w"
35
+
"-X github.com/caddyserver/caddy/v2.CustomVersion=${version}"
36
];
37
38
nativeBuildInputs = [ installShellFiles ];
-15
pkgs/servers/caddy/inject_version.diff
-15
pkgs/servers/caddy/inject_version.diff
···
1
-
diff --git a/caddy.go b/caddy.go
2
-
index 584865bd..082b9b6c 100644
3
-
--- a/caddy.go
4
-
+++ b/caddy.go
5
-
@@ -840,7 +840,10 @@ func InstanceID() (uuid.UUID, error) {
6
-
// and https://github.com/golang/go/issues/50603.
7
-
//
8
-
// This function is experimental and subject to change or removal.
9
-
+var ShortVersion = "(devel)"
10
-
+
11
-
func Version() (simple, full string) {
12
-
+ return ShortVersion, ShortVersion
13
-
// the currently-recommended way to build Caddy involves
14
-
// building it as a dependency so we can extract version
15
-
// information from go.mod tooling; once the upstream
···