diff options
author | zimbatm <zimbatm@zimbatm.com> | 2017-07-09 17:02:12 +0100 |
---|---|---|
committer | zimbatm <zimbatm@zimbatm.com> | 2017-07-09 17:04:04 +0100 |
commit | 466e7e23c6f71ebed7050802d377102002fc2a0d (patch) | |
tree | 1fa897aff82c8364519d1cab22fc39f4d49a213b /pkgs/servers/caddy | |
parent | 4aad6d800dff278d3f2b865f48d7577f28abb402 (diff) |
caddy: 0.10.3 -> 0.10.4
The dependencies are now fully vendored
Diffstat (limited to 'pkgs/servers/caddy')
-rw-r--r-- | pkgs/servers/caddy/default.nix | 8 | ||||
-rw-r--r-- | pkgs/servers/caddy/deps.nix | 201 |
2 files changed, 3 insertions, 206 deletions
diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 5e5ac3bcafdc..77c836305147 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "caddy-${version}"; - version = "0.10.3"; + version = "0.10.4"; goPackagePath = "github.com/mholt/caddy"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "mholt"; repo = "caddy"; rev = "v${version}"; - sha256 = "0srz1cji1z6ag591vfwjd0aypi32hr7hh9ypps8p5szf075rkr8p"; + sha256 = "0zch19a38487dflx84dlkwz67by9g4v2v8d7wrslqhs14a0sifhk"; }; buildFlagsArray = '' @@ -20,12 +20,10 @@ buildGoPackage rec { -X github.com/mholt/caddy/caddy/caddymain.gitTag=v${version} ''; - goDeps = ./deps.nix; - meta = with stdenv.lib; { homepage = https://caddyserver.com; description = "Fast, cross-platform HTTP/2 web server with automatic HTTPS"; license = licenses.asl20; - maintainers = with maintainers; [ rushmorem fpletz ]; + maintainers = with maintainers; [ rushmorem fpletz zimbatm ]; }; } diff --git a/pkgs/servers/caddy/deps.nix b/pkgs/servers/caddy/deps.nix deleted file mode 100644 index e2b318ca60e8..000000000000 --- a/pkgs/servers/caddy/deps.nix +++ /dev/null @@ -1,201 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.0 -[ - { - goPackagePath = "github.com/codahale/aesnicheck"; - fetch = { - type = "git"; - url = "https://github.com/codahale/aesnicheck"; - rev = "349fcc471aaccc29cd074e1275f1a494323826cd"; - sha256 = "1zab6jjs5hiqpq484pbpx490zlj42v7hf4wwkqmicyaq7wclfnka"; - }; - } - { - goPackagePath = "github.com/dustin/go-humanize"; - fetch = { - type = "git"; - url = "https://github.com/dustin/go-humanize"; - rev = "259d2a102b871d17f30e3cd9881a642961a1e486"; - sha256 = "1jiada1pfhw2wwkx7cjsa6ixa8c37w51b3x09vlr4m0l945pval9"; - }; - } - { - 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 = "a91eba7f97777409bc2c443f5534d41dd20c5720"; - sha256 = "13cg6wwkk2ddqbm0nh9fpx4mq7f6qym12ch4lvs53n028ycdgw87"; - }; - } - { - goPackagePath = "github.com/hashicorp/go-syslog"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/go-syslog"; - rev = "b609c7d9de4658cded34a7336b90886c56f9dbdb"; - sha256 = "1k0dqkizj4vwgdsb7x7fzmcgz9079sczhpn9whd0r3xcnqs7pkkb"; - }; - } - { - goPackagePath = "github.com/hashicorp/golang-lru"; - fetch = { - type = "git"; - url = "https://github.com/hashicorp/golang-lru"; - rev = "0a025b7e63adc15a622f29b0b2c4c3848243bbf6"; - sha256 = "1iq7lbpsz7ks052mpznmkf8s4k43p51z4dik2n9ivrxk666q2wxi"; - }; - } - { - 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 = "25700e67be5c860bcc999137275b9ef8b65932bd"; - sha256 = "08zbfy5n6ki6fjaihk7y686dwksdglds9c8f1klkldvjbg8mw4vp"; - }; - } - { - 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 = "bb280f29be75d6d78c64a32692b668e2a99c57bb"; - sha256 = "1a6xqh7z8amb1372kb63kmn764w6c0ypcl7c4c7kyy2sqx8lyjyc"; - }; - } - { - goPackagePath = "github.com/lucas-clemente/quic-go-certificates"; - fetch = { - type = "git"; - url = "https://github.com/lucas-clemente/quic-go-certificates"; - rev = "d2f86524cced5186554df90d92529757d22c1cb6"; - sha256 = "033099nv0y9pbv0v292x6g0mvwr2w02jf4vvpwx6sjpwbla4xjxd"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "e78414ef75607394ad7d917824f07f381df2eafa"; - sha256 = "1g5rgbjy7nr0l6074plh2aqiwiy9nck9bhhks9c5ki3r00fjj3ay"; - }; - } - { - goPackagePath = "github.com/naoina/go-stringutil"; - fetch = { - type = "git"; - url = "https://github.com/naoina/go-stringutil"; - rev = "6b638e95a32d0c1131db0e7fe83775cbea4a0d0b"; - sha256 = "00831p1wn3rimybk1z8l30787kn1akv5jax5wx743nn76qcmkmc6"; - }; - } - { - goPackagePath = "github.com/naoina/toml"; - fetch = { - type = "git"; - url = "https://github.com/naoina/toml"; - rev = "e6f5723bf2a66af014955e0888881314cf294129"; - sha256 = "0kh7xnckw689kksh23ginyl3g8h2yqyvjh54nmnfvjaj886lvbsf"; - }; - } - { - goPackagePath = "github.com/russross/blackfriday"; - fetch = { - type = "git"; - url = "https://github.com/russross/blackfriday"; - rev = "067529f716f4c3f5e37c8c95ddd59df1007290ae"; - sha256 = "1l61ib6r6mg587p58li5zhafjkkmrzacachcjg1cvw0k4zza9137"; - }; - } - { - goPackagePath = "github.com/xenolf/lego"; - fetch = { - type = "git"; - url = "https://github.com/xenolf/lego"; - rev = "aaa8e70aec58a858b6bef0706b367dd5e8d58128"; - sha256 = "0899mdgb01bpz83zyxzln8ygyll78gmcslw5i36q9m60pqj59z60"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "e7ba82683099cae71475961448ab8f903ea77c26"; - sha256 = "0w6zvzchgzk197siq3qbsh6pdpnx7g9xc08k5axv5yc6w8qhgx11"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "1a68b1313cf4ad7778376e82641197b60c02f65c"; - sha256 = "1nfva16dasc9h5y1njcfnr2g09damk754g3yliij3ar06k06p1xf"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "210eee5cf7323015d097341bcf7166130d001cd8"; - sha256 = "0sm9548ky5vi2sr5zjzwwna5f4pfs0nmlaw0pjnamxwfjzy4jnfb"; - }; - } - { - goPackagePath = "gopkg.in/natefinch/lumberjack.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/natefinch/lumberjack.v2"; - rev = "a96e63847dc3c67d17befa69c303767e2f84e54f"; - sha256 = "1l3vlv72b7rfkpy1164kwd3qzrqmmjnb67akzxqp2mlvc66k6p3d"; - }; - } - { - goPackagePath = "gopkg.in/square/go-jose.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/square/go-jose.v1"; - rev = "aa2e30fdd1fe9dd3394119af66451ae790d50e0d"; - sha256 = "0drajyadd6c4m5qv0jxcv748qczg8sgxz28nva1jn39f234m02is"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b"; - sha256 = "1hj2ag9knxflpjibck0n90jrhsrqz7qvad4qnif7jddyapi9bqzl"; - }; - } -] |