public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #98691 from zowoq/caddy 

caddy: 2.1.1 -> 2.2.0
This commit is contained in:
Oleksii Filonenko 2020-09-26 11:03:32 +03:00 committed by GitHub
parent 02b7dcb4ee 60fcc12970
commit 59bfd517ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/servers/caddy/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, buildGoModule, fetchFromGitHub }:
{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }:
buildGoModule rec {
pname = "caddy";
version = "2.1.1";
version = "2.2.0";
subPackages = [ "cmd/caddy" ];
@ -10,10 +10,12 @@ buildGoModule rec {
owner = "caddyserver";
repo = pname;
rev = "v${version}";
sha256 = "0c682zrivkawsxlps5hlx8js5zp4ddahg0zi5cr0861gnllbdll0";
sha256 = "086zgbwb3v11gik2w024p7m7ywkzn0w27y6hrngd4rxylj7jq7c8";
};
vendorSha256 = "0jzx00c2b8y7zwl73r2fh1826spcd15y39nfzr53s5lay3fvkybc";
vendorSha256 = "1rm7v03v6rf9fdqrrl639z8a46cdzswjp8rdpygcsndqfznn5w7b";
passthru.tests = { inherit (nixosTests) caddy; };
meta = with stdenv.lib; {
homepage = "https://caddyserver.com";

7
pkgs/top-level/all-packages.nix
View File

@ -1530,8 +1530,11 @@ in
'';
});
caddy = callPackage ../servers/caddy { buildGoModule = buildGo114Module; }; # https://github.com/lucas-clemente/quic-go/issues/2614
caddy1 = callPackage ../servers/caddy/v1.nix { buildGoModule = buildGo114Module; };
caddy = callPackage ../servers/caddy { };
caddy1 = callPackage ../servers/caddy/v1.nix {
# https://github.com/lucas-clemente/quic-go/issues/2614
buildGoModule = buildGo114Module;
};
# Traefik 2.2 uses go1.14, pinning can be removed with 2.3
# https://github.com/containous/traefik/issues/7234#issuecomment-684950612