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

Merge pull request #63485 from allowthere/update/caddy-1.0.0

Browse Source 
caddy: 0.11.4 -> 1.0.0
This commit is contained in:
zimbatm 2019-06-20 09:02:18 +00:00 committed by GitHub
commit 10f2815230
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/misc/styx/default.nix
View File

@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "01lklz7l9klqmmsncikwjnk3glzyz15c30118s82yd1chwpwhpfl"; sha256 = "01lklz7l9klqmmsncikwjnk3glzyz15c30118s82yd1chwpwhpfl";
}; };
server = "${caddy.bin}/bin/caddy"; server = "${caddy}/bin/caddy";
linkcheck = "${linkchecker}/bin/linkchecker"; linkcheck = "${linkchecker}/bin/linkchecker";
nativeBuildInputs = [ asciidoctor ]; nativeBuildInputs = [ asciidoctor ];

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

@ -1,8 +1,8 @@
{ stdenv, buildGoPackage, fetchFromGitHub }: { stdenv, buildGoModule, fetchFromGitHub }:
buildGoPackage rec { buildGoModule rec {
name = "caddy-${version}"; name = "caddy-${version}";
version = "0.11.4"; version = "1.0.0";
goPackagePath = "github.com/mholt/caddy"; goPackagePath = "github.com/mholt/caddy";
@ -12,8 +12,9 @@ buildGoPackage rec {
owner = "mholt"; owner = "mholt";
repo = "caddy"; repo = "caddy";
rev = "v${version}"; rev = "v${version}";
sha256 = "1h7zx5gzv40xkxab8pc6hgd9zkpbnhiy1hnldriybpf2ya2lac9a"; sha256 = "08hknms0lg5c6yhkz9g1i32d11xch2kqkjbk4w4kd1f1xpa6jvmz";
}; };
modSha256 = "02cb3swc180kh5vc2s5w8a6vidvw768l9bv5zg8zya183wzvfczs";
buildFlagsArray = '' buildFlagsArray = ''
-ldflags= -ldflags=