summary refs log tree commit diff
diff options
context:
space:
mode:
authorArseniy Seroka <jagajaga@users.noreply.github.com>2016-05-04 21:37:06 +0300
committerArseniy Seroka <jagajaga@users.noreply.github.com>2016-05-04 21:37:06 +0300
commitbf0484c613e7a716aabd3554d827e0d3ad6893f9 (patch)
treedf517cc8f0ac135dfade5bb5a5bc06261f9aabcc
parent9fa30d3bad80faa60e961147ca9b68a8abb46134 (diff)
parentf44fb5656c586e87e8c836cd20168a7ff9dfcb33 (diff)
downloadnixpkgs-bf0484c613e7a716aabd3554d827e0d3ad6893f9.tar
nixpkgs-bf0484c613e7a716aabd3554d827e0d3ad6893f9.tar.gz
nixpkgs-bf0484c613e7a716aabd3554d827e0d3ad6893f9.tar.bz2
nixpkgs-bf0484c613e7a716aabd3554d827e0d3ad6893f9.tar.lz
nixpkgs-bf0484c613e7a716aabd3554d827e0d3ad6893f9.tar.xz
nixpkgs-bf0484c613e7a716aabd3554d827e0d3ad6893f9.tar.zst
nixpkgs-bf0484c613e7a716aabd3554d827e0d3ad6893f9.zip
Merge pull request #15221 from schneefux/master
caddy: v0.8.2 -> v0.8.3
-rw-r--r--pkgs/top-level/go-packages.nix15
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix
index 65b210544cb..25655ce0b8b 100644
--- a/pkgs/top-level/go-packages.nix
+++ b/pkgs/top-level/go-packages.nix
@@ -243,6 +243,13 @@ let
     sha256 = "0gwplb1b4fvav1vjf4b2dypy5rcp2w41vrbxkd1dsmac870cy75p";
   };
 
+  archiver = buildFromGitHub {
+    rev = "85f054813ed511646b0ce5e047697e0651b8e1a4";
+    owner = "mholt";
+    repo = "archiver";
+    sha256 = "0b38mrfm3rwgdi7hrp4gjhf0y0f6bw73qjkfrkafxjrdpdg7nyly";
+  };
+  
   asciinema = buildFromGitHub {
     rev = "v1.2.0";
     owner = "asciinema";
@@ -412,13 +419,13 @@ let
   };
 
   caddy = buildFromGitHub {
-    rev     = "9099375b11b7b5e62b831627c2927d1c4c666071";
-    version = "v0.8.2";
+    rev     = "e2234497b79603388b58ba226abb157aa4aaf065";
+    version = "v0.8.3";
     owner   = "mholt";
     repo    = "caddy";
-    sha256  = "1zdy2sxir21ngh2ird01sv4fgj6sy3wl4s6k4piklri8ps1zw0k0";
+    sha256  = "1snijkbz02yr7wij7bcmrj4257709sbklb3nhb5qmy95b9ssffm6";
     buildInputs = [
-      acme blackfriday crypto go-humanize go-shlex go-syslog
+      acme archiver blackfriday crypto go-humanize go-shlex go-syslog
       http-authentication lumberjack-v2 toml websocket yaml-v2
     ];
     disabled = isGo14 || isGo15;