From 9e6240629c0b1be932a11fe722df82a92379fe57 Mon Sep 17 00:00:00 2001 From: rushmorem Date: Sun, 14 Aug 2016 19:55:52 +0200 Subject: [PATCH] caddy: 0.8.3 -> 0.9.0 Closes https://github.com/NixOS/nixpkgs/issues/17678 --- pkgs/servers/caddy/default.nix | 20 +- pkgs/servers/caddy/deps.json | 324 ++++++++++++++++++--------------- 2 files changed, 193 insertions(+), 151 deletions(-) diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 68ce9440f4f4..4e5703bc531a 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; } diff --git a/pkgs/servers/caddy/deps.json b/pkgs/servers/caddy/deps.json index e026c7c63699..3ed975cab762 100644 --- a/pkgs/servers/caddy/deps.json +++ b/pkgs/servers/caddy/deps.json @@ -1,146 +1,182 @@ [ - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", - "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" - } - }, - { - "goPackagePath": "github.com/gorilla/websocket", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/websocket", - "rev": "a622679ebd7a3b813862379232f645f8e690e43f", - "sha256": "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q" - } - }, - { - "goPackagePath": "github.com/miekg/dns", - "fetch": { - "type": "git", - "url": "https://github.com/miekg/dns", - "rev": "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa", - "sha256": "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl" - } - }, - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml", - "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4", - "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw" - } - }, - { - "goPackagePath": "github.com/hashicorp/go-syslog", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/go-syslog", - "rev": "42a2b573b664dbf281bd48c3cc12c086b17a39ba", - "sha256": "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3" - } - }, - { - "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" - } + { + "goPackagePath": "github.com/BurntSushi/toml", + "fetch": { + "type": "git", + "url": "https://github.com/BurntSushi/toml", + "rev": "99064174e013895bbd9b025c31100bd1d9b590ca", + "sha256": "058qrar8rvw3wb0ci1mf1axnqq2729cvv9zmdr4ms2nn9s97yiz9" } -] + }, + { + "goPackagePath": "github.com/dustin/go-humanize", + "fetch": { + "type": "git", + "url": "https://github.com/dustin/go-humanize", + "rev": "2fcb5204cdc65b4bec9fd0a87606bb0d0e3c54e8", + "sha256": "1m2qgn5vh5m66ggmclgikvwc05np2r7sxgpvlj2jip5d61x29j5k" + } + }, + { + "goPackagePath": "github.com/flynn/go-shlex", + "fetch": { + "type": "git", + "url": "https://github.com/flynn/go-shlex", + "rev": "3f9db97f856818214da2e1057f8ad84803971cff", + "sha256": "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia" + } + }, + { + "goPackagePath": "github.com/gorilla/websocket", + "fetch": { + "type": "git", + "url": "https://github.com/gorilla/websocket", + "rev": "a69d25be2fe2923a97c2af6849b2f52426f68fc0", + "sha256": "1z09mff5yfdrw8vbylrgrick5m5hczjy8m2x6swdq8v062s45g3v" + } + }, + { + "goPackagePath": "github.com/hashicorp/go-syslog", + "fetch": { + "type": "git", + "url": "https://github.com/hashicorp/go-syslog", + "rev": "42a2b573b664dbf281bd48c3cc12c086b17a39ba", + "sha256": "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3" + } + }, + { + "goPackagePath": "github.com/jimstudt/http-authentication", + "fetch": { + "type": "git", + "url": "https://github.com/jimstudt/http-authentication", + "rev": "3eca13d6893afd7ecabe15f4445f5d2872a1b012", + "sha256": "1drw3bhrxpjzwryqz9nq5s0yyjqyd42iym3bh1zjs5qsh401cq08" + } + }, + { + "goPackagePath": "github.com/lucas-clemente/aes12", + "fetch": { + "type": "git", + "url": "https://github.com/lucas-clemente/aes12", + "rev": "5a3c52721c1e81aa8162601ac2342486525156d5", + "sha256": "16z4h752na2d4sskjvbgi9bpwx874lpnzn6i13n33xjz599nps4y" + } + }, + { + "goPackagePath": "github.com/lucas-clemente/fnv128a", + "fetch": { + "type": "git", + "url": "https://github.com/lucas-clemente/fnv128a", + "rev": "393af48d391698c6ae4219566bfbdfef67269997", + "sha256": "1cvq0p0k86p668yz9rb3z98fz3f9phvbvqp6ilbasiy4y2x5w184" + } + }, + { + "goPackagePath": "github.com/lucas-clemente/quic-go", + "fetch": { + "type": "git", + "url": "https://github.com/lucas-clemente/quic-go", + "rev": "61454ac85f1209c41ffcc000213a42f3e76346e5", + "sha256": "0y7qmwlb93r0aq5m5qarc86550d75yx86pwv31wd2m0474yv7jk9" + } + }, + { + "goPackagePath": "github.com/lucas-clemente/quic-go-certificates", + "fetch": { + "type": "git", + "url": "https://github.com/lucas-clemente/quic-go-certificates", + "rev": "9bb36d3159787cca26dcfa15e23049615e307ef8", + "sha256": "146674p0rg0m4j8p33r5idn5j5k4a277fz1yzf87v5m8wf4694q5" + } + }, + { + "goPackagePath": "github.com/mholt/caddy", + "fetch": { + "type": "git", + "url": "https://github.com/mholt/caddy.git", + "rev": "f28af637327a4f12ae745284c519cfdeca5502ef", + "sha256": "1s7z0xbcw516i37pyj1wgxd9diqrifdghf97vs31ilbqs6z0nyls" + } + }, + { + "goPackagePath": "github.com/miekg/dns", + "fetch": { + "type": "git", + "url": "https://github.com/miekg/dns", + "rev": "db96a2b759cdef4f11a34506a42eb8d1290c598e", + "sha256": "0h5n4psd0p7q55jadgsgz2a1aj791yanrfj76avalh6aawvdpcm6" + } + }, + { + "goPackagePath": "github.com/russross/blackfriday", + "fetch": { + "type": "git", + "url": "https://github.com/russross/blackfriday", + "rev": "93622da34e54fb6529bfb7c57e710f37a8d9cbd8", + "sha256": "19y4cx4afm3fjj7w83g0wklbzqdjm7m1j5nq64l4yq8bi50y2iv2" + } + }, + { + "goPackagePath": "github.com/shurcooL/sanitized_anchor_name", + "fetch": { + "type": "git", + "url": "https://github.com/shurcooL/sanitized_anchor_name", + "rev": "10ef21a441db47d8b13ebcc5fd2310f636973c77", + "sha256": "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01" + } + }, + { + "goPackagePath": "github.com/xenolf/lego", + "fetch": { + "type": "git", + "url": "https://github.com/xenolf/lego", + "rev": "4c33bee13d438d72ea22be3ff806f8093fb8d072", + "sha256": "191wx4jmi2hs2m233da0c7j1l80alf2493wmnixfphwwdik7qdvw" + } + }, + { + "goPackagePath": "golang.org/x/crypto", + "fetch": { + "type": "git", + "url": "https://go.googlesource.com/crypto", + "rev": "7a1054f3ac58191481dc500077c6b060f5d6c7e5", + "sha256": "1n34nalvan3mydjzi48hxa30mz0i3zcb2rynw07s39m457ab1412" + } + }, + { + "goPackagePath": "golang.org/x/net", + "fetch": { + "type": "git", + "url": "https://go.googlesource.com/net", + "rev": "57bfaa875b96fb91b4766077f34470528d4b03e9", + "sha256": "17gfka5dv1n7v0z49clyl3h0xm5w2qcaldyyzlar6rh6l14g2dq5" + } + }, + { + "goPackagePath": "gopkg.in/natefinch/lumberjack.v2", + "fetch": { + "type": "git", + "url": "https://gopkg.in/natefinch/lumberjack.v2", + "rev": "514cbda263a734ae8caac038dadf05f8f3f9f738", + "sha256": "1v92v8vkip36l2fs6l5dpp655151hrijjc781cif658r8nf7xr82" + } + }, + { + "goPackagePath": "gopkg.in/square/go-jose.v1", + "fetch": { + "type": "git", + "url": "https://gopkg.in/square/go-jose.v1", + "rev": "e3f973b66b91445ec816dd7411ad1b6495a5a2fc", + "sha256": "18icclnws5bz4xmlyybkxl38nhvyr990h88rvp4lp9n4r1fk3lhb" + } + }, + { + "goPackagePath": "gopkg.in/yaml.v2", + "fetch": { + "type": "git", + "url": "https://gopkg.in/yaml.v2", + "rev": "e4d366fc3c7938e2958e662b4258c7a89e1f0e3e", + "sha256": "1himz6569rcgn27q6sdrwvdldx45q2spgjb5cfihgb80zww8di8x" + } + } +] \ No newline at end of file