caddy: extracted from goPackages

pkgs/development/go-modules/libs.json

@@ -1096,5 +1096,86 @@
       "rev": "1a9d62f03ea92815b46fcaab357cfd4df264b1a0",
       "sha256": "04ywbif36fiah4fw0x2abr5q3p4fdhi6q57d5icc2mz03q889vhb"
     }
+  },
+  {
+    "goPackagePath": "github.com/flynn/go-shlex",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/flynn/go-shlex",
+      "rev": "3f9db97f856818214da2e1057f8ad84803971cff",
+      "sha256": "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"
+    }
+  },
+  {
+    "goPackagePath": "github.com/xenolf/lego",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/xenolf/lego",
+      "rev": "ca19a90028e242e878585941c2a27c8f3b3efc25",
+      "sha256": "1zkcsbdzbmfzk3kqmcj9l13li8sz228xhrw2wj3ab4a0w6drbw3x"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/natefinch/lumberjack.v2",
+    "fetch": {
+      "type": "git",
+      "url": "https://gopkg.in/natefinch/lumberjack.v2",
+      "rev": "514cbda263a734ae8caac038dadf05f8f3f9f738",
+      "sha256": "1v92v8vkip36l2fs6l5dpp655151hrijjc781cif658r8nf7xr82"
+    }
+  },
+  {
+    "goPackagePath": "github.com/shurcooL/sanitized_anchor_name",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/shurcooL/sanitized_anchor_name",
+      "rev": "10ef21a441db47d8b13ebcc5fd2310f636973c77",
+      "sha256": "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01"
+    }
+  },
+  {
+    "goPackagePath": "gopkg.in/square/go-jose.v1",
+    "fetch": {
+      "type": "git",
+      "url": "https://gopkg.in/square/go-jose.v1",
+      "rev": "40d457b439244b546f023d056628e5184136899b",
+      "sha256": "0asa1kl1qbx0cyayk44jhxxff0awpkwiw6va7yzrzjzhfc5kvg7p"
+    }
+  },
+  {
+    "goPackagePath": "github.com/mholt/archiver",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/mholt/archiver",
+      "rev": "85f054813ed511646b0ce5e047697e0651b8e1a4",
+      "sha256": "0b38mrfm3rwgdi7hrp4gjhf0y0f6bw73qjkfrkafxjrdpdg7nyly"
+    }
+  },
+  {
+    "goPackagePath": "github.com/dustin/go-humanize",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/dustin/go-humanize",
+      "rev": "8929fe90cee4b2cb9deb468b51fb34eba64d1bf0",
+      "sha256": "1g155kxjh6hd3ibx41nbpj6f7h5bh54zgl9dr53xzg2xlxljgjy0"
+    }
+  },
+  {
+    "goPackagePath": "github.com/jimstudt/http-authentication",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/jimstudt/http-authentication",
+      "rev": "3eca13d6893afd7ecabe15f4445f5d2872a1b012",
+      "sha256": "1drw3bhrxpjzwryqz9nq5s0yyjqyd42iym3bh1zjs5qsh401cq08"
+    }
+  },
+  {
+    "goPackagePath": "github.com/russross/blackfriday",
+    "fetch": {
+      "type": "git",
+      "url": "https://github.com/russross/blackfriday",
+      "rev": "d18b67ae0afd61dae240896eae1785f00709aa31",
+      "sha256": "1l78hz8k1ixry5fjw29834jz1q5ysjcpf6kx2ggjj1s6xh0bfzvf"
+    }
   }
 ]

pkgs/servers/caddy/default.nix

@@ -0,0 +1,20 @@
+# This file was generated by go2nix.
+{ stdenv, lib, go16Packages, fetchgit, fetchhg, fetchbzr, fetchsvn }:
+
+with go16Packages;
+
+buildGoPackage rec {
+  name = "caddy-${version}";
+  version = "0.8.3";
+  rev = "e2234497b79603388b58ba226abb157aa4aaf065";
+
+  goPackagePath = "github.com/mholt/caddy";
+
+  src = fetchgit {
+    inherit rev;
+    url = "https://github.com/mholt/caddy";
+    sha256 = "1snijkbz02yr7wij7bcmrj4257709sbklb3nhb5qmy95b9ssffm6";
+  };
+
+  goDeps = ./deps.json;
+}

pkgs/servers/caddy/deps.json

@@ -0,0 +1,23 @@
+[
+  {
+    "include": "../../libs.json",
+    "packages": [
+      "github.com/BurntSushi/toml",
+      "github.com/flynn/go-shlex",
+      "github.com/hashicorp/go-syslog",
+      "gopkg.in/yaml.v2",
+      "github.com/xenolf/lego",
+      "golang.org/x/crypto",
+      "gopkg.in/natefinch/lumberjack.v2",
+      "github.com/shurcooL/sanitized_anchor_name",
+      "gopkg.in/square/go-jose.v1",
+      "github.com/mholt/archiver",
+      "github.com/dustin/go-humanize",
+      "github.com/gorilla/websocket",
+      "github.com/jimstudt/http-authentication",
+      "github.com/miekg/dns",
+      "golang.org/x/net",
+      "github.com/russross/blackfriday"
+    ]
+  }
+]

pkgs/top-level/all-packages.nix

@@ -666,7 +666,7 @@ in
 
   cabal2nix = self.haskellPackages.cabal2nix;
 
-  caddy = goPackages.caddy.bin // { outputs = [ "bin" ]; };
+  caddy = callPackage ../servers/caddy { };
 
   capstone = callPackage ../development/libraries/capstone { };
 

pkgs/top-level/go-packages.nix

@@ -397,19 +397,6 @@ let
     propagatedBuildInputs = [ panicwrap revel ];
   };
 
-  caddy = buildFromGitHub {
-    rev     = "e2234497b79603388b58ba226abb157aa4aaf065";
-    version = "v0.8.3";
-    owner   = "mholt";
-    repo    = "caddy";
-    sha256  = "1snijkbz02yr7wij7bcmrj4257709sbklb3nhb5qmy95b9ssffm6";
-    buildInputs = [
-      acme archiver blackfriday crypto go-humanize go-shlex go-syslog
-      http-authentication lumberjack-v2 toml websocket yaml-v2
-    ];
-    disabled = isGo14 || isGo15;
-  };
-
   cascadia = buildGoPackage rec {
     rev = "54abbbf07a45a3ef346ebe903e0715d9a3c19352"; #master
     name = "cascadia-${stdenv.lib.strings.substring 0 7 rev}";