From 066fd6c514fc3b2b14a6a103ca63442c7c993eb9 Mon Sep 17 00:00:00 2001
From: allowthere <31812983+allowthere@users.noreply.github.com>
Date: Tue, 18 Jun 2019 23:36:54 +0000
Subject: [PATCH 1/2] caddy: 0.11.4 -> 1.0.0

https://github.com/mholt/caddy/releases/tag/v0.11.5
https://github.com/mholt/caddy/releases/tag/v1.0.0-beta1
https://github.com/mholt/caddy/releases/tag/v1.0.0-beta2
https://github.com/mholt/caddy/releases/tag/v1.0.0
---
 pkgs/servers/caddy/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index a6f1629a4b28..61316d0a60a1 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -1,8 +1,8 @@
-{ stdenv, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoModule, fetchFromGitHub }:
 
-buildGoPackage rec {
+buildGoModule rec {
   name = "caddy-${version}";
-  version = "0.11.4";
+  version = "1.0.0";
 
   goPackagePath = "github.com/mholt/caddy";
 
@@ -12,8 +12,9 @@ buildGoPackage rec {
     owner = "mholt";
     repo = "caddy";
     rev = "v${version}";
-    sha256 = "1h7zx5gzv40xkxab8pc6hgd9zkpbnhiy1hnldriybpf2ya2lac9a";
+    sha256 = "08hknms0lg5c6yhkz9g1i32d11xch2kqkjbk4w4kd1f1xpa6jvmz";
   };
+  modSha256 = "02cb3swc180kh5vc2s5w8a6vidvw768l9bv5zg8zya183wzvfczs";
 
   buildFlagsArray = ''
     -ldflags=

From 90486a94589e4066e71fcdedcb25092f800f14ab Mon Sep 17 00:00:00 2001
From: allowthere <31812983+allowthere@users.noreply.github.com>
Date: Thu, 20 Jun 2019 02:43:38 +0000
Subject: [PATCH 2/2] caddy is in ${caddy}/bin/caddy

---
 pkgs/applications/misc/styx/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/styx/default.nix b/pkgs/applications/misc/styx/default.nix
index f9779beec0f4..d545447cb130 100644
--- a/pkgs/applications/misc/styx/default.nix
+++ b/pkgs/applications/misc/styx/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     sha256 = "01lklz7l9klqmmsncikwjnk3glzyz15c30118s82yd1chwpwhpfl";
   };
 
-  server = "${caddy.bin}/bin/caddy";
+  server = "${caddy}/bin/caddy";
   linkcheck = "${linkchecker}/bin/linkchecker";
 
   nativeBuildInputs = [ asciidoctor ];