summary refs log tree commit diff
path: root/pkgs/servers/caddy/default.nix
diff options
context:
space:
mode:
authorrushmorem <rushmore@webenchanter.com>2016-08-14 19:55:52 +0200
committerrushmorem <rushmore@webenchanter.com>2016-08-14 20:21:20 +0200
commit9e6240629c0b1be932a11fe722df82a92379fe57 (patch)
treee94fe80aa10ad8cae70d00cab52675d99e85a9fe /pkgs/servers/caddy/default.nix
parent7069047f2ed6548910f3f2bff4a23946a363e860 (diff)
downloadnixpkgs-9e6240629c0b1be932a11fe722df82a92379fe57.tar
nixpkgs-9e6240629c0b1be932a11fe722df82a92379fe57.tar.gz
nixpkgs-9e6240629c0b1be932a11fe722df82a92379fe57.tar.bz2
nixpkgs-9e6240629c0b1be932a11fe722df82a92379fe57.tar.lz
nixpkgs-9e6240629c0b1be932a11fe722df82a92379fe57.tar.xz
nixpkgs-9e6240629c0b1be932a11fe722df82a92379fe57.tar.zst
nixpkgs-9e6240629c0b1be932a11fe722df82a92379fe57.zip
caddy: 0.8.3 -> 0.9.0
Closes https://github.com/NixOS/nixpkgs/issues/17678
Diffstat (limited to 'pkgs/servers/caddy/default.nix')
-rw-r--r--pkgs/servers/caddy/default.nix20
1 files changed, 13 insertions, 7 deletions
diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix
index 68ce9440f4f..4e5703bc531 100644
--- a/pkgs/servers/caddy/default.nix
+++ b/pkgs/servers/caddy/default.nix
@@ -1,18 +1,24 @@
-{ stdenv, lib, buildGoPackage, fetchFromGitHub }:
+{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }:
 
 buildGoPackage rec {
   name = "caddy-${version}";
-  version = "0.8.3";
-  rev = "e2234497b79603388b58ba226abb157aa4aaf065";
+  version = "v0.9.0";
+  rev = "f28af637327a4f12ae745284c519cfdeca5502ef";
 
   goPackagePath = "github.com/mholt/caddy";
 
-  src = fetchFromGitHub {
+  subPackages = [ "caddy" ];
+
+  src = fetchgit {
     inherit rev;
-    owner = "mholt";
-    repo = "caddy";
-    sha256 = "1snijkbz02yr7wij7bcmrj4257709sbklb3nhb5qmy95b9ssffm6";
+    url = "https://github.com/mholt/caddy.git";
+    sha256 = "1s7z0xbcw516i37pyj1wgxd9diqrifdghf97vs31ilbqs6z0nyls";
   };
 
+  buildFlagsArray = ''
+    -ldflags=
+      -X github.com/mholt/caddy/caddy/caddymain.gitTag=${version}
+  '';
+
   goDeps = ./deps.json;
 }