diff --git a/doc/languages-frameworks/go.xml b/doc/languages-frameworks/go.xml index 7365f5abe681f..3b15e5bea901b 100644 --- a/doc/languages-frameworks/go.xml +++ b/doc/languages-frameworks/go.xml @@ -24,7 +24,7 @@ deis = buildGoPackage rec { sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; buildFlags = "--tags release"; } @@ -56,7 +56,9 @@ the following arguments are of special significance to the function: goDeps is where the Go dependencies of a Go program are listed - in a JSON format described below. + as a list of package source identified by Go import path. + It could be imported as a separate deps.nix file for + readability. Dependency format is described below. @@ -70,30 +72,31 @@ the following arguments are of special significance to the function: -The goDeps attribute should point to a JSON file that defines which Go libraries - are needed and should be included in GOPATH for buildPhase. - +The goDeps attribute can be imported from a separate + nix file that defines which Go libraries are needed and should + be included in GOPATH for buildPhase. -deps.json +deps.nix +{ fetchgit }: [ - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - }, - { - "include": "../../libs.json", - "packages": [ - "github.com/docopt/docopt-go", - "golang.org/x/crypto", - ] - } + { + goPackagePath = "gopkg.in/yaml.v2"; + src = fetchgit { + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "github.com/docopt/docopt-go"; + src = fetchgit { + url = "https://github.com/docopt/docopt-go"; + rev = "784ddc588536785e7299f7272f39101f7faccc3f"; + sha256 = "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj"; + }; + } ] @@ -116,23 +119,7 @@ the following arguments are of special significance to the function: - fetch type that needs to be used to get package source. If git - is used there should be url, rev and sha256 - defined next to it. - - - - - - include could be used to reuse goDeps between Go programs. - There is a common libs set in <nixpkgs/pkgs/development/go-modules/libs.json> - with pinned versions of many packages that you can reuse. - - - - - - packages enumerates all Go packages that will be imported from included file. + src defines Go packagee source. diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index c183f70a2895d..6d7e4d9903aef 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, fetchgit }: buildGoPackage rec { name = "hugo-${version}"; @@ -14,5 +14,5 @@ buildGoPackage rec { sha256 = "135mrdi8i56z9m2sihjrdfab6lrczbfgavwvfrngvi1zxnx7scmv"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; } diff --git a/pkgs/applications/misc/hugo/deps.json b/pkgs/applications/misc/hugo/deps.json deleted file mode 100644 index 47f67d4269c47..0000000000000 --- a/pkgs/applications/misc/hugo/deps.json +++ /dev/null @@ -1,44 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "gopkg.in/yaml.v2", - "github.com/hashicorp/hcl", - "github.com/pkg/sftp", - "golang.org/x/sys", - "github.com/hashicorp/go-multierror", - "golang.org/x/crypto", - "github.com/pkg/errors", - "github.com/kr/fs", - "github.com/kyokomi/emoji", - "github.com/bep/inflect", - "github.com/BurntSushi/toml", - "github.com/PuerkitoBio/purell", - "github.com/PuerkitoBio/urlesc", - "github.com/dchest/cssmin", - "github.com/eknkc/amber", - "github.com/gorilla/websocket", - "github.com/kardianos/osext", - "github.com/miekg/mmark", - "github.com/mitchellh/mapstructure", - "github.com/russross/blackfriday", - "github.com/shurcooL/sanitized_anchor_name", - "github.com/spf13/afero", - "github.com/spf13/cast", - "github.com/spf13/jwalterweatherman", - "github.com/spf13/cobra", - "github.com/cpuguy83/go-md2man", - "github.com/inconshreveable/mousetrap", - "github.com/spf13/pflag", - "github.com/spf13/fsync", - "github.com/spf13/viper", - "github.com/kr/pretty", - "github.com/kr/text", - "github.com/magiconair/properties", - "golang.org/x/text", - "github.com/yosssi/ace", - "github.com/spf13/nitro", - "github.com/fsnotify/fsnotify" - ] - } -] diff --git a/pkgs/applications/misc/hugo/deps.nix b/pkgs/applications/misc/hugo/deps.nix new file mode 100644 index 0000000000000..433bf0282f789 --- /dev/null +++ b/pkgs/applications/misc/hugo/deps.nix @@ -0,0 +1,283 @@ +{ fetchgit }: +[ + { + goPackagePath = "golang.org/x/sys"; + src = fetchgit { + url = "https://go.googlesource.com/sys"; + rev = "d9157a9621b69ad1d8d77a1933590c416593f24f"; + sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + src = fetchgit { + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + src = fetchgit { + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + src = fetchgit { + url = "https://github.com/gorilla/websocket"; + rev = "a622679ebd7a3b813862379232f645f8e690e43f"; + sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + src = fetchgit { + url = "https://github.com/inconshreveable/mousetrap"; + rev = "9dbb96d2c3a964935b0870b5abaea13c98b483aa"; + sha256 = "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + src = fetchgit { + url = "https://github.com/kardianos/osext"; + rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc"; + sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + src = fetchgit { + url = "https://github.com/hashicorp/hcl"; + rev = "54864211433d45cb780682431585b3e573b49e4a"; + sha256 = "07l2dydzjpdgm2d4a72hkmincn455j3nrafg6hs3c23bkvizj950"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-multierror"; + src = fetchgit { + url = "https://github.com/hashicorp/go-multierror"; + rev = "56912fb08d85084aa318edcf2bba735b97cf35c5"; + sha256 = "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + src = fetchgit { + url = "https://github.com/BurntSushi/toml"; + rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; + sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + src = fetchgit { + url = "https://github.com/mitchellh/mapstructure"; + rev = "281073eb9eb092240d33ef253c404f1cca550309"; + sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh"; + }; + } + { + goPackagePath = "golang.org/x/text"; + src = fetchgit { + url = "https://go.googlesource.com/text"; + rev = "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e"; + sha256 = "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + src = fetchgit { + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "10ef21a441db47d8b13ebcc5fd2310f636973c77"; + sha256 = "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + src = fetchgit { + url = "https://github.com/russross/blackfriday"; + rev = "d18b67ae0afd61dae240896eae1785f00709aa31"; + sha256 = "1l78hz8k1ixry5fjw29834jz1q5ysjcpf6kx2ggjj1s6xh0bfzvf"; + }; + } + { + goPackagePath = "github.com/yosssi/ace"; + src = fetchgit { + url = "https://github.com/yosssi/ace"; + rev = "71afeb714739f9d5f7e1849bcd4a0a5938e1a70d"; + sha256 = "15k7ji8m3nqbwhnsvp82j4qa45sgvwv2giliw2xkdwi2g7mfrn8k"; + }; + } + { + goPackagePath = "github.com/spf13/viper"; + src = fetchgit { + url = "https://github.com/spf13/viper"; + rev = "c1ccc378a054ea8d4e38d8c67f6938d4760b53dd"; + sha256 = "0lpdzalqhqp9pwsg63inkxwjji7m0pp42ryw1499bqbjp97hriq0"; + }; + } + { + goPackagePath = "github.com/spf13/pflag"; + src = fetchgit { + url = "https://github.com/spf13/pflag"; + rev = "367864438f1b1a3c7db4da06a2f55b144e6784e0"; + sha256 = "03c6654hv4v1fj79i5sri3p9q2afqgicka4nicb6fr4kcfkkgbfp"; + }; + } + { + goPackagePath = "github.com/spf13/jwalterweatherman"; + src = fetchgit { + url = "https://github.com/spf13/jwalterweatherman"; + rev = "33c24e77fb80341fe7130ee7c594256ff08ccc46"; + sha256 = "1knvzspqzc2bh58q16zggzc8gcabjp5gr7zk4k7nx5ij4092cg0z"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + src = fetchgit { + url = "https://github.com/fsnotify/fsnotify"; + rev = "30411dbcefb7a1da7e84f75530ad3abe4011b4f8"; + sha256 = "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm"; + }; + } + { + goPackagePath = "github.com/magiconair/properties"; + src = fetchgit { + url = "https://github.com/magiconair/properties"; + rev = "c265cfa48dda6474e208715ca93e987829f572f8"; + sha256 = "1ab9ywwsrdq5mvrcwl7m3276y1q4dfwinbv88vgpqwcqai9wkpp3"; + }; + } + { + goPackagePath = "github.com/bep/inflect"; + src = fetchgit { + url = "https://github.com/bep/inflect"; + rev = "b896c45f5af983b1f416bdf3bb89c4f1f0926f69"; + sha256 = "0drv6in94n7lmap4ajvgqlvdcbpn8alinfdzywzpihvzbx21b3h3"; + }; + } + { + goPackagePath = "github.com/eknkc/amber"; + src = fetchgit { + url = "https://github.com/eknkc/amber"; + rev = "91774f050c1453128146169b626489e60108ec03"; + sha256 = "1rb8bm35h8a77q4py6r3818cpwh7kpq1kh2ib2rb4i5s7z75ciis"; + }; + } + { + goPackagePath = "github.com/spf13/afero"; + src = fetchgit { + url = "https://github.com/spf13/afero"; + rev = "1a8ecf8b9da1fb5306e149e83128fc447957d2a8"; + sha256 = "1nrg0gmqnl4h6zjmi4mdhrwnl3l34nzxpq2hsr3nizfvrx5gqbzw"; + }; + } + { + goPackagePath = "github.com/spf13/cast"; + src = fetchgit { + url = "https://github.com/spf13/cast"; + rev = "27b586b42e29bec072fe7379259cc719e1289da6"; + sha256 = "1y73pfxdvm1bfpghwsfxj8gl4miv6fpzi9azxcknp6rcjn1gmq0x"; + }; + } + { + goPackagePath = "github.com/spf13/cobra"; + src = fetchgit { + url = "https://github.com/spf13/cobra"; + rev = "bc81c21bd0d8be5ba2d6630a505d79d4467566e7"; + sha256 = "1sp8gl25cjx0yibh6q1i8d5rbxpwaal3z8vz372wfmbz002say8r"; + }; + } + { + goPackagePath = "github.com/dchest/cssmin"; + src = fetchgit { + url = "https://github.com/dchest/cssmin"; + rev = "fb8d9b44afdc258bfff6052d3667521babcb2239"; + sha256 = "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s"; + }; + } + { + goPackagePath = "github.com/spf13/fsync"; + src = fetchgit { + url = "https://github.com/spf13/fsync"; + rev = "eefee59ad7de621617d4ff085cf768aab4b919b1"; + sha256 = "0d56xdczawikyczc12i661qc79dbv4q8ihlj4p20zsjkyxxym59p"; + }; + } + { + goPackagePath = "github.com/cpuguy83/go-md2man"; + src = fetchgit { + url = "https://github.com/cpuguy83/go-md2man"; + rev = "2724a9c9051aa62e9cca11304e7dd518e9e41599"; + sha256 = "1j2bigs7ixy20cdqd246nxr417md2qcyvkfk3x94992cr88d0vyj"; + }; + } + { + goPackagePath = "github.com/miekg/mmark"; + src = fetchgit { + url = "https://github.com/miekg/mmark"; + rev = "adb5c3e2e9f3e7da9bd25291edda8e66c0045a2a"; + sha256 = "0fycz17fj37fh95lfshdrfwrgkzi3hl1kgnily0cxc9zwfbap3qa"; + }; + } + { + goPackagePath = "github.com/spf13/nitro"; + src = fetchgit { + url = "https://github.com/spf13/nitro"; + rev = "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8"; + sha256 = "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/purell"; + src = fetchgit { + url = "https://github.com/PuerkitoBio/purell"; + rev = "1d5d1cfad45d42ec5f81fa8ef23de09cebc6dcc3"; + sha256 = "12k82576ka21c6572yy2v81kxpjrgf9mffjlz469g3vs0g3nkwlb"; + }; + } + { + goPackagePath = "github.com/pkg/sftp"; + src = fetchgit { + url = "https://github.com/pkg/sftp"; + rev = "d4c18e7ffdc496a38de67dde6e29b2f364afc472"; + sha256 = "0cnl83k317gxskayfj3xwr4bl0vcbjvlwi3q0vjwvircynb6xscj"; + }; + } + { + goPackagePath = "github.com/kr/fs"; + src = fetchgit { + url = "https://github.com/kr/fs"; + rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b"; + sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"; + }; + } + { + goPackagePath = "github.com/kyokomi/emoji"; + src = fetchgit { + url = "https://github.com/kyokomi/emoji"; + rev = "17c5e7085c9d59630aa578df67f4469481fbe7a9"; + sha256 = "0qs4mi7z1lghiyiw7s2bz5y959wj9ifmhyqh39xwqk69d690jwlp"; + }; + } + { + goPackagePath = "github.com/pkg/errors"; + src = fetchgit { + url = "https://github.com/pkg/errors"; + rev = "494e70f7620561491c2ca11e185bbef4b70060da"; + sha256 = "0a0961ixl67vryhnzyzhai357c9n9a7v3vpkpqrh32spn033gjd9"; + }; + } + { + goPackagePath = "github.com/PuerkitoBio/urlesc"; + src = fetchgit { + url = "https://github.com/PuerkitoBio/urlesc"; + rev = "5fa9ff0392746aeae1c4b37fcc42c65afa7a9587"; + sha256 = "0dppkmfs0hb5vcqli191x9yss5vvlx29qxjcywhdfirc89rn0sni"; + }; + } +] diff --git a/pkgs/applications/misc/mop/default.nix b/pkgs/applications/misc/mop/default.nix index ccdb47c4b608d..93791e5b39716 100644 --- a/pkgs/applications/misc/mop/default.nix +++ b/pkgs/applications/misc/mop/default.nix @@ -6,7 +6,7 @@ buildGoPackage rec { rev = "bc666ec165d08b43134f7ec0bf29083ad5466243"; goPackagePath = "github.com/michaeldv/mop"; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; preConfigure = '' for i in $(find . -type f);do diff --git a/pkgs/applications/misc/mop/deps.json b/pkgs/applications/misc/mop/deps.json deleted file mode 100644 index e1b40df831045..0000000000000 --- a/pkgs/applications/misc/mop/deps.json +++ /dev/null @@ -1,8 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/nsf/termbox-go" - ] - } -] diff --git a/pkgs/applications/misc/mop/deps.nix b/pkgs/applications/misc/mop/deps.nix new file mode 100644 index 0000000000000..d2746ee7eaf5e --- /dev/null +++ b/pkgs/applications/misc/mop/deps.nix @@ -0,0 +1,11 @@ +{ fetchgit }: +[ + { + goPackagePath = "github.com/nsf/termbox-go"; + src = fetchgit { + url = "https://github.com/nsf/termbox-go"; + rev = "9aecf65084a5754f12d27508fa2e6ed56851953b"; + sha256 = "16sak07bgvmax4zxfrd4jia1dgygk733xa8vk8cdx28z98awbfsh"; + }; + } +] diff --git a/pkgs/applications/misc/wego/default.nix b/pkgs/applications/misc/wego/default.nix index 5918f3ef37882..2e7d56b95887f 100644 --- a/pkgs/applications/misc/wego/default.nix +++ b/pkgs/applications/misc/wego/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchgit }: buildGoPackage rec { name = "wego-${version}"; @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "14p3hvv82bsxqnbnzz8hjv75i39kzg154a132n6cdxx3vgw76gck"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; } diff --git a/pkgs/applications/misc/wego/deps.json b/pkgs/applications/misc/wego/deps.json deleted file mode 100644 index 2255fdeb69e3a..0000000000000 --- a/pkgs/applications/misc/wego/deps.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/mattn/go-colorable", - "github.com/mattn/go-runewidth", - "github.com/schachmat/ingo" - ] - } -] diff --git a/pkgs/applications/misc/wego/deps.nix b/pkgs/applications/misc/wego/deps.nix new file mode 100644 index 0000000000000..1748885564a1d --- /dev/null +++ b/pkgs/applications/misc/wego/deps.nix @@ -0,0 +1,27 @@ +{ fetchgit }: +[ + { + goPackagePath = "github.com/mattn/go-runewidth"; + src = fetchgit { + url = "https://github.com/mattn/go-runewidth"; + rev = "d6bea18f789704b5f83375793155289da36a3c7f"; + sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + src = fetchgit { + url = "https://github.com/mattn/go-colorable"; + rev = "3dac7b4f76f6e17fb39b768b89e3783d16e237fe"; + sha256 = "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6"; + }; + } + { + goPackagePath = "github.com/schachmat/ingo"; + src = fetchgit { + url = "https://github.com/schachmat/ingo"; + rev = "fab41e4e62cbef5d92998746ec25f7e195100f38"; + sha256 = "04yfnch7pdabjjqfl2qxjmsaknvp4m1rbjlv8qrpmnqwjkxzx0hb"; + }; + } +] diff --git a/pkgs/applications/networking/drive/default.nix b/pkgs/applications/networking/drive/default.nix index 3b64d7af43bbd..d705ca5717711 100644 --- a/pkgs/applications/networking/drive/default.nix +++ b/pkgs/applications/networking/drive/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchgit }: buildGoPackage rec { name = "drive-${version}"; @@ -14,5 +14,5 @@ buildGoPackage rec { sha256 = "07s4nhfcr6vznf1amvl3a4wq2hn9zq871rcppfi4i6zs7iw2ay1v"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; } diff --git a/pkgs/applications/networking/drive/deps.json b/pkgs/applications/networking/drive/deps.json deleted file mode 100644 index 3d71a76de8a66..0000000000000 --- a/pkgs/applications/networking/drive/deps.json +++ /dev/null @@ -1,26 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/boltdb/bolt", - "github.com/cheggaaa/pb", - "github.com/odeke-em/cli-spinner", - "github.com/odeke-em/statos", - "golang.org/x/oauth2", - "github.com/odeke-em/exponential-backoff", - "github.com/odeke-em/extractor", - "github.com/odeke-em/meddler", - "github.com/odeke-em/xon", - "github.com/odeke-em/cache", - "github.com/odeke-em/drive", - "github.com/odeke-em/command", - "github.com/odeke-em/log", - "github.com/odeke-em/pretty-words", - "github.com/skratchdot/open-golang", - "google.golang.org/cloud", - "google.golang.org/api", - "github.com/mattn/go-isatty", - "golang.org/x/net" - ] - } -] diff --git a/pkgs/applications/networking/drive/deps.nix b/pkgs/applications/networking/drive/deps.nix new file mode 100644 index 0000000000000..d0e5a755f07ef --- /dev/null +++ b/pkgs/applications/networking/drive/deps.nix @@ -0,0 +1,147 @@ +{ fetchgit }: +[ + { + goPackagePath = "golang.org/x/net"; + src = fetchgit { + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } + { + goPackagePath = "google.golang.org/api"; + src = fetchgit { + url = "https://code.googlesource.com/google-api-go-client"; + rev = "a5c3e2a4792aff40e59840d9ecdff0542a202a80"; + sha256 = "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8"; + }; + } + { + goPackagePath = "google.golang.org/cloud"; + src = fetchgit { + url = "https://code.googlesource.com/gocloud"; + rev = "6335269abf9002cf5a84613c13cda6010842b834"; + sha256 = "15xrqxna5ms0r634k3bfzyymn431dvqcjwbsap8ay60x371kzbwf"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + src = fetchgit { + url = "https://go.googlesource.com/oauth2"; + rev = "397fe7649477ff2e8ced8fc0b2696f781e53745a"; + sha256 = "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + src = fetchgit { + url = "https://github.com/mattn/go-isatty"; + rev = "ae0b1f8f8004be68d791a576e3d8e7648ab41449"; + sha256 = "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj"; + }; + } + { + goPackagePath = "github.com/boltdb/bolt"; + src = fetchgit { + url = "https://github.com/boltdb/bolt"; + rev = "957d850b5158a4eebf915476058e720f43459584"; + sha256 = "193adhhsqdy0kyq1l1fi8pg2n6pwyrw4h607qm78qyi26f8i7vzf"; + }; + } + { + goPackagePath = "github.com/cheggaaa/pb"; + src = fetchgit { + url = "https://github.com/cheggaaa/pb"; + rev = "e648e12b78cedf14ebb2fc1855033f07b034cfbb"; + sha256 = "03k4cars7hcqqgdsd0minfls2p7gjpm8q6y8vknh1s68kvxd4xam"; + }; + } + { + goPackagePath = "github.com/odeke-em/cli-spinner"; + src = fetchgit { + url = "https://github.com/odeke-em/cli-spinner"; + rev = "610063bb4aeef25f7645b3e6080456655ec0fb33"; + sha256 = "13wzs2qrxd72ah32ym0ppswhvyimjw5cqaq3q153y68vlvxd048c"; + }; + } + { + goPackagePath = "github.com/odeke-em/statos"; + src = fetchgit { + url = "https://github.com/odeke-em/statos"; + rev = "f27d6ab69b62abd9d9fe80d355e23a3e45d347d6"; + sha256 = "17cpks8bi9i7p8j38x0wy60jb9g39wbzszcmhx4hlq6yzxr04jvs"; + }; + } + { + goPackagePath = "github.com/odeke-em/exponential-backoff"; + src = fetchgit { + url = "https://github.com/odeke-em/exponential-backoff"; + rev = "96e25d36ae36ad09ac02cbfe653b44c4043a8e09"; + sha256 = "1as21p2jj8xpahvdxqwsw2i1s3fll14dlc9j192iq7xl1ybwpqs6"; + }; + } + { + goPackagePath = "github.com/odeke-em/extractor"; + src = fetchgit { + url = "https://github.com/odeke-em/extractor"; + rev = "801861aedb854c7ac5e1329e9713023e9dc2b4d4"; + sha256 = "036zmnqxy48h6mxiwywgxix2p4fqvl4svlmcp734ri2rbq3cmxs1"; + }; + } + { + goPackagePath = "github.com/odeke-em/meddler"; + src = fetchgit { + url = "https://github.com/odeke-em/meddler"; + rev = "d2b51d2b40e786ab5f810d85e65b96404cf33570"; + sha256 = "0m0fqrn3kxy4swyk4ja1y42dn1i35rq9j85y11wb222qppy2342x"; + }; + } + { + goPackagePath = "github.com/odeke-em/xon"; + src = fetchgit { + url = "https://github.com/odeke-em/xon"; + rev = "d580be739d723da4f6378083128f93017b8ab295"; + sha256 = "07a7zj01d4a23xqp01m48jp2v5mw49islf4nbq2rj13sd5w4s6sc"; + }; + } + { + goPackagePath = "github.com/odeke-em/cache"; + src = fetchgit { + url = "https://github.com/odeke-em/cache"; + rev = "b51b08cb6cf889deda6c941a5205baecfd16f3eb"; + sha256 = "1rmm1ky7irqypqjkk6qcd2n0xkzpaggdxql9dp9i9qci5rvvwwd4"; + }; + } + { + goPackagePath = "github.com/odeke-em/command"; + src = fetchgit { + url = "https://github.com/odeke-em/command"; + rev = "91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561"; + sha256 = "1ghckzr8h99ckagpmb15p61xazdjmf9mjmlym634hsr9vcj84v62"; + }; + } + { + goPackagePath = "github.com/odeke-em/log"; + src = fetchgit { + url = "https://github.com/odeke-em/log"; + rev = "cad53c4565a0b0304577bd13f3862350bdc5f907"; + sha256 = "059c933qjikxlvaywzpzljqnab19svymbv6x32pc7khw156fh48w"; + }; + } + { + goPackagePath = "github.com/odeke-em/pretty-words"; + src = fetchgit { + url = "https://github.com/odeke-em/pretty-words"; + rev = "9d37a7fcb4ae6f94b288d371938482994458cecb"; + sha256 = "1466wjhrg9lhqmzil1vf8qj16fxk32b5kxlcccyw2x6dybqa6pkl"; + }; + } + { + goPackagePath = "github.com/skratchdot/open-golang"; + src = fetchgit { + url = "https://github.com/skratchdot/open-golang"; + rev = "c8748311a7528d0ba7330d302adbc5a677ef9c9e"; + sha256 = "0qhn2d00v3m9fiqk9z7swdm599clc6j7rnli983s8s1byyp0x3ac"; + }; + } +] diff --git a/pkgs/applications/networking/instant-messengers/pond/default.nix b/pkgs/applications/networking/instant-messengers/pond/default.nix index 3b7b96b778f05..a31cf56ef3883 100644 --- a/pkgs/applications/networking/instant-messengers/pond/default.nix +++ b/pkgs/applications/networking/instant-messengers/pond/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, buildGoPackage, trousers, dclxvi, wrapGAppsHook, pkgconfig, gtk3, gtkspell3, - fetchgit, fetchhg, fetchbzr, fetchsvn }: + fetchgit }: let isx86_64 = stdenv.lib.any (n: n == stdenv.system) stdenv.lib.platforms.x86_64; @@ -18,7 +18,7 @@ buildGoPackage rec { sha256 = "1dmgbg4ak3jkbgmxh0lr4hga1nl623mh7pvsgby1rxl4ivbzwkh4"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; buildInputs = [ trousers pkgconfig gtk3 gtkspell3 ] ++ stdenv.lib.optional isx86_64 dclxvi diff --git a/pkgs/applications/networking/instant-messengers/pond/deps.json b/pkgs/applications/networking/instant-messengers/pond/deps.json deleted file mode 100644 index 53f48df3b5539..0000000000000 --- a/pkgs/applications/networking/instant-messengers/pond/deps.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "golang.org/x/net", - "github.com/golang/protobuf", - "github.com/agl/ed25519", - "golang.org/x/crypto", - "github.com/agl/go-gtk" - ] - } -] diff --git a/pkgs/applications/networking/instant-messengers/pond/deps.nix b/pkgs/applications/networking/instant-messengers/pond/deps.nix new file mode 100644 index 0000000000000..d3177cc88d4cd --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/pond/deps.nix @@ -0,0 +1,43 @@ +{ fetchgit }: +[ + { + goPackagePath = "golang.org/x/crypto"; + src = fetchgit { + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/agl/ed25519"; + src = fetchgit { + url = "https://github.com/agl/ed25519"; + rev = "278e1ec8e8a6e017cd07577924d6766039146ced"; + sha256 = "165d89cc6dl28j4hkn86pny0jz3sa6hamzdvpvwdj4iha3x6lzc9"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + src = fetchgit { + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "golang.org/x/net"; + src = fetchgit { + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } + { + goPackagePath = "github.com/agl/go-gtk"; + src = fetchgit { + url = "https://github.com/agl/go-gtk"; + rev = "91c1edb38c241d73129e6b098ca1c9fa83abfc15"; + sha256 = "156ixlhakpqgyp35rsvmndrqz8aggv5bcmzg9ynpri3b9j6kim4d"; + }; + } +] diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix index de8d0c19b4f80..222349d5bebc0 100644 --- a/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix +++ b/pkgs/applications/networking/instant-messengers/xmpp-client/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchgit }: buildGoPackage rec { name = "xmpp-client-${version}"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "0a1r08zs723ikcskmn6ylkdi3frcd0i0lkx30i9q39ilf734v253"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; meta = with stdenv.lib; { description = "An XMPP client with OTR support"; diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/deps.json b/pkgs/applications/networking/instant-messengers/xmpp-client/deps.json deleted file mode 100644 index a5fd7fc3aa7c9..0000000000000 --- a/pkgs/applications/networking/instant-messengers/xmpp-client/deps.json +++ /dev/null @@ -1,9 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "golang.org/x/crypto", - "golang.org/x/net" - ] - } -] diff --git a/pkgs/applications/networking/instant-messengers/xmpp-client/deps.nix b/pkgs/applications/networking/instant-messengers/xmpp-client/deps.nix new file mode 100644 index 0000000000000..484f4c31c728f --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/xmpp-client/deps.nix @@ -0,0 +1,19 @@ +{ fetchgit }: +[ + { + goPackagePath = "golang.org/x/crypto"; + src = fetchgit { + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "golang.org/x/net"; + src = fetchgit { + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } +] diff --git a/pkgs/applications/networking/syncthing012/default.nix b/pkgs/applications/networking/syncthing012/default.nix index 9f436d21bc3d5..84dbc2abe5742 100644 --- a/pkgs/applications/networking/syncthing012/default.nix +++ b/pkgs/applications/networking/syncthing012/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchgit }: buildGoPackage rec { name = "syncthing-${version}"; @@ -16,7 +16,7 @@ buildGoPackage rec { sha256 = "0g4sj509h45iq6g7b0pl88rbbn7c7s01774yjc6bl376x1xrl6a1"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; postPatch = '' # Mostly a cosmetic change diff --git a/pkgs/applications/networking/syncthing012/deps.json b/pkgs/applications/networking/syncthing012/deps.json deleted file mode 100644 index 75e10397017a0..0000000000000 --- a/pkgs/applications/networking/syncthing012/deps.json +++ /dev/null @@ -1,21 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/bkaradzic/go-lz4", - "github.com/calmh/luhn", - "golang.org/x/text", - "github.com/kardianos/osext", - "github.com/vitrun/qart", - "github.com/calmh/du", - "github.com/calmh/xdr", - "github.com/juju/ratelimit", - "github.com/thejerf/suture", - "github.com/golang/snappy", - "github.com/rcrowley/go-metrics", - "github.com/syndtr/goleveldb", - "golang.org/x/crypto", - "golang.org/x/net" - ] - } -] diff --git a/pkgs/applications/networking/syncthing012/deps.nix b/pkgs/applications/networking/syncthing012/deps.nix new file mode 100644 index 0000000000000..66c10daf5a244 --- /dev/null +++ b/pkgs/applications/networking/syncthing012/deps.nix @@ -0,0 +1,115 @@ +{ fetchgit }: +[ + { + goPackagePath = "golang.org/x/crypto"; + src = fetchgit { + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "golang.org/x/net"; + src = fetchgit { + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } + { + goPackagePath = "github.com/rcrowley/go-metrics"; + src = fetchgit { + url = "https://github.com/rcrowley/go-metrics"; + rev = "1ce93efbc8f9c568886b2ef85ce305b2217b3de3"; + sha256 = "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + src = fetchgit { + url = "https://github.com/kardianos/osext"; + rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc"; + sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"; + }; + } + { + goPackagePath = "github.com/bkaradzic/go-lz4"; + src = fetchgit { + url = "https://github.com/bkaradzic/go-lz4"; + rev = "74ddf82598bc4745b965729e9c6a463bedd33049"; + sha256 = "1vdid8v0c2v2qhrg9rzn3l7ya1h34jirrxfnir7gv7w6s4ivdvc1"; + }; + } + { + goPackagePath = "github.com/calmh/luhn"; + src = fetchgit { + url = "https://github.com/calmh/luhn"; + rev = "0c8388ff95fa92d4094011e5a04fc99dea3d1632"; + sha256 = "1hfj1lx7wdpifn16zqrl4xml6cj5gxbn6hfz1f46g2a6bdf0gcvs"; + }; + } + { + goPackagePath = "golang.org/x/text"; + src = fetchgit { + url = "https://go.googlesource.com/text"; + rev = "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e"; + sha256 = "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14"; + }; + } + { + goPackagePath = "github.com/vitrun/qart"; + src = fetchgit { + url = "https://github.com/vitrun/qart"; + rev = "ccb109cf25f0cd24474da73b9fee4e7a3e8a8ce0"; + sha256 = "0bhp768b8ha6f25dmhwn9q8m2lkbn4qnjf8n7pizk25jn5zjdvc8"; + }; + } + { + goPackagePath = "github.com/calmh/du"; + src = fetchgit { + url = "https://github.com/calmh/du"; + rev = "3c0690cca16228b97741327b1b6781397afbdb24"; + sha256 = "1mv6mkbslfc8giv47kyl97ny0igb3l7jya5hc75sm54xi6g205wa"; + }; + } + { + goPackagePath = "github.com/calmh/xdr"; + src = fetchgit { + url = "https://github.com/calmh/xdr"; + rev = "e467b5aeb65ca8516fb3925c84991bf1d7cc935e"; + sha256 = "1bi4b2xkjzcr0vq1wxz14i9943k71sj092dam0gdmr9yvdrg0nra"; + }; + } + { + goPackagePath = "github.com/juju/ratelimit"; + src = fetchgit { + url = "https://github.com/juju/ratelimit"; + rev = "772f5c38e468398c4511514f4f6aa9a4185bc0a0"; + sha256 = "02rs61ay6sq499lxxszjsrxp33m6zklds1xrmnr5fk73vpqfa28p"; + }; + } + { + goPackagePath = "github.com/thejerf/suture"; + src = fetchgit { + url = "https://github.com/thejerf/suture"; + rev = "99c1f2d613756768fc4299acd9dc621e11ed3fd7"; + sha256 = "094ksr2nlxhvxr58nbnzzk0prjskb21r86jmxqjr3rwg4rkwn6d4"; + }; + } + { + goPackagePath = "github.com/golang/snappy"; + src = fetchgit { + url = "https://github.com/golang/snappy"; + rev = "723cc1e459b8eea2dea4583200fd60757d40097a"; + sha256 = "0bprq0qb46f5511b5scrdqqzskqqi2z8b4yh3216rv0n1crx536h"; + }; + } + { + goPackagePath = "github.com/syndtr/goleveldb"; + src = fetchgit { + url = "https://github.com/syndtr/goleveldb"; + rev = "1a9d62f03ea92815b46fcaab357cfd4df264b1a0"; + sha256 = "04ywbif36fiah4fw0x2abr5q3p4fdhi6q57d5icc2mz03q889vhb"; + }; + } +] diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix index 4ede1b352ea6e..6a40e13a591fc 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchgit }: buildGoPackage rec { name = "git-annex-remote-b2-${version}"; @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "1139rzdvlj3hanqsccfinprvrzf4qjc5n4f0r21jp9j24yhjs6j2"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; } diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.json b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.json deleted file mode 100644 index b04422768a5fe..0000000000000 --- a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.json +++ /dev/null @@ -1,9 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/pquerna/ffjson", - "gopkg.in/kothar/go-backblaze.v0" - ] - } -] diff --git a/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix new file mode 100644 index 0000000000000..1573b62f6c18f --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-annex-remote-b2/deps.nix @@ -0,0 +1,19 @@ +{ fetchgit }: +[ + { + goPackagePath = "github.com/pquerna/ffjson"; + src = fetchgit { + url = "https://github.com/pquerna/ffjson"; + rev = "674bc015b5b3f50f9bb2561179778586b9af68c5"; + sha256 = "0l53q7b1g25hfjm1iyynfs413rpav4c51yvdr244ivw1x3hksa7a"; + }; + } + { + goPackagePath = "gopkg.in/kothar/go-backblaze.v0"; + src = fetchgit { + url = "https://gopkg.in/kothar/go-backblaze.v0"; + rev = "373819725fc560fa962c6cd883b533d2ebec4844"; + sha256 = "1kmlwfnnfd4h46bb9pz2gw1hxqm1pzkwvidfmnc0zkrilaywk6fx"; + }; + } +] diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index e6373c1d50ecb..c3eacd9b5d81e 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -41,34 +41,12 @@ let | sed "s,${ref},$(echo "${ref}" | sed "s,$NIX_STORE/[^-]*,$NIX_STORE/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee,"),g" \ ''); - dep2src = goDep: - { - inherit (goDep) goPackagePath; - src = if goDep.fetch.type == "git" then - fetchgit { - inherit (goDep.fetch) url rev sha256; - } - else if goDep.fetch.type == "hg" then - fetchhg { - inherit (goDep.fetch) url rev sha256; - } - else abort "Unrecognized package fetch type"; - }; - - importGodeps = { depsFile, filterPackages ? [] }: - let - deps = lib.importJSON depsFile; - external = filter (d: d ? include) deps; - direct = filter (d: d ? goPackagePath && (length filterPackages == 0 || elem d.goPackagePath filterPackages)) deps; - in - concatLists (map importGodeps (map (d: { depsFile = ./. + d.include; filterPackages = d.packages; }) external)) ++ (map dep2src direct); - - goPath = if goDeps != null then importGodeps { depsFile = goDeps; } ++ extraSrcs - else extraSrcs; + goPath = if goDeps != null then goDeps ++ extraSrcs + else extraSrcs; in go.stdenv.mkDerivation ( - (builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // { + (builtins.removeAttrs args [ "goPackageAliases" "disabled" "goDeps" ]) // { name = "go${go.meta.branch}-${name}"; nativeBuildInputs = [ go parallel ] @@ -185,6 +163,16 @@ go.stdenv.mkDerivation ( done < <(find $bin/bin -type f 2>/dev/null) ''; + shellHook = '' + d=$(mktemp -d "--suffix=-$name") + '' + toString (map (dep: '' + mkdir -p "$d/src/$(dirname "${dep.goPackagePath}")" + ln -s "${dep.src}" "$d/src/${dep.goPackagePath}" + '' + ) goPath) + '' + export GOPATH="$d:$GOPATH" + ''; + disallowedReferences = lib.optional (!allowGoReference) go ++ lib.optional (!dontRenameImports) govers; diff --git a/pkgs/development/go-modules/libs.json b/pkgs/development/go-modules/libs.json deleted file mode 100644 index 9e1b436913694..0000000000000 --- a/pkgs/development/go-modules/libs.json +++ /dev/null @@ -1,1820 +0,0 @@ -[ - { - "goPackagePath": "github.com/elves/getopt", - "fetch": { - "type": "git", - "url": "https://github.com/elves/getopt", - "rev": "f91a7bf920995832d55a1182f26657bc975b9c24", - "sha256": "0wz5dz0iq1b1c2w30mmcgll9xidsrnlvs2906jw9szy0h67310za" - } - }, - { - "goPackagePath": "golang.org/x/sys", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/sys", - "rev": "d9157a9621b69ad1d8d77a1933590c416593f24f", - "sha256": "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931" - } - }, - { - "goPackagePath": "gopkg.in/fsnotify.v1", - "fetch": { - "type": "git", - "url": "https://gopkg.in/fsnotify.v1", - "rev": "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0", - "sha256": "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2" - } - }, - { - "goPackagePath": "gopkg.in/yaml.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/yaml.v2", - "rev": "a83829b6f1293c91addabc89d0571c246397bbf4", - "sha256": "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh" - } - }, - { - "goPackagePath": "github.com/docopt/docopt-go", - "fetch": { - "type": "git", - "url": "https://github.com/docopt/docopt-go", - "rev": "784ddc588536785e7299f7272f39101f7faccc3f", - "sha256": "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "github.com/Sirupsen/logrus", - "fetch": { - "type": "git", - "url": "https://github.com/Sirupsen/logrus", - "rev": "be52937128b38f1d99787bb476c789e2af1147f1", - "sha256": "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4" - } - }, - { - "goPackagePath": "github.com/agl/ed25519", - "fetch": { - "type": "git", - "url": "https://github.com/agl/ed25519", - "rev": "278e1ec8e8a6e017cd07577924d6766039146ced", - "sha256": "165d89cc6dl28j4hkn86pny0jz3sa6hamzdvpvwdj4iha3x6lzc9" - } - }, - { - "goPackagePath": "github.com/golang/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/golang/protobuf", - "rev": "59b73b37c1e45995477aae817e4a653c89a858db", - "sha256": "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa" - } - }, - { - "goPackagePath": "github.com/janimo/textsecure", - "fetch": { - "type": "git", - "url": "https://github.com/janimo/textsecure", - "rev": "c38f429e48d6b2776d17b4171f216f132185b0f6", - "sha256": "191pwgfgphr0x04dwpvniax4wilpv52l25bw7d3igvnw302y7i94" - } - }, - { - "goPackagePath": "golang.org/x/net", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/net", - "rev": "62ac18b461605b4be188bbc7300e9aa2bc836cd4", - "sha256": "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p" - } - }, - { - "goPackagePath": "github.com/howeyc/gopass", - "fetch": { - "type": "git", - "url": "https://github.com/howeyc/gopass", - "rev": "2c70fa70727c953c51695f800f25d6b44abb368e", - "sha256": "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8" - } - }, - { - "goPackagePath": "gopkg.in/mgo.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/mgo.v2", - "rev": "c6a7dce14133ccac2dcac3793f1d6e2ef048503a", - "sha256": "0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj" - } - }, - { - "goPackagePath": "gopkg.in/tomb.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/tomb.v2", - "rev": "14b3d72120e8d10ea6e6b7f87f7175734b1faab8", - "sha256": "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5" - } - }, - { - "goPackagePath": "github.com/hanwen/go-fuse", - "fetch": { - "type": "git", - "url": "https://github.com/hanwen/go-fuse", - "rev": "bd746dd8bcc8c059a9d953a786a6156eb83f398e", - "sha256": "1dvvclp418j3d02v9717sfqhl6fw6yyddr9r3j8gsiv8nb62ib56" - } - }, - { - "goPackagePath": "github.com/cpucycle/astrotime", - "fetch": { - "type": "git", - "url": "https://github.com/cpucycle/astrotime", - "rev": "9c7d514efdb561775030eaf8f1a9ae6bddb3a2ca", - "sha256": "024sc7g55v4s54irssm5wsn74sr2k2ynsm6z16w47q66cxhgvby1" - } - }, - { - "goPackagePath": "github.com/godbus/dbus", - "fetch": { - "type": "git", - "url": "https://github.com/godbus/dbus", - "rev": "32c6cc29c14570de4cf6d7e7737d68fb2d01ad15", - "sha256": "0v401f761l88yapiaw23pxvxviqrwl2r2vfd6lq02044i7x4i5r3" - } - }, - { - "goPackagePath": "github.com/gorilla/websocket", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/websocket", - "rev": "a622679ebd7a3b813862379232f645f8e690e43f", - "sha256": "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q" - } - }, - { - "goPackagePath": "github.com/syndtr/gocapability", - "fetch": { - "type": "git", - "url": "https://github.com/syndtr/gocapability", - "rev": "2c00daeb6c3b45114c80ac44119e7b8801fdd852", - "sha256": "1x7jdcg2r5pakjf20q7bdiidfmv7vcjiyg682186rkp2wz0yws0l" - } - }, - { - "goPackagePath": "gopkg.in/inconshreveable/log15.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/inconshreveable/log15.v2", - "rev": "b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f", - "sha256": "18rldvi60i7b3lljfrsqgcc24gdkw2pcixxydznyggaqhh96l6a8" - } - }, - { - "goPackagePath": "github.com/gorilla/mux", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/mux", - "rev": "8096f47503459bcc74d1f4c487b7e6e42e5746b5", - "sha256": "0163fm9jsh54df471mx9kfhdg0070klqhw9ja0qwdzqibxq791b9" - } - }, - { - "goPackagePath": "github.com/pborman/uuid", - "fetch": { - "type": "git", - "url": "https://github.com/pborman/uuid", - "rev": "ca53cad383cad2479bbba7f7a1a05797ec1386e4", - "sha256": "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn" - } - }, - { - "goPackagePath": "gopkg.in/flosch/pongo2.v3", - "fetch": { - "type": "git", - "url": "https://gopkg.in/flosch/pongo2.v3", - "rev": "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9", - "sha256": "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8" - } - }, - { - "goPackagePath": "github.com/olekukonko/tablewriter", - "fetch": { - "type": "git", - "url": "https://github.com/olekukonko/tablewriter", - "rev": "cca8bbc0798408af109aaaa239cbd2634846b340", - "sha256": "0f9ph3z7lh6p6gihbl1461j9yq5qiaqxr9mzdkp512n18v89ml48" - } - }, - { - "goPackagePath": "github.com/mattn/go-sqlite3", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-sqlite3", - "rev": "b4142c444a8941d0d92b0b7103a24df9cd815e42", - "sha256": "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla" - } - }, - { - "goPackagePath": "gopkg.in/lxc/go-lxc.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/lxc/go-lxc.v2", - "rev": "8f9e220b36393c03854c2d224c5a55644b13e205", - "sha256": "1dc1n2561k3pxbm2zzh3qwlh30bcb2k9v22ghvr7ps2j9lmhs0ip" - } - }, - { - "goPackagePath": "github.com/mattn/go-runewidth", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-runewidth", - "rev": "d6bea18f789704b5f83375793155289da36a3c7f", - "sha256": "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs" - } - }, - { - "goPackagePath": "github.com/coreos/go-systemd", - "fetch": { - "type": "git", - "url": "https://github.com/coreos/go-systemd", - "rev": "a606a1e936df81b70d85448221c7b1c6d8a74ef1", - "sha256": "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28" - } - }, - { - "goPackagePath": "github.com/dustinkirkland/golang-petname", - "fetch": { - "type": "git", - "url": "https://github.com/dustinkirkland/golang-petname", - "rev": "2182cecef7f257230fc998bc351a08a5505f5e6c", - "sha256": "1xagj34y5rxl7rykhil8iqxlls9rbgcxgdvgfp7kg39pinw83arl" - } - }, - { - "goPackagePath": "github.com/gorilla/context", - "fetch": { - "type": "git", - "url": "https://github.com/gorilla/context", - "rev": "215affda49addc4c8ef7e2534915df2c8c35c6cd", - "sha256": "1ybvjknncyx1f112mv28870n0l7yrymsr0861vzw10gc4yn1h97g" - } - }, - { - "goPackagePath": "github.com/mattn/go-colorable", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-colorable", - "rev": "3dac7b4f76f6e17fb39b768b89e3783d16e237fe", - "sha256": "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6" - } - }, - { - "goPackagePath": "github.com/gosexy/gettext", - "fetch": { - "type": "git", - "url": "https://github.com/gosexy/gettext", - "rev": "305f360aee30243660f32600b87c3c1eaa947187", - "sha256": "0sm7ziv56ms0lrk30ipbl6i17azar3a44dd2xvr011442zs5ym09" - } - }, - { - "goPackagePath": "github.com/rcrowley/go-metrics", - "fetch": { - "type": "git", - "url": "https://github.com/rcrowley/go-metrics", - "rev": "1ce93efbc8f9c568886b2ef85ce305b2217b3de3", - "sha256": "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa" - } - }, - { - "goPackagePath": "github.com/inconshreveable/go-vhost", - "fetch": { - "type": "git", - "url": "https://github.com/inconshreveable/go-vhost", - "rev": "c4c28117502e4bf00960c8282b2d1c51c865fe2c", - "sha256": "1rway6sls6fl2s2jk20ajj36rrlzh9944ncc9pdd19kifix54z32" - } - }, - { - "goPackagePath": "code.google.com/p/log4go", - "fetch": { - "type": "git", - "url": "https://github.com/ccpaging/log4go", - "rev": "cb4cc51cd03958183d3b637d0750497d88c2f7a8", - "sha256": "0l9f86zzhla9hq35q4xhgs837283qrm4gxbp5lrwwls54ifiq7k2" - } - }, - { - "goPackagePath": "github.com/daviddengcn/go-colortext", - "fetch": { - "type": "git", - "url": "https://github.com/daviddengcn/go-colortext", - "rev": "13eaeb896f5985a1ab74ddea58707a73d875ba57", - "sha256": "0618xs9lc5xfp5zkkb5j47dr7i30ps3zj5fj0zpv8afqh2cc689x" - } - }, - { - "goPackagePath": "gopkg.in/yaml.v1", - "fetch": { - "type": "git", - "url": "https://github.com/go-yaml/yaml", - "rev": "b0c168ac0cf9493da1f9bb76c34b26ffef940b4a", - "sha256": "0jbdy41pplf2d1j24qwr8gc5qsig6ai5ch8rwgvg72kq9q0901cy" - } - }, - { - "goPackagePath": "github.com/inconshreveable/mousetrap", - "fetch": { - "type": "git", - "url": "https://github.com/inconshreveable/mousetrap", - "rev": "9dbb96d2c3a964935b0870b5abaea13c98b483aa", - "sha256": "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b" - } - }, - { - "goPackagePath": "github.com/nsf/termbox-go", - "fetch": { - "type": "git", - "url": "https://github.com/nsf/termbox-go", - "rev": "9aecf65084a5754f12d27508fa2e6ed56851953b", - "sha256": "16sak07bgvmax4zxfrd4jia1dgygk733xa8vk8cdx28z98awbfsh" - } - }, - { - "goPackagePath": "gopkg.in/inconshreveable/go-update.v0", - "fetch": { - "type": "git", - "url": "https://github.com/inconshreveable/go-update", - "rev": "d8b0b1d421aa1cbf392c05869f8abbc669bb7066", - "sha256": "0cvkik2w368fzimx3y29ncfgw7004qkbdf2n3jy5czvzn35q7dpa" - } - }, - { - "goPackagePath": "github.com/kardianos/osext", - "fetch": { - "type": "git", - "url": "https://github.com/kardianos/osext", - "rev": "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc", - "sha256": "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a" - } - }, - { - "goPackagePath": "github.com/kr/binarydist", - "fetch": { - "type": "git", - "url": "https://github.com/kr/binarydist", - "rev": "9955b0ab8708602d411341e55fffd7e0700f86bd", - "sha256": "11wncbbbrdcxl5ff3h6w8vqfg4bxsf8709mh6vda0cv236flkyn3" - } - }, - { - "goPackagePath": "github.com/jessevdk/go-flags", - "fetch": { - "type": "git", - "url": "https://github.com/jessevdk/go-flags", - "rev": "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539", - "sha256": "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680" - } - }, - { - "goPackagePath": "github.com/prometheus/client_model", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_model", - "rev": "fa8ad6fec33561be4280a8f0514318c79d7f6cb6", - "sha256": "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9" - } - }, - { - "goPackagePath": "github.com/prometheus/common", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/common", - "rev": "40456948a47496dc22168e6af39297a2f8fbf38c", - "sha256": "15700w18pifng0l2isa6v25y91r5rb7yfgljqw2g2gqrvac6sr5l" - } - }, - { - "goPackagePath": "github.com/beorn7/perks", - "fetch": { - "type": "git", - "url": "https://github.com/beorn7/perks", - "rev": "b965b613227fddccbfffe13eae360ed3fa822f8d", - "sha256": "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk" - } - }, - { - "goPackagePath": "github.com/coreos/go-etcd", - "fetch": { - "type": "git", - "url": "https://github.com/coreos/go-etcd", - "rev": "9847b93751a5fbaf227b893d172cee0104ac6427", - "sha256": "1ihq01ayqzxvn6hca5j00vl189vi5lm78f0fy2wpk5mrm3xi01l4" - } - }, - { - "goPackagePath": "github.com/matttproud/golang_protobuf_extensions", - "fetch": { - "type": "git", - "url": "https://github.com/matttproud/golang_protobuf_extensions", - "rev": "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a", - "sha256": "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj" - } - }, - { - "goPackagePath": "github.com/prometheus/client_golang", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/client_golang", - "rev": "6dbab8106ed3ed77359ac85d9cf08e30290df864", - "sha256": "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna" - } - }, - { - "goPackagePath": "github.com/stathat/go", - "fetch": { - "type": "git", - "url": "https://github.com/stathat/go", - "rev": "91dfa3a59c5b233fef9a346a1460f6e2bc889d93", - "sha256": "105ql5v8r4hqcsq0ag7asdxqg9n7rvf83y1q1dj2nfjyn4manv6r" - } - }, - { - "goPackagePath": "github.com/ugorji/go", - "fetch": { - "type": "git", - "url": "https://github.com/ugorji/go", - "rev": "03e33114d4d60a1f37150325e15f51b0fa6fc4f6", - "sha256": "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v" - } - }, - { - "goPackagePath": "github.com/miekg/dns", - "fetch": { - "type": "git", - "url": "https://github.com/miekg/dns", - "rev": "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa", - "sha256": "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl" - } - }, - { - "goPackagePath": "github.com/prometheus/procfs", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/procfs", - "rev": "c91d8eefde16bd047416409eb56353ea84a186e4", - "sha256": "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r" - } - }, - { - "goPackagePath": "github.com/schachmat/ingo", - "fetch": { - "type": "git", - "url": "https://github.com/schachmat/ingo", - "rev": "fab41e4e62cbef5d92998746ec25f7e195100f38", - "sha256": "04yfnch7pdabjjqfl2qxjmsaknvp4m1rbjlv8qrpmnqwjkxzx0hb" - } - }, - { - "goPackagePath": "github.com/michaelmacinnis/adapted", - "fetch": { - "type": "git", - "url": "https://github.com/michaelmacinnis/adapted", - "rev": "0dd5fa34d6f9d74c7c0deed1fc224f9a87e02978", - "sha256": "16n3a87m33pqx4qih713q3gw2j6ksj1q3ngjax6bpn5b11rqvikv" - } - }, - { - "goPackagePath": "github.com/peterh/liner", - "fetch": { - "type": "git", - "url": "https://github.com/peterh/liner", - "rev": "ad1edfd30321d8f006ccf05f1e0524adeb943060", - "sha256": "0c24d9j1gnq7r982h1l2isp3d37379qw155hr8ihx9i2mhpfz317" - } - }, - { - "goPackagePath": "github.com/mitchellh/iochan", - "fetch": { - "type": "git", - "url": "https://github.com/mitchellh/iochan", - "rev": "b584a329b193e206025682ae6c10cdbe03b0cd77", - "sha256": "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b" - } - }, - { - "goPackagePath": "github.com/gogo/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/gogo/protobuf", - "rev": "7883e1468d48d969e1c3ce4bcde89b6a7dd4adc4", - "sha256": "16ja7lqq96q0pnzgnbwnh0j8qzvqgns1nfk8ndxgkg4sg93bg372" - } - }, - { - "goPackagePath": "github.com/golang/glog", - "fetch": { - "type": "git", - "url": "https://github.com/golang/glog", - "rev": "fca8c8854093a154ff1eb580aae10276ad6b1b5f", - "sha256": "1nr2q0vas0a2f395f4shjxqpas18mjsf8yhgndsav7svngpbbpg8" - } - }, - { - "goPackagePath": "github.com/mesos/mesos-go", - "fetch": { - "type": "git", - "url": "https://github.com/mesos/mesos-go", - "rev": "aaa5b2fecf0e2db463f4f996c89617d6766b2969", - "sha256": "1pk1fpxksjln6kqvgm1igw3582jgrn14fwa8bdj5cwbpy6skjdvk" - } - }, - { - "goPackagePath": "github.com/pmezard/go-difflib", - "fetch": { - "type": "git", - "url": "https://github.com/pmezard/go-difflib", - "rev": "d8ed2627bdf02c080bf22230dbb337003b7aba2d", - "sha256": "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs" - } - }, - { - "goPackagePath": "github.com/samuel/go-zookeeper", - "fetch": { - "type": "git", - "url": "https://github.com/samuel/go-zookeeper", - "rev": "5bb5cfc093ad18a28148c578f8632cfdb4d802e4", - "sha256": "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z" - } - }, - { - "goPackagePath": "github.com/stretchr/objx", - "fetch": { - "type": "git", - "url": "https://github.com/stretchr/objx", - "rev": "cbeaeb16a013161a98496fad62933b1d21786672", - "sha256": "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1" - } - }, - { - "goPackagePath": "github.com/davecgh/go-spew", - "fetch": { - "type": "git", - "url": "https://github.com/davecgh/go-spew", - "rev": "5215b55f46b2b919f50a1df0eaa5886afe4e3b3d", - "sha256": "15h9kl73rdbzlfmsdxp13jja5gs7sknvqkpq2qizq3qv3nr1x8dk" - } - }, - { - "goPackagePath": "github.com/emicklei/go-restful", - "fetch": { - "type": "git", - "url": "https://github.com/emicklei/go-restful", - "rev": "892402ba11a2e2fd5e1295dd633481f27365f14d", - "sha256": "0gr9f53vayc6501a1kaw4p3h9pgf376cgxsfnr3f2dvp0xacvw8x" - } - }, - { - "goPackagePath": "github.com/stretchr/testify", - "fetch": { - "type": "git", - "url": "https://github.com/stretchr/testify", - "rev": "089c7181b8c728499929ff09b62d3fdd8df8adff", - "sha256": "03dzxkxbs298pvfsjz4kdadfaf9jkzsdhshqmg4p12wbyaj09s4p" - } - }, - { - "goPackagePath": "github.com/kr/pty", - "fetch": { - "type": "git", - "url": "https://github.com/kr/pty", - "rev": "67e2db24c831afa6c64fc17b4a143390674365ef", - "sha256": "1l3z3wbb112ar9br44m8g838z0pq2gfxcp5s3ka0xvm1hjvanw2d" - } - }, - { - "goPackagePath": "github.com/braintree/manners", - "fetch": { - "type": "git", - "url": "https://github.com/braintree/manners", - "rev": "cab36f97339b1925cd89e158632728025557e550", - "sha256": "1q508c62iiklghkhwqz9c0zsn9hrij7kqb93gdywzj7ms7x6hlfh" - } - }, - { - "goPackagePath": "github.com/codegangsta/cli", - "fetch": { - "type": "git", - "url": "https://github.com/codegangsta/cli", - "rev": "71f57d300dd6a780ac1856c005c4b518cfd498ec", - "sha256": "1fxznirkvank5461789dm5aw5z8aqi0jvwligvz44659rfl376p3" - } - }, - { - "goPackagePath": "github.com/elazarl/go-bindata-assetfs", - "fetch": { - "type": "git", - "url": "https://github.com/elazarl/go-bindata-assetfs", - "rev": "d5cac425555ca5cf00694df246e04f05e6a55150", - "sha256": "636ce247ff6f85c14f38a421f46662fa77bdc29762692e1f72b3cd1f9d7a1d17" - } - }, - { - "goPackagePath": "github.com/fatih/structs", - "fetch": { - "type": "git", - "url": "https://github.com/fatih/structs", - "rev": "a9f7daa9c2729e97450c2da2feda19130a367d8f", - "sha256": "0pyrc7svc826g37al3db19n5l4r2m9h1mlhjh3hz2r41xfaqia50" - } - }, - { - "goPackagePath": "github.com/hashicorp/hcl", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/hcl", - "rev": "54864211433d45cb780682431585b3e573b49e4a", - "sha256": "07l2dydzjpdgm2d4a72hkmincn455j3nrafg6hs3c23bkvizj950" - } - }, - { - "goPackagePath": "github.com/hashicorp/go-multierror", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/go-multierror", - "rev": "56912fb08d85084aa318edcf2bba735b97cf35c5", - "sha256": "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r" - } - }, - { - "goPackagePath": "github.com/mreiferson/go-snappystream", - "fetch": { - "type": "git", - "url": "https://github.com/mreiferson/go-snappystream", - "rev": "028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504", - "sha256": "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6" - } - }, - { - "goPackagePath": "github.com/bitly/go-nsq", - "fetch": { - "type": "git", - "url": "https://github.com/bitly/go-nsq", - "rev": "22a8bd48c443ec23bb559675b6df8284bbbdab29", - "sha256": "06hrkwk84w8rshkanvfgmgbiml7n06ybv192dvibhwgk2wz2dl46" - } - }, - { - "goPackagePath": "github.com/bitly/go-simplejson", - "fetch": { - "type": "git", - "url": "https://github.com/bitly/go-simplejson", - "rev": "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a", - "sha256": "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy" - } - }, - { - "goPackagePath": "github.com/blang/semver", - "fetch": { - "type": "git", - "url": "https://github.com/blang/semver", - "rev": "9bf7bff48b0388cb75991e58c6df7d13e982f1f2", - "sha256": "11sinbf942dpyc9wdpidkhmqn438cfp5n8x3xqnmq9aszkld9hy7" - } - }, - { - "goPackagePath": "github.com/bmizerany/perks", - "fetch": { - "type": "git", - "url": "https://github.com/bmizerany/perks", - "rev": "6cb9d9d729303ee2628580d9aec5db968da3a607", - "sha256": "0cdh84hmn21is6hvv6dy9qjdcg9w3l2k8avlk0881a8cqm09s90j" - } - }, - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml", - "rev": "056c9bc7be7190eaa7715723883caffa5f8fa3e4", - "sha256": "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw" - } - }, - { - "goPackagePath": "github.com/bitly/go-hostpool", - "fetch": { - "type": "git", - "url": "https://github.com/bitly/go-hostpool", - "rev": "d0e59c22a56e8dadfed24f74f452cea5a52722d2", - "sha256": "14ph12krn5zlg00vh9g6g08lkfjxnpw46nzadrfb718yl1hgyk3g" - } - }, - { - "goPackagePath": "github.com/bitly/timer_metrics", - "fetch": { - "type": "git", - "url": "https://github.com/bitly/timer_metrics", - "rev": "afad1794bb13e2a094720aeb27c088aa64564895", - "sha256": "1b717vkwj63qb5kan4b92kx4rg6253l5mdb3lxpxrspy56a6rl0c" - } - }, - { - "goPackagePath": "github.com/mreiferson/go-options", - "fetch": { - "type": "git", - "url": "https://github.com/mreiferson/go-options", - "rev": "7c174072188d0cfbe6f01bb457626abb22bdff52", - "sha256": "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm" - } - }, - { - "goPackagePath": "google.golang.org/api", - "fetch": { - "type": "git", - "url": "https://code.googlesource.com/google-api-go-client", - "rev": "a5c3e2a4792aff40e59840d9ecdff0542a202a80", - "sha256": "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8" - } - }, - { - "goPackagePath": "google.golang.org/cloud", - "fetch": { - "type": "git", - "url": "https://code.googlesource.com/gocloud", - "rev": "6335269abf9002cf5a84613c13cda6010842b834", - "sha256": "15xrqxna5ms0r634k3bfzyymn431dvqcjwbsap8ay60x371kzbwf" - } - }, - { - "goPackagePath": "golang.org/x/oauth2", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/oauth2", - "rev": "397fe7649477ff2e8ced8fc0b2696f781e53745a", - "sha256": "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8" - } - }, - { - "goPackagePath": "github.com/18F/hmacauth", - "fetch": { - "type": "git", - "url": "https://github.com/18F/hmacauth", - "rev": "9232a6386b737d7d1e5c1c6e817aa48d5d8ee7cd", - "sha256": "056mcqrf2bv0g9gn2ixv19srk613h4sasl99w9375mpvmadb3pz1" - } - }, - { - "goPackagePath": "github.com/armon/go-metrics", - "fetch": { - "type": "git", - "url": "https://github.com/armon/go-metrics", - "rev": "b2d95e5291cdbc26997d1301a5e467ecbb240e25", - "sha256": "1jvdf98jlbyzbb9w159nifvv8fihrcs66drnl8pilqdjpmkmyyck" - } - }, - { - "goPackagePath": "github.com/mattn/go-isatty", - "fetch": { - "type": "git", - "url": "https://github.com/mattn/go-isatty", - "rev": "ae0b1f8f8004be68d791a576e3d8e7648ab41449", - "sha256": "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj" - } - }, - { - "goPackagePath": "github.com/hashicorp/logutils", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/logutils", - "rev": "0dc08b1671f34c4250ce212759ebd880f743d883", - "sha256": "0rynhjwvacv9ibl2k4fwz0xy71d583ac4p33gm20k9yldqnznc7r" - } - }, - { - "goPackagePath": "github.com/armon/go-radix", - "fetch": { - "type": "git", - "url": "https://github.com/armon/go-radix", - "rev": "fbd82e84e2b13651f3abc5ffd26b65ba71bc8f93", - "sha256": "16y64r1v054c2ln0bi5mrqq1cmvy6d6pnxk1glb8lw2g31ksa80c" - } - }, - { - "goPackagePath": "github.com/hashicorp/go-syslog", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/go-syslog", - "rev": "42a2b573b664dbf281bd48c3cc12c086b17a39ba", - "sha256": "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3" - } - }, - { - "goPackagePath": "github.com/hashicorp/memberlist", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/memberlist", - "rev": "6025015f2dc659ca2c735112d37e753bda6e329d", - "sha256": "01s2gwnbgvwz4wshz9d4za0p12ji4fnapnlmz3jwfcmcwjpyqfb7" - } - }, - { - "goPackagePath": "github.com/mitchellh/mapstructure", - "fetch": { - "type": "git", - "url": "https://github.com/mitchellh/mapstructure", - "rev": "281073eb9eb092240d33ef253c404f1cca550309", - "sha256": "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh" - } - }, - { - "goPackagePath": "github.com/armon/circbuf", - "fetch": { - "type": "git", - "url": "https://github.com/armon/circbuf", - "rev": "f092b4f207b6e5cce0569056fba9e1a2735cb6cf", - "sha256": "06kwwdwa3hskdh6ws7clj1vim80dyc3ldim8k9y5qpd30x0avn5s" - } - }, - { - "goPackagePath": "github.com/hashicorp/mdns", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/mdns", - "rev": "2b439d37011456df8ff83a70ffd1cd6046410113", - "sha256": "17zwk212zmyramnjylpvvrvbbsz0qb5crkhly6yiqkyll3qzpb96" - } - }, - { - "goPackagePath": "github.com/mitchellh/cli", - "fetch": { - "type": "git", - "url": "https://github.com/mitchellh/cli", - "rev": "8102d0ed5ea2709ade1243798785888175f6e415", - "sha256": "08mj1l94pww72jy34gk9a483hpic0rrackskfw13r3ycy997w7m2" - } - }, - { - "goPackagePath": "github.com/ryanuber/columnize", - "fetch": { - "type": "git", - "url": "https://github.com/ryanuber/columnize", - "rev": "44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a", - "sha256": "1qrqr76cw58x2hkjic6h88na5ihgvkmp8mqapj8kmjcjzdxkzhr9" - } - }, - { - "goPackagePath": "github.com/hashicorp/go-msgpack", - "fetch": { - "type": "git", - "url": "https://github.com/ugorji/go", - "rev": "03e33114d4d60a1f37150325e15f51b0fa6fc4f6", - "sha256": "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v" - } - }, - { - "goPackagePath": "github.com/hashicorp/go.net", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/go.net", - "rev": "104dcad90073cd8d1e6828b2af19185b60cf3e29", - "sha256": "0pfi09h4q6w2x833qxr8r609ml4kw1flqm265j752sb08sbf3zwf" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "575fdbe86e5dd89229707ebec0575ce7d088a4a6", - "sha256": "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa" - } - }, - { - "goPackagePath": "golang.org/x/tools", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/tools", - "rev": "9ae4729fba20b3533d829a9c6ba8195b068f2abc", - "sha256": "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1" - } - }, - { - "goPackagePath": "github.com/vincent-petithory/structfield", - "fetch": { - "type": "git", - "url": "https://github.com/vincent-petithory/structfield", - "rev": "01a738558a47fbf16712994d1737fb31c77e7d11", - "sha256": "1kyx71z13mf6hc8ly0j0b9zblgvj5lzzvgnc3fqh61wgxrsw24dw" - } - }, - { - "goPackagePath": "github.com/aybabtme/rgbterm", - "fetch": { - "type": "git", - "url": "https://github.com/aybabtme/rgbterm", - "rev": "c07e2f009ed2311e9c35bca12ec00b38ccd48283", - "sha256": "1qph7drds44jzx1whqlrh1hs58k0wv0v58zyq2a81hmm72gsgzam" - } - }, - { - "goPackagePath": "github.com/vaughan0/go-ini", - "fetch": { - "type": "git", - "url": "https://github.com/vaughan0/go-ini", - "rev": "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1", - "sha256": "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa" - } - }, - { - "goPackagePath": "github.com/mitchellh/go-homedir", - "fetch": { - "type": "git", - "url": "https://github.com/mitchellh/go-homedir", - "rev": "1f6da4a72e57d4e7edd4a7295a585e0a3999a2d4", - "sha256": "1l5lrsjrnwxn299mhvyxvz8hd0spkx0d31gszm4cyx21bg1xsiy9" - } - }, - { - "goPackagePath": "github.com/goamz/goamz", - "fetch": { - "type": "git", - "url": "https://github.com/goamz/goamz", - "rev": "2a8fed5e89ab9e16210fc337d1aac780e8c7bbb7", - "sha256": "0rlinp0cvgw66qjndg4padr5s0wd3n7kjfggkx6czqj9bqaxcz4b" - } - }, - { - "goPackagePath": "github.com/nmcclain/asn1-ber", - "fetch": { - "type": "git", - "url": "https://github.com/go-asn1-ber/asn1-ber", - "rev": "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72", - "sha256": "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9" - } - }, - { - "goPackagePath": "gopkg.in/asn1-ber.v1", - "fetch": { - "type": "git", - "url": "https://github.com/go-asn1-ber/asn1-ber", - "rev": "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72", - "sha256": "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9" - } - }, - { - "goPackagePath": "github.com/peterbourgon/g2s", - "fetch": { - "type": "git", - "url": "https://github.com/peterbourgon/g2s", - "rev": "ec76db4c1ac16400ac0e17ca9c4840e1d23da5dc", - "sha256": "1p4p8755v2nrn54rik7yifpg9szyg44y5rpp0kryx4ycl72307rj" - } - }, - { - "goPackagePath": "github.com/nmcclain/ldap", - "fetch": { - "type": "git", - "url": "https://github.com/go-ldap/ldap", - "rev": "83e65426fd1c06626e88aa8a085e5bfed0208e29", - "sha256": "179lwaf0hvczl8g4xzkpcpzq25p1b23f7399bx5zl55iin62d8yz" - } - }, - { - "goPackagePath": "github.com/kelseyhightower/memkv", - "fetch": { - "type": "git", - "url": "https://github.com/kelseyhightower/memkv", - "rev": "7f9c7f36f45ba80c62fe22779ee78d9b4ca36580", - "sha256": "090x65kr3gqh8fc8z4rm9hc2r0v0k7rfm5vsbmhdh21f48ixw540" - } - }, - { - "goPackagePath": "github.com/armon/consul-api", - "fetch": { - "type": "git", - "url": "https://github.com/armon/consul-api", - "rev": "f79efe463cdbb62f6d5a55f879a63ec554eb13e5", - "sha256": "1rkmzfhsazj9p2b6ywvs8yramzvxfxyvplzxi0ldvhcv04887gcp" - } - }, - { - "goPackagePath": "github.com/garyburd/redigo", - "fetch": { - "type": "git", - "url": "https://github.com/garyburd/redigo", - "rev": "535138d7bcd717d6531c701ef5933d98b1866257", - "sha256": "1m7nc1gvv5yqnq8ii75f33485il6y6prf8gxl97dimsw94qccc5v" - } - }, - { - "goPackagePath": "github.com/bkaradzic/go-lz4", - "fetch": { - "type": "git", - "url": "https://github.com/bkaradzic/go-lz4", - "rev": "74ddf82598bc4745b965729e9c6a463bedd33049", - "sha256": "1vdid8v0c2v2qhrg9rzn3l7ya1h34jirrxfnir7gv7w6s4ivdvc1" - } - }, - { - "goPackagePath": "github.com/calmh/luhn", - "fetch": { - "type": "git", - "url": "https://github.com/calmh/luhn", - "rev": "0c8388ff95fa92d4094011e5a04fc99dea3d1632", - "sha256": "1hfj1lx7wdpifn16zqrl4xml6cj5gxbn6hfz1f46g2a6bdf0gcvs" - } - }, - { - "goPackagePath": "golang.org/x/text", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/text", - "rev": "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e", - "sha256": "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14" - } - }, - { - "goPackagePath": "github.com/vitrun/qart", - "fetch": { - "type": "git", - "url": "https://github.com/vitrun/qart", - "rev": "ccb109cf25f0cd24474da73b9fee4e7a3e8a8ce0", - "sha256": "0bhp768b8ha6f25dmhwn9q8m2lkbn4qnjf8n7pizk25jn5zjdvc8" - } - }, - { - "goPackagePath": "github.com/calmh/du", - "fetch": { - "type": "git", - "url": "https://github.com/calmh/du", - "rev": "3c0690cca16228b97741327b1b6781397afbdb24", - "sha256": "1mv6mkbslfc8giv47kyl97ny0igb3l7jya5hc75sm54xi6g205wa" - } - }, - { - "goPackagePath": "github.com/calmh/xdr", - "fetch": { - "type": "git", - "url": "https://github.com/calmh/xdr", - "rev": "e467b5aeb65ca8516fb3925c84991bf1d7cc935e", - "sha256": "1bi4b2xkjzcr0vq1wxz14i9943k71sj092dam0gdmr9yvdrg0nra" - } - }, - { - "goPackagePath": "github.com/juju/ratelimit", - "fetch": { - "type": "git", - "url": "https://github.com/juju/ratelimit", - "rev": "772f5c38e468398c4511514f4f6aa9a4185bc0a0", - "sha256": "02rs61ay6sq499lxxszjsrxp33m6zklds1xrmnr5fk73vpqfa28p" - } - }, - { - "goPackagePath": "github.com/thejerf/suture", - "fetch": { - "type": "git", - "url": "https://github.com/thejerf/suture", - "rev": "99c1f2d613756768fc4299acd9dc621e11ed3fd7", - "sha256": "094ksr2nlxhvxr58nbnzzk0prjskb21r86jmxqjr3rwg4rkwn6d4" - } - }, - { - "goPackagePath": "github.com/golang/snappy", - "fetch": { - "type": "git", - "url": "https://github.com/golang/snappy", - "rev": "723cc1e459b8eea2dea4583200fd60757d40097a", - "sha256": "0bprq0qb46f5511b5scrdqqzskqqi2z8b4yh3216rv0n1crx536h" - } - }, - { - "goPackagePath": "github.com/syndtr/goleveldb", - "fetch": { - "type": "git", - "url": "https://github.com/syndtr/goleveldb", - "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" - } - }, - { - "goPackagePath": "github.com/agl/go-gtk", - "fetch": { - "type": "git", - "url": "https://github.com/agl/go-gtk", - "rev": "91c1edb38c241d73129e6b098ca1c9fa83abfc15", - "sha256": "156ixlhakpqgyp35rsvmndrqz8aggv5bcmzg9ynpri3b9j6kim4d" - } - }, - { - "goPackagePath": "bitbucket.org/ww/goautoneg", - "fetch": { - "type": "hg", - "url": "bitbucket.org/ww/goautoneg", - "rev": "75cd24fc2f2c2a2088577d12123ddee5f54e0675", - "sha256": "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi" - } - }, - { - "goPackagePath": "github.com/antonlindstrom/mesos_stats", - "fetch": { - "type": "git", - "url": "https://github.com/antonlindstrom/mesos_stats", - "rev": "0c6ea494c19bedc67ebb85ce3d187ec21050e920", - "sha256": "18ggyjf4nyn77gkn16wg9krp4dsphgzdgcr3mdflv6mvbr482ar4" - } - }, - { - "goPackagePath": "github.com/go-sql-driver/mysql", - "fetch": { - "type": "git", - "url": "https://github.com/go-sql-driver/mysql", - "rev": "fb7299726d2e68745a8805b14f2ff44b5c2cfa84", - "sha256": "185af0x475hq2wmm2zdvxjyslkplf8zzqijdxa937zqxq63qiw4w" - } - }, - { - "goPackagePath": "github.com/prometheus/log", - "fetch": { - "type": "git", - "url": "https://github.com/prometheus/log", - "rev": "439e5db48fbb50ebbaf2c816030473a62f505f55", - "sha256": "1fl23gsw2hn3c1y91qckr661sybqcw2gqnd1gllxn3hp6p2w6hxv" - } - }, - { - "goPackagePath": "github.com/soundcloud/go-runit", - "fetch": { - "type": "git", - "url": "https://github.com/soundcloud/go-runit", - "rev": "a9148323a615e2e1c93b7a9893914a360b4945c8", - "sha256": "00f2rfhsaqj2wjanh5qp73phx7x12a5pwd7lc0rjfv68l6sgpg2v" - } - }, - { - "goPackagePath": "github.com/beevik/ntp", - "fetch": { - "type": "git", - "url": "https://github.com/beevik/ntp", - "rev": "0a5264e2563429030eb922f258229ae3fee5b5dc", - "sha256": "03fvgbjf2aprjj1s6wdc35wwa7k1w5phkixzvp5n1j21sf6w4h24" - } - }, - { - "goPackagePath": "github.com/julienschmidt/httprouter", - "fetch": { - "type": "git", - "url": "https://github.com/julienschmidt/httprouter", - "rev": "6aacfd5ab513e34f7e64ea9627ab9670371b34e7", - "sha256": "00rrjysmq898qcrf2hfwfh9s70vwvmjx2kp5w03nz1krxa4zhrkl" - } - }, - { - "goPackagePath": "github.com/howeyc/fsnotify", - "fetch": { - "type": "git", - "url": "https://github.com/fsnotify/fsnotify", - "rev": "ea925a0a47d225b2ca7f9932b01d2ed4f3ec74f6", - "sha256": "15wqjpkfzsxnaxbz6y4r91hw6812g3sc4ipagxw1bya9klbnkdc9" - } - }, - { - "goPackagePath": "github.com/alecthomas/template", - "fetch": { - "type": "git", - "url": "https://github.com/alecthomas/template", - "rev": "14fd436dd20c3cc65242a9f396b61bfc8a3926fc", - "sha256": "19rzvvcgvr1z2wz9xpqsmlm8syizbpxjp5zbzgakvrqlajpbjvx2" - } - }, - { - "goPackagePath": "github.com/alecthomas/units", - "fetch": { - "type": "git", - "url": "https://github.com/alecthomas/units", - "rev": "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a", - "sha256": "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl" - } - }, - { - "goPackagePath": "gopkg.in/alecthomas/kingpin.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/alecthomas/kingpin.v2", - "rev": "21551c2a6259a8145110ca80a36e25c9d7624032", - "sha256": "1zhpqc4qxsw9lc1b4dwk5r42k9r702ihzrabs3mnsphvm9jx4l59" - } - }, - { - "goPackagePath": "github.com/Masterminds/vcs", - "fetch": { - "type": "git", - "url": "https://github.com/Masterminds/vcs", - "rev": "7af28b64c5ec41b1558f5514fd938379822c237c", - "sha256": "127pamr5lkym3iq6z747bm4y4gyc02glrqb61yv82z1rdyv1dcf6" - } - }, - { - "goPackagePath": "github.com/boltdb/bolt", - "fetch": { - "type": "git", - "url": "https://github.com/boltdb/bolt", - "rev": "957d850b5158a4eebf915476058e720f43459584", - "sha256": "193adhhsqdy0kyq1l1fi8pg2n6pwyrw4h607qm78qyi26f8i7vzf" - } - }, - { - "goPackagePath": "github.com/cheggaaa/pb", - "fetch": { - "type": "git", - "url": "https://github.com/cheggaaa/pb", - "rev": "e648e12b78cedf14ebb2fc1855033f07b034cfbb", - "sha256": "03k4cars7hcqqgdsd0minfls2p7gjpm8q6y8vknh1s68kvxd4xam" - } - }, - { - "goPackagePath": "github.com/odeke-em/cli-spinner", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/cli-spinner", - "rev": "610063bb4aeef25f7645b3e6080456655ec0fb33", - "sha256": "13wzs2qrxd72ah32ym0ppswhvyimjw5cqaq3q153y68vlvxd048c" - } - }, - { - "goPackagePath": "github.com/odeke-em/statos", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/statos", - "rev": "f27d6ab69b62abd9d9fe80d355e23a3e45d347d6", - "sha256": "17cpks8bi9i7p8j38x0wy60jb9g39wbzszcmhx4hlq6yzxr04jvs" - } - }, - { - "goPackagePath": "github.com/odeke-em/exponential-backoff", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/exponential-backoff", - "rev": "96e25d36ae36ad09ac02cbfe653b44c4043a8e09", - "sha256": "1as21p2jj8xpahvdxqwsw2i1s3fll14dlc9j192iq7xl1ybwpqs6" - } - }, - { - "goPackagePath": "github.com/odeke-em/extractor", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/extractor", - "rev": "801861aedb854c7ac5e1329e9713023e9dc2b4d4", - "sha256": "036zmnqxy48h6mxiwywgxix2p4fqvl4svlmcp734ri2rbq3cmxs1" - } - }, - { - "goPackagePath": "github.com/odeke-em/meddler", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/meddler", - "rev": "d2b51d2b40e786ab5f810d85e65b96404cf33570", - "sha256": "0m0fqrn3kxy4swyk4ja1y42dn1i35rq9j85y11wb222qppy2342x" - } - }, - { - "goPackagePath": "github.com/odeke-em/xon", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/xon", - "rev": "d580be739d723da4f6378083128f93017b8ab295", - "sha256": "07a7zj01d4a23xqp01m48jp2v5mw49islf4nbq2rj13sd5w4s6sc" - } - }, - { - "goPackagePath": "github.com/odeke-em/cache", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/cache", - "rev": "b51b08cb6cf889deda6c941a5205baecfd16f3eb", - "sha256": "1rmm1ky7irqypqjkk6qcd2n0xkzpaggdxql9dp9i9qci5rvvwwd4" - } - }, - { - "goPackagePath": "github.com/odeke-em/command", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/command", - "rev": "91ca5ec5e9a1bc2668b1ccbe0967e04a349e3561", - "sha256": "1ghckzr8h99ckagpmb15p61xazdjmf9mjmlym634hsr9vcj84v62" - } - }, - { - "goPackagePath": "github.com/odeke-em/log", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/log", - "rev": "cad53c4565a0b0304577bd13f3862350bdc5f907", - "sha256": "059c933qjikxlvaywzpzljqnab19svymbv6x32pc7khw156fh48w" - } - }, - { - "goPackagePath": "github.com/odeke-em/pretty-words", - "fetch": { - "type": "git", - "url": "https://github.com/odeke-em/pretty-words", - "rev": "9d37a7fcb4ae6f94b288d371938482994458cecb", - "sha256": "1466wjhrg9lhqmzil1vf8qj16fxk32b5kxlcccyw2x6dybqa6pkl" - } - }, - { - "goPackagePath": "github.com/skratchdot/open-golang", - "fetch": { - "type": "git", - "url": "https://github.com/skratchdot/open-golang", - "rev": "c8748311a7528d0ba7330d302adbc5a677ef9c9e", - "sha256": "0qhn2d00v3m9fiqk9z7swdm599clc6j7rnli983s8s1byyp0x3ac" - } - }, - { - "goPackagePath": "github.com/hashicorp/raft", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/raft", - "rev": "a8065f298505708bf60f518c09178149f3c06f21", - "sha256": "122mjijphas7ybbvssxv1r36sb8i907gdr9kvplnx6yg9w52j3mn" - } - }, - { - "goPackagePath": "github.com/hashicorp/raft-boltdb", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/raft-boltdb", - "rev": "d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee", - "sha256": "0p609w6x0h6bapx4b0d91dxnp2kj7dv0534q4blyxp79shv2a8ia" - } - }, - { - "goPackagePath": "github.com/rakyll/statik", - "fetch": { - "type": "git", - "url": "https://github.com/rakyll/statik", - "rev": "274df120e9065bdd08eb1120e0375e3dc1ae8465", - "sha256": "0llk7bxmk66wdiy42h32vj1jfk8zg351xq21hwhrq7gkfljghffp" - } - }, - { - "goPackagePath": "gopkg.in/fatih/pool.v2", - "fetch": { - "type": "git", - "url": "https://gopkg.in/fatih/pool.v2", - "rev": "cba550ebf9bce999a02e963296d4bc7a486cb715", - "sha256": "1jlrakgnpvhi2ny87yrsj1gyrcncfzdhypa9i2mlvvzqlj4r0dn0" - } - }, - { - "goPackagePath": "github.com/bmizerany/pat", - "fetch": { - "type": "git", - "url": "https://github.com/bmizerany/pat", - "rev": "b8a35001b773c267eb260a691f4e5499a3531600", - "sha256": "11zxd45rvjm6cn3wzbi18wy9j4vr1r1hgg6gzlqnxffiizkycxmz" - } - }, - { - "goPackagePath": "github.com/kimor79/gollectd", - "fetch": { - "type": "git", - "url": "https://github.com/kimor79/gollectd", - "rev": "cf6dec97343244b5d8a5485463675d42f574aa2d", - "sha256": "1f3ml406cprzjc192csyr2af4wcadkc74kg8n4c0zdzglxxfsqxa" - } - }, - { - "goPackagePath": "github.com/monochromegane/conflag", - "fetch": { - "type": "git", - "url": "https://github.com/monochromegane/conflag", - "rev": "6d68c9aa4183844ddc1655481798fe4d90d483e9", - "sha256": "0csfr5c8d3kbna9sqhzfp2z06wq6mc6ijja1zj2i82kzsq8534wa" - } - }, - { - "goPackagePath": "github.com/monochromegane/go-home", - "fetch": { - "type": "git", - "url": "https://github.com/monochromegane/go-home", - "rev": "25d9dda593924a11ea52e4ffbc8abdb0dbe96401", - "sha256": "172chakrj22xfm0bcda4qj5zqf7lwr53pzwc3xj6wz8vd2bcxkww" - } - }, - { - "goPackagePath": "github.com/monochromegane/terminal", - "fetch": { - "type": "git", - "url": "https://github.com/monochromegane/terminal", - "rev": "2da212063ce19aed90ee5bbb00ad1ad7393d7f48", - "sha256": "1rddaq9pk5q57ildms35iihghqk505gb349pb0f6k3svchay38nh" - } - }, - { - "goPackagePath": "github.com/monochromegane/go-gitignore", - "fetch": { - "type": "git", - "url": "https://github.com/monochromegane/go-gitignore", - "rev": "38717d0a108ca0e5af632cd6845ca77d45b50729", - "sha256": "0r1inabpgg6sn6i47b02hcmd2p4dc1ab1mcy20mn1b2k3mpdj4b7" - } - }, - { - "goPackagePath": "github.com/shiena/ansicolor", - "fetch": { - "type": "git", - "url": "https://github.com/shiena/ansicolor", - "rev": "a5e2b567a4dd6cc74545b8a4f27c9d63b9e7735b", - "sha256": "0gwplb1b4fvav1vjf4b2dypy5rcp2w41vrbxkd1dsmac870cy75p" - } - }, - { - "goPackagePath": "github.com/pquerna/ffjson", - "fetch": { - "type": "git", - "url": "https://github.com/pquerna/ffjson", - "rev": "674bc015b5b3f50f9bb2561179778586b9af68c5", - "sha256": "0l53q7b1g25hfjm1iyynfs413rpav4c51yvdr244ivw1x3hksa7a" - } - }, - { - "goPackagePath": "gopkg.in/kothar/go-backblaze.v0", - "fetch": { - "type": "git", - "url": "https://gopkg.in/kothar/go-backblaze.v0", - "rev": "373819725fc560fa962c6cd883b533d2ebec4844", - "sha256": "1kmlwfnnfd4h46bb9pz2gw1hxqm1pzkwvidfmnc0zkrilaywk6fx" - } - }, - { - "goPackagePath": "github.com/jawher/mow.cli", - "fetch": { - "type": "git", - "url": "https://github.com/jawher/mow.cli", - "rev": "772320464101e904cd51198160eb4d489be9cc49", - "sha256": "1a8hnh2k3vc3prjhnz4rjbiwhqq6r3mi18h9cdb6fc6s6yzjc19j" - } - }, - { - "goPackagePath": "github.com/svent/go-flags", - "fetch": { - "type": "git", - "url": "https://github.com/svent/go-flags", - "rev": "4bcbad344f0318adaf7aabc16929701459009aa3", - "sha256": "1gb416fgxl9gq4q6wsv3i2grq1mzbi7lvfvmfdqbxqbv9vizzh34" - } - }, - { - "goPackagePath": "github.com/svent/go-nbreader", - "fetch": { - "type": "git", - "url": "https://github.com/svent/go-nbreader", - "rev": "7cef48da76dca6a496faa7fe63e39ed665cbd219", - "sha256": "0hw11jj5r3f6qwydg41nc3c6aadlbkhc1qpxra2609lis0qa9h4r" - } - }, - { - "goPackagePath": "github.com/tdewolff/buffer", - "fetch": { - "type": "git", - "url": "https://github.com/tdewolff/buffer", - "rev": "0edfcb7b750146ff879e95831de2ef53605a5cb5", - "sha256": "1mdd4k9byp22mw0a399j3w73zjb5g0vn58g76rjy7ajb0dzm80vl" - } - }, - { - "goPackagePath": "github.com/tdewolff/parse", - "fetch": { - "type": "git", - "url": "https://github.com/tdewolff/parse", - "rev": "34d5c1160d4503da4b456e5094609f2331d6dde3", - "sha256": "0hxf65fgkrc1q4p99p33xxxy1s6wxpn1vfsnqf9p846awwbqsy0v" - } - }, - { - "goPackagePath": "github.com/tdewolff/strconv", - "fetch": { - "type": "git", - "url": "https://github.com/tdewolff/strconv", - "rev": "3e8091f4417ebaaa3910da63a45ea394ebbfb0e3", - "sha256": "00w2mryfjhz3vaqzxvbwvyhi1vgpc1s4xfv1r9hxn8hwa078q5gp" - } - }, - { - "goPackagePath": "github.com/matryer/try", - "fetch": { - "type": "git", - "url": "https://github.com/matryer/try", - "rev": "93d30e50512f879b73829eb79867df38084bcd31", - "sha256": "0dmc8iar9685ks1ba3vnycjsx8qxwyqv51jb7677dvwnzbqhgw6f" - } - }, - { - "goPackagePath": "github.com/yosssi/ace", - "fetch": { - "type": "git", - "url": "https://github.com/yosssi/ace", - "rev": "71afeb714739f9d5f7e1849bcd4a0a5938e1a70d", - "sha256": "15k7ji8m3nqbwhnsvp82j4qa45sgvwv2giliw2xkdwi2g7mfrn8k" - } - }, - { - "goPackagePath": "github.com/spf13/viper", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/viper", - "rev": "c1ccc378a054ea8d4e38d8c67f6938d4760b53dd", - "sha256": "0lpdzalqhqp9pwsg63inkxwjji7m0pp42ryw1499bqbjp97hriq0" - } - }, - { - "goPackagePath": "github.com/spf13/pflag", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/pflag", - "rev": "367864438f1b1a3c7db4da06a2f55b144e6784e0", - "sha256": "03c6654hv4v1fj79i5sri3p9q2afqgicka4nicb6fr4kcfkkgbfp" - } - }, - { - "goPackagePath": "github.com/spf13/jwalterweatherman", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/jwalterweatherman", - "rev": "33c24e77fb80341fe7130ee7c594256ff08ccc46", - "sha256": "1knvzspqzc2bh58q16zggzc8gcabjp5gr7zk4k7nx5ij4092cg0z" - } - }, - { - "goPackagePath": "github.com/fsnotify/fsnotify", - "fetch": { - "type": "git", - "url": "https://github.com/fsnotify/fsnotify", - "rev": "30411dbcefb7a1da7e84f75530ad3abe4011b4f8", - "sha256": "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm" - } - }, - { - "goPackagePath": "github.com/ogier/pflag", - "fetch": { - "type": "git", - "url": "https://github.com/ogier/pflag", - "rev": "45c278ab3607870051a2ea9040bb85fcb8557481", - "sha256": "0620v75wppfd84d95n312wpngcb73cph4q3ivs1h0waljfnsrd5l" - } - }, - { - "goPackagePath": "github.com/magiconair/properties", - "fetch": { - "type": "git", - "url": "https://github.com/magiconair/properties", - "rev": "c265cfa48dda6474e208715ca93e987829f572f8", - "sha256": "1ab9ywwsrdq5mvrcwl7m3276y1q4dfwinbv88vgpqwcqai9wkpp3" - } - }, - { - "goPackagePath": "github.com/bep/inflect", - "fetch": { - "type": "git", - "url": "https://github.com/bep/inflect", - "rev": "b896c45f5af983b1f416bdf3bb89c4f1f0926f69", - "sha256": "0drv6in94n7lmap4ajvgqlvdcbpn8alinfdzywzpihvzbx21b3h3" - } - }, - { - "goPackagePath": "github.com/eknkc/amber", - "fetch": { - "type": "git", - "url": "https://github.com/eknkc/amber", - "rev": "91774f050c1453128146169b626489e60108ec03", - "sha256": "1rb8bm35h8a77q4py6r3818cpwh7kpq1kh2ib2rb4i5s7z75ciis" - } - }, - { - "goPackagePath": "github.com/spf13/afero", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/afero", - "rev": "1a8ecf8b9da1fb5306e149e83128fc447957d2a8", - "sha256": "1nrg0gmqnl4h6zjmi4mdhrwnl3l34nzxpq2hsr3nizfvrx5gqbzw" - } - }, - { - "goPackagePath": "github.com/spf13/cast", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/cast", - "rev": "27b586b42e29bec072fe7379259cc719e1289da6", - "sha256": "1y73pfxdvm1bfpghwsfxj8gl4miv6fpzi9azxcknp6rcjn1gmq0x" - } - }, - { - "goPackagePath": "github.com/spf13/cobra", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/cobra", - "rev": "bc81c21bd0d8be5ba2d6630a505d79d4467566e7", - "sha256": "1sp8gl25cjx0yibh6q1i8d5rbxpwaal3z8vz372wfmbz002say8r" - } - }, - { - "goPackagePath": "github.com/dchest/cssmin", - "fetch": { - "type": "git", - "url": "https://github.com/dchest/cssmin", - "rev": "fb8d9b44afdc258bfff6052d3667521babcb2239", - "sha256": "09sdijfx5d05z4cd5k6lhl7k3kbpdf2amzlngv15h5v0fff9qw4s" - } - }, - { - "goPackagePath": "github.com/spf13/fsync", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/fsync", - "rev": "eefee59ad7de621617d4ff085cf768aab4b919b1", - "sha256": "0d56xdczawikyczc12i661qc79dbv4q8ihlj4p20zsjkyxxym59p" - } - }, - { - "goPackagePath": "github.com/cpuguy83/go-md2man", - "fetch": { - "type": "git", - "url": "https://github.com/cpuguy83/go-md2man", - "rev": "2724a9c9051aa62e9cca11304e7dd518e9e41599", - "sha256": "1j2bigs7ixy20cdqd246nxr417md2qcyvkfk3x94992cr88d0vyj" - } - }, - { - "goPackagePath": "github.com/miekg/mmark", - "fetch": { - "type": "git", - "url": "https://github.com/miekg/mmark", - "rev": "adb5c3e2e9f3e7da9bd25291edda8e66c0045a2a", - "sha256": "0fycz17fj37fh95lfshdrfwrgkzi3hl1kgnily0cxc9zwfbap3qa" - } - }, - { - "goPackagePath": "github.com/spf13/nitro", - "fetch": { - "type": "git", - "url": "https://github.com/spf13/nitro", - "rev": "24d7ef30a12da0bdc5e2eb370a79c659ddccf0e8", - "sha256": "143sbpx0jdgf8f8ayv51x6l4jg6cnv6nps6n60qxhx4vd90s6mib" - } - }, - { - "goPackagePath": "github.com/PuerkitoBio/purell", - "fetch": { - "type": "git", - "url": "https://github.com/PuerkitoBio/purell", - "rev": "1d5d1cfad45d42ec5f81fa8ef23de09cebc6dcc3", - "sha256": "12k82576ka21c6572yy2v81kxpjrgf9mffjlz469g3vs0g3nkwlb" - } - }, - { - "goPackagePath": "github.com/opennota/urlesc", - "fetch": { - "type": "git", - "url": "https://github.com/opennota/urlesc", - "rev": "5fa9ff0392746aeae1c4b37fcc42c65afa7a9587", - "sha256": "0dppkmfs0hb5vcqli191x9yss5vvlx29qxjcywhdfirc89rn0sni" - } - }, - { - "goPackagePath": "github.com/pkg/sftp", - "fetch": { - "type": "git", - "url": "https://github.com/pkg/sftp", - "rev": "d4c18e7ffdc496a38de67dde6e29b2f364afc472", - "sha256": "0cnl83k317gxskayfj3xwr4bl0vcbjvlwi3q0vjwvircynb6xscj" - } - }, - { - "goPackagePath": "github.com/kr/fs", - "fetch": { - "type": "git", - "url": "https://github.com/kr/fs", - "rev": "2788f0dbd16903de03cb8186e5c7d97b69ad387b", - "sha256": "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly" - } - }, - { - "goPackagePath": "github.com/kyokomi/emoji", - "fetch": { - "type": "git", - "url": "https://github.com/kyokomi/emoji", - "rev": "17c5e7085c9d59630aa578df67f4469481fbe7a9", - "sha256": "0qs4mi7z1lghiyiw7s2bz5y959wj9ifmhyqh39xwqk69d690jwlp" - } - }, - { - "goPackagePath": "github.com/pkg/errors", - "fetch": { - "type": "git", - "url": "https://github.com/pkg/errors", - "rev": "494e70f7620561491c2ca11e185bbef4b70060da", - "sha256": "0a0961ixl67vryhnzyzhai357c9n9a7v3vpkpqrh32spn033gjd9" - } - }, - { - "goPackagePath": "github.com/PuerkitoBio/urlesc", - "fetch": { - "type": "git", - "url": "https://github.com/PuerkitoBio/urlesc", - "rev": "5fa9ff0392746aeae1c4b37fcc42c65afa7a9587", - "sha256": "0dppkmfs0hb5vcqli191x9yss5vvlx29qxjcywhdfirc89rn0sni" - } - } -] diff --git a/pkgs/development/tools/deis/default.nix b/pkgs/development/tools/deis/default.nix index 471cc80663da8..e0bedb52f925a 100644 --- a/pkgs/development/tools/deis/default.nix +++ b/pkgs/development/tools/deis/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchgit }: buildGoPackage rec { name = "deis-${version}"; @@ -21,5 +21,5 @@ buildGoPackage rec { sha256 = "1qv9lxqx7m18029lj8cw3k7jngvxs4iciwrypdy0gd2nnghc68sw"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; } diff --git a/pkgs/development/tools/deis/deps.json b/pkgs/development/tools/deis/deps.json deleted file mode 100644 index a0333247062ee..0000000000000 --- a/pkgs/development/tools/deis/deps.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "include": "../../../go-modules/libs.json", - "packages": [ - "github.com/docopt/docopt-go", - "golang.org/x/crypto", - "gopkg.in/yaml.v2" - ] - } -] diff --git a/pkgs/development/tools/deis/deps.nix b/pkgs/development/tools/deis/deps.nix new file mode 100644 index 0000000000000..b75365cf92bc0 --- /dev/null +++ b/pkgs/development/tools/deis/deps.nix @@ -0,0 +1,27 @@ +{ fetchgit }: +[ + { + goPackagePath = "gopkg.in/yaml.v2"; + src = fetchgit { + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "github.com/docopt/docopt-go"; + src = fetchgit { + url = "https://github.com/docopt/docopt-go"; + rev = "784ddc588536785e7299f7272f39101f7faccc3f"; + sha256 = "0wwz48jl9fvl1iknvn9dqr4gfy1qs03gxaikrxxp9gry6773v3sj"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + src = fetchgit { + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } +] diff --git a/pkgs/development/tools/go2nix/default.nix b/pkgs/development/tools/go2nix/default.nix index e0e9fe8c3fc58..29fb3b05cdf86 100644 --- a/pkgs/development/tools/go2nix/default.nix +++ b/pkgs/development/tools/go2nix/default.nix @@ -1,9 +1,9 @@ { stdenv, buildGoPackage, go-bindata, goimports, nix-prefetch-git, git, makeWrapper, - fetchFromGitHub }: + fetchFromGitHub, fetchgit }: buildGoPackage rec { name = "go2nix-${version}"; - version = "0.1.0"; + version = "1.0.0"; rev = "v${version}"; goPackagePath = "github.com/kamilchm/go2nix"; @@ -12,10 +12,10 @@ buildGoPackage rec { inherit rev; owner = "kamilchm"; repo = "go2nix"; - sha256 = "10nz7gva3n6wk01wphrjjb31sy33kf9ji03zr849x21a669fnmjf"; + sha256 = "0smvh8yplz191z7i68jbraq251ry378y7zhc9dcwfb61gdyrbcg9"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; buildInputs = [ go-bindata goimports makeWrapper ]; preBuild = ''go generate ./...''; diff --git a/pkgs/development/tools/go2nix/deps.json b/pkgs/development/tools/go2nix/deps.json deleted file mode 100644 index f6d392ad3ce34..0000000000000 --- a/pkgs/development/tools/go2nix/deps.json +++ /dev/null @@ -1,9 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/Masterminds/vcs", - "github.com/jawher/mow.cli" - ] - } -] diff --git a/pkgs/development/tools/go2nix/deps.nix b/pkgs/development/tools/go2nix/deps.nix new file mode 100644 index 0000000000000..5ccc3f428cd2d --- /dev/null +++ b/pkgs/development/tools/go2nix/deps.nix @@ -0,0 +1,19 @@ +{ fetchgit }: +[ + { + goPackagePath = "github.com/Masterminds/vcs"; + src = fetchgit { + url = "https://github.com/Masterminds/vcs"; + rev = "7af28b64c5ec41b1558f5514fd938379822c237c"; + sha256 = "127pamr5lkym3iq6z747bm4y4gyc02glrqb61yv82z1rdyv1dcf6"; + }; + } + { + goPackagePath = "github.com/jawher/mow.cli"; + src = fetchgit { + url = "https://github.com/jawher/mow.cli"; + rev = "772320464101e904cd51198160eb4d489be9cc49"; + sha256 = "1a8hnh2k3vc3prjhnz4rjbiwhqq6r3mi18h9cdb6fc6s6yzjc19j"; + }; + } +] diff --git a/pkgs/development/tools/golint/default.nix b/pkgs/development/tools/golint/default.nix index 29e5b28ad57f8..1d3734484efcd 100644 --- a/pkgs/development/tools/golint/default.nix +++ b/pkgs/development/tools/golint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchgit }: buildGoPackage rec { name = "lint-${version}"; @@ -14,5 +14,5 @@ buildGoPackage rec { sha256 = "024dllcmpg8lx78cqgq551i6f9w6qlykfcx8l7yazak9kjwhpwjg"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; } diff --git a/pkgs/development/tools/golint/deps.json b/pkgs/development/tools/golint/deps.json deleted file mode 100644 index bc1b079376a1b..0000000000000 --- a/pkgs/development/tools/golint/deps.json +++ /dev/null @@ -1,8 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "golang.org/x/tools" - ] - } -] diff --git a/pkgs/development/tools/golint/deps.nix b/pkgs/development/tools/golint/deps.nix new file mode 100644 index 0000000000000..539367e9de86c --- /dev/null +++ b/pkgs/development/tools/golint/deps.nix @@ -0,0 +1,11 @@ +{ fetchgit }: +[ + { + goPackagePath = "golang.org/x/tools"; + src = fetchgit { + url = "https://go.googlesource.com/tools"; + rev = "9ae4729fba20b3533d829a9c6ba8195b068f2abc"; + sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"; + }; + } +] diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix index f00794a7eb0f7..0255da02a5808 100644 --- a/pkgs/development/tools/gotools/default.nix +++ b/pkgs/development/tools/gotools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, go, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, go, buildGoPackage, fetchgit }: buildGoPackage rec { name = "gotools-${version}"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; preConfigure = '' # Make the builtin tools available here diff --git a/pkgs/development/tools/gotools/deps.json b/pkgs/development/tools/gotools/deps.json deleted file mode 100644 index 76e8fd93aa7d9..0000000000000 --- a/pkgs/development/tools/gotools/deps.json +++ /dev/null @@ -1,8 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "golang.org/x/net" - ] - } -] diff --git a/pkgs/development/tools/gotools/deps.nix b/pkgs/development/tools/gotools/deps.nix new file mode 100644 index 0000000000000..e3537f8281d82 --- /dev/null +++ b/pkgs/development/tools/gotools/deps.nix @@ -0,0 +1,11 @@ +{ fetchgit }: +[ + { + goPackagePath = "golang.org/x/net"; + src = fetchgit { + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } +] diff --git a/pkgs/development/tools/gox/default.nix b/pkgs/development/tools/gox/default.nix index 030a59ed20c59..76c26620344e6 100644 --- a/pkgs/development/tools/gox/default.nix +++ b/pkgs/development/tools/gox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchgit }: buildGoPackage rec { name = "gox-${version}"; @@ -14,5 +14,5 @@ buildGoPackage rec { sha256 = "14jb2vgfr6dv7zlw8i3ilmp125m5l28ljv41a66c9b8gijhm48k1"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; } diff --git a/pkgs/development/tools/gox/deps.json b/pkgs/development/tools/gox/deps.json deleted file mode 100644 index 288b2d9f714fe..0000000000000 --- a/pkgs/development/tools/gox/deps.json +++ /dev/null @@ -1,8 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/mitchellh/iochan" - ] - } -] diff --git a/pkgs/development/tools/gox/deps.nix b/pkgs/development/tools/gox/deps.nix new file mode 100644 index 0000000000000..c35621c9044a2 --- /dev/null +++ b/pkgs/development/tools/gox/deps.nix @@ -0,0 +1,11 @@ +{ fetchgit }: +[ + { + goPackagePath = "github.com/mitchellh/iochan"; + src = fetchgit { + url = "https://github.com/mitchellh/iochan"; + rev = "b584a329b193e206025682ae6c10cdbe03b0cd77"; + sha256 = "1fcwdhfci41ibpng2j4c1bqfng578cwzb3c00yw1lnbwwhaq9r6b"; + }; + } +] diff --git a/pkgs/development/tools/remarshal/default.nix b/pkgs/development/tools/remarshal/default.nix index 49de886654c8a..55859cf5c4fed 100644 --- a/pkgs/development/tools/remarshal/default.nix +++ b/pkgs/development/tools/remarshal/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoPackage, fetchFromGitHub, fetchgit }: buildGoPackage rec { name = "remarshal-${rev}"; @@ -12,7 +12,7 @@ buildGoPackage rec { sha256 = "0lhsqca3lq3xvdwsmrngv4p6b7k2lkbfnxnk5qj6jdd5y7f4b496"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; meta = with lib; { description = "Convert between TOML, YAML and JSON"; diff --git a/pkgs/development/tools/remarshal/deps.json b/pkgs/development/tools/remarshal/deps.json deleted file mode 100644 index 3b43c0e5ff605..0000000000000 --- a/pkgs/development/tools/remarshal/deps.json +++ /dev/null @@ -1,9 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/BurntSushi/toml", - "gopkg.in/yaml.v2" - ] - } -] diff --git a/pkgs/development/tools/remarshal/deps.nix b/pkgs/development/tools/remarshal/deps.nix new file mode 100644 index 0000000000000..966842bc409a9 --- /dev/null +++ b/pkgs/development/tools/remarshal/deps.nix @@ -0,0 +1,19 @@ +{ fetchgit }: +[ + { + goPackagePath = "gopkg.in/yaml.v2"; + src = fetchgit { + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + src = fetchgit { + url = "https://github.com/BurntSushi/toml"; + rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; + sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + }; + } +] diff --git a/pkgs/development/tools/textql/default.nix b/pkgs/development/tools/textql/default.nix index 4caa659c17a36..49bd071a8b027 100644 --- a/pkgs/development/tools/textql/default.nix +++ b/pkgs/development/tools/textql/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchgit }: buildGoPackage rec { name = "textql-${version}"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1b61w4pc5gl7m12mphricihzq7ifnzwn0yyw3ypv0d0fj26h5hc3"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; meta = with stdenv.lib; { description = "Execute SQL against structured text like CSV or TSV"; diff --git a/pkgs/development/tools/textql/deps.json b/pkgs/development/tools/textql/deps.json deleted file mode 100644 index d2a75b9e45b0c..0000000000000 --- a/pkgs/development/tools/textql/deps.json +++ /dev/null @@ -1,8 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/mattn/go-sqlite3" - ] - } -] diff --git a/pkgs/development/tools/textql/deps.nix b/pkgs/development/tools/textql/deps.nix new file mode 100644 index 0000000000000..5c70f509414bc --- /dev/null +++ b/pkgs/development/tools/textql/deps.nix @@ -0,0 +1,11 @@ +{ fetchgit }: +[ + { + goPackagePath = "github.com/mattn/go-sqlite3"; + src = fetchgit { + url = "https://github.com/mattn/go-sqlite3"; + rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; + sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"; + }; + } +] diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index 3248258d55238..d8d915703e756 100644 --- a/pkgs/development/web/minify/default.nix +++ b/pkgs/development/web/minify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, buildGoPackage, fetchFromGitHub }: +{ stdenv, buildGoPackage, fetchFromGitHub, fetchgit }: buildGoPackage rec { name = "minify-${version}"; @@ -14,5 +14,5 @@ buildGoPackage rec { sha256 = "15d9ivg1a9v9c2n0a9pfw74952xhd4vqgx8d60dhvif9lx1d8wlq"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; } diff --git a/pkgs/development/web/minify/deps.json b/pkgs/development/web/minify/deps.json deleted file mode 100644 index 0b2fe81085489..0000000000000 --- a/pkgs/development/web/minify/deps.json +++ /dev/null @@ -1,15 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/tdewolff/buffer", - "github.com/tdewolff/parse", - "github.com/tdewolff/strconv", - "github.com/dustin/go-humanize", - "github.com/fsnotify/fsnotify", - "github.com/matryer/try", - "github.com/ogier/pflag", - "golang.org/x/sys" - ] - } -] diff --git a/pkgs/development/web/minify/deps.nix b/pkgs/development/web/minify/deps.nix new file mode 100644 index 0000000000000..d59f2e3934936 --- /dev/null +++ b/pkgs/development/web/minify/deps.nix @@ -0,0 +1,67 @@ +{ fetchgit }: +[ + { + goPackagePath = "golang.org/x/sys"; + src = fetchgit { + url = "https://go.googlesource.com/sys"; + rev = "d9157a9621b69ad1d8d77a1933590c416593f24f"; + sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"; + }; + } + { + goPackagePath = "github.com/dustin/go-humanize"; + src = fetchgit { + url = "https://github.com/dustin/go-humanize"; + rev = "8929fe90cee4b2cb9deb468b51fb34eba64d1bf0"; + sha256 = "1g155kxjh6hd3ibx41nbpj6f7h5bh54zgl9dr53xzg2xlxljgjy0"; + }; + } + { + goPackagePath = "github.com/tdewolff/buffer"; + src = fetchgit { + url = "https://github.com/tdewolff/buffer"; + rev = "0edfcb7b750146ff879e95831de2ef53605a5cb5"; + sha256 = "1mdd4k9byp22mw0a399j3w73zjb5g0vn58g76rjy7ajb0dzm80vl"; + }; + } + { + goPackagePath = "github.com/tdewolff/parse"; + src = fetchgit { + url = "https://github.com/tdewolff/parse"; + rev = "34d5c1160d4503da4b456e5094609f2331d6dde3"; + sha256 = "0hxf65fgkrc1q4p99p33xxxy1s6wxpn1vfsnqf9p846awwbqsy0v"; + }; + } + { + goPackagePath = "github.com/tdewolff/strconv"; + src = fetchgit { + url = "https://github.com/tdewolff/strconv"; + rev = "3e8091f4417ebaaa3910da63a45ea394ebbfb0e3"; + sha256 = "00w2mryfjhz3vaqzxvbwvyhi1vgpc1s4xfv1r9hxn8hwa078q5gp"; + }; + } + { + goPackagePath = "github.com/matryer/try"; + src = fetchgit { + url = "https://github.com/matryer/try"; + rev = "93d30e50512f879b73829eb79867df38084bcd31"; + sha256 = "0dmc8iar9685ks1ba3vnycjsx8qxwyqv51jb7677dvwnzbqhgw6f"; + }; + } + { + goPackagePath = "github.com/fsnotify/fsnotify"; + src = fetchgit { + url = "https://github.com/fsnotify/fsnotify"; + rev = "30411dbcefb7a1da7e84f75530ad3abe4011b4f8"; + sha256 = "0kbpvyi6p9942k0vmcw5z13mja47f7hq7nqd332pn2zydss6kddm"; + }; + } + { + goPackagePath = "github.com/ogier/pflag"; + src = fetchgit { + url = "https://github.com/ogier/pflag"; + rev = "45c278ab3607870051a2ea9040bb85fcb8557481"; + sha256 = "0620v75wppfd84d95n312wpngcb73cph4q3ivs1h0waljfnsrd5l"; + }; + } +] diff --git a/pkgs/servers/caddy/default.nix b/pkgs/servers/caddy/default.nix index 68ce9440f4f4d..5d0af9cdffe9f 100644 --- a/pkgs/servers/caddy/default.nix +++ b/pkgs/servers/caddy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchgit }: buildGoPackage rec { name = "caddy-${version}"; @@ -14,5 +14,5 @@ buildGoPackage rec { sha256 = "1snijkbz02yr7wij7bcmrj4257709sbklb3nhb5qmy95b9ssffm6"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; } diff --git a/pkgs/servers/caddy/deps.json b/pkgs/servers/caddy/deps.json deleted file mode 100644 index dfe81f20ba8d6..0000000000000 --- a/pkgs/servers/caddy/deps.json +++ /dev/null @@ -1,23 +0,0 @@ -[ - { - "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" - ] - } -] diff --git a/pkgs/servers/caddy/deps.nix b/pkgs/servers/caddy/deps.nix new file mode 100644 index 0000000000000..b23ad38377f90 --- /dev/null +++ b/pkgs/servers/caddy/deps.nix @@ -0,0 +1,131 @@ +{ fetchgit }: +[ + { + goPackagePath = "gopkg.in/yaml.v2"; + src = fetchgit { + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + src = fetchgit { + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "golang.org/x/net"; + src = fetchgit { + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + src = fetchgit { + url = "https://github.com/gorilla/websocket"; + rev = "a622679ebd7a3b813862379232f645f8e690e43f"; + sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + src = fetchgit { + url = "https://github.com/miekg/dns"; + rev = "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa"; + sha256 = "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + src = fetchgit { + url = "https://github.com/BurntSushi/toml"; + rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; + sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-syslog"; + src = fetchgit { + url = "https://github.com/hashicorp/go-syslog"; + rev = "42a2b573b664dbf281bd48c3cc12c086b17a39ba"; + sha256 = "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3"; + }; + } + { + goPackagePath = "github.com/flynn/go-shlex"; + src = fetchgit { + url = "https://github.com/flynn/go-shlex"; + rev = "3f9db97f856818214da2e1057f8ad84803971cff"; + sha256 = "1j743lysygkpa2s2gii2xr32j7bxgc15zv4113b0q9jhn676ysia"; + }; + } + { + goPackagePath = "github.com/xenolf/lego"; + src = fetchgit { + url = "https://github.com/xenolf/lego"; + rev = "ca19a90028e242e878585941c2a27c8f3b3efc25"; + sha256 = "1zkcsbdzbmfzk3kqmcj9l13li8sz228xhrw2wj3ab4a0w6drbw3x"; + }; + } + { + goPackagePath = "gopkg.in/natefinch/lumberjack.v2"; + src = fetchgit { + url = "https://gopkg.in/natefinch/lumberjack.v2"; + rev = "514cbda263a734ae8caac038dadf05f8f3f9f738"; + sha256 = "1v92v8vkip36l2fs6l5dpp655151hrijjc781cif658r8nf7xr82"; + }; + } + { + goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; + src = fetchgit { + url = "https://github.com/shurcooL/sanitized_anchor_name"; + rev = "10ef21a441db47d8b13ebcc5fd2310f636973c77"; + sha256 = "1cnbzcf47cn796rcjpph1s64qrabhkv5dn9sbynsy7m9zdwr5f01"; + }; + } + { + goPackagePath = "gopkg.in/square/go-jose.v1"; + src = fetchgit { + url = "https://gopkg.in/square/go-jose.v1"; + rev = "40d457b439244b546f023d056628e5184136899b"; + sha256 = "0asa1kl1qbx0cyayk44jhxxff0awpkwiw6va7yzrzjzhfc5kvg7p"; + }; + } + { + goPackagePath = "github.com/mholt/archiver"; + src = fetchgit { + url = "https://github.com/mholt/archiver"; + rev = "85f054813ed511646b0ce5e047697e0651b8e1a4"; + sha256 = "0b38mrfm3rwgdi7hrp4gjhf0y0f6bw73qjkfrkafxjrdpdg7nyly"; + }; + } + { + goPackagePath = "github.com/dustin/go-humanize"; + src = fetchgit { + url = "https://github.com/dustin/go-humanize"; + rev = "8929fe90cee4b2cb9deb468b51fb34eba64d1bf0"; + sha256 = "1g155kxjh6hd3ibx41nbpj6f7h5bh54zgl9dr53xzg2xlxljgjy0"; + }; + } + { + goPackagePath = "github.com/jimstudt/http-authentication"; + src = fetchgit { + url = "https://github.com/jimstudt/http-authentication"; + rev = "3eca13d6893afd7ecabe15f4445f5d2872a1b012"; + sha256 = "1drw3bhrxpjzwryqz9nq5s0yyjqyd42iym3bh1zjs5qsh401cq08"; + }; + } + { + goPackagePath = "github.com/russross/blackfriday"; + src = fetchgit { + url = "https://github.com/russross/blackfriday"; + rev = "d18b67ae0afd61dae240896eae1785f00709aa31"; + sha256 = "1l78hz8k1ixry5fjw29834jz1q5ysjcpf6kx2ggjj1s6xh0bfzvf"; + }; + } +] diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index 2c76dfc8e31d8..6e3361a5ccc15 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, libpcap, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, libpcap, buildGoPackage, fetchFromGitHub, fetchgit }: buildGoPackage rec { name = "etcd-${version}"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "07rdnhcpnvnkxj5pqacxz669rzn5vw2i1zmf6dd4nv7wpfscdw9f"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; buildInputs = [ libpcap ]; } diff --git a/pkgs/servers/etcd/deps.json b/pkgs/servers/etcd/deps.json deleted file mode 100644 index b5977a855515d..0000000000000 --- a/pkgs/servers/etcd/deps.json +++ /dev/null @@ -1,9 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/olekukonko/tablewriter", - "github.com/mattn/go-runewidth" - ] - } -] diff --git a/pkgs/servers/etcd/deps.nix b/pkgs/servers/etcd/deps.nix new file mode 100644 index 0000000000000..054b78d1f0c6d --- /dev/null +++ b/pkgs/servers/etcd/deps.nix @@ -0,0 +1,19 @@ +{ fetchgit }: +[ + { + goPackagePath = "github.com/olekukonko/tablewriter"; + src = fetchgit { + url = "https://github.com/olekukonko/tablewriter"; + rev = "cca8bbc0798408af109aaaa239cbd2634846b340"; + sha256 = "0f9ph3z7lh6p6gihbl1461j9yq5qiaqxr9mzdkp512n18v89ml48"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + src = fetchgit { + url = "https://github.com/mattn/go-runewidth"; + rev = "d6bea18f789704b5f83375793155289da36a3c7f"; + sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; + }; + } +] diff --git a/pkgs/servers/gotty/default.nix b/pkgs/servers/gotty/default.nix index b8718898f4bcc..6103990cd3f9a 100644 --- a/pkgs/servers/gotty/default.nix +++ b/pkgs/servers/gotty/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchgit }: buildGoPackage rec { name = "gotty-${version}"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "0gvnbr61d5si06ik2j075jg00r9b94ryfgg06nqxkf10dp8lgi09"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; meta = with stdenv.lib; { description = "Share your terminal as a web application"; diff --git a/pkgs/servers/gotty/deps.json b/pkgs/servers/gotty/deps.json deleted file mode 100644 index ff0016df62335..0000000000000 --- a/pkgs/servers/gotty/deps.json +++ /dev/null @@ -1,15 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/kr/pty", - "github.com/braintree/manners", - "github.com/codegangsta/cli", - "github.com/elazarl/go-bindata-assetfs", - "github.com/fatih/structs", - "github.com/gorilla/websocket", - "github.com/hashicorp/hcl", - "github.com/hashicorp/go-multierror" - ] - } -] diff --git a/pkgs/servers/gotty/deps.nix b/pkgs/servers/gotty/deps.nix new file mode 100644 index 0000000000000..2891dcb125fde --- /dev/null +++ b/pkgs/servers/gotty/deps.nix @@ -0,0 +1,67 @@ +{ fetchgit }: +[ + { + goPackagePath = "github.com/gorilla/websocket"; + src = fetchgit { + url = "https://github.com/gorilla/websocket"; + rev = "a622679ebd7a3b813862379232f645f8e690e43f"; + sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"; + }; + } + { + goPackagePath = "github.com/kr/pty"; + src = fetchgit { + url = "https://github.com/kr/pty"; + rev = "67e2db24c831afa6c64fc17b4a143390674365ef"; + sha256 = "1l3z3wbb112ar9br44m8g838z0pq2gfxcp5s3ka0xvm1hjvanw2d"; + }; + } + { + goPackagePath = "github.com/braintree/manners"; + src = fetchgit { + url = "https://github.com/braintree/manners"; + rev = "cab36f97339b1925cd89e158632728025557e550"; + sha256 = "1q508c62iiklghkhwqz9c0zsn9hrij7kqb93gdywzj7ms7x6hlfh"; + }; + } + { + goPackagePath = "github.com/codegangsta/cli"; + src = fetchgit { + url = "https://github.com/codegangsta/cli"; + rev = "71f57d300dd6a780ac1856c005c4b518cfd498ec"; + sha256 = "1fxznirkvank5461789dm5aw5z8aqi0jvwligvz44659rfl376p3"; + }; + } + { + goPackagePath = "github.com/elazarl/go-bindata-assetfs"; + src = fetchgit { + url = "https://github.com/elazarl/go-bindata-assetfs"; + rev = "d5cac425555ca5cf00694df246e04f05e6a55150"; + sha256 = "636ce247ff6f85c14f38a421f46662fa77bdc29762692e1f72b3cd1f9d7a1d17"; + }; + } + { + goPackagePath = "github.com/fatih/structs"; + src = fetchgit { + url = "https://github.com/fatih/structs"; + rev = "a9f7daa9c2729e97450c2da2feda19130a367d8f"; + sha256 = "0pyrc7svc826g37al3db19n5l4r2m9h1mlhjh3hz2r41xfaqia50"; + }; + } + { + goPackagePath = "github.com/hashicorp/hcl"; + src = fetchgit { + url = "https://github.com/hashicorp/hcl"; + rev = "54864211433d45cb780682431585b3e573b49e4a"; + sha256 = "07l2dydzjpdgm2d4a72hkmincn455j3nrafg6hs3c23bkvizj950"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-multierror"; + src = fetchgit { + url = "https://github.com/hashicorp/go-multierror"; + rev = "56912fb08d85084aa318edcf2bba735b97cf35c5"; + sha256 = "0s01cqdab2f7fxkkjjk2wqx05a1shnwlvfn45h2pi3i4gapvcn0r"; + }; + } +] diff --git a/pkgs/servers/interlock/default.nix b/pkgs/servers/interlock/default.nix index 5842495e323ed..1b184941570f1 100644 --- a/pkgs/servers/interlock/default.nix +++ b/pkgs/servers/interlock/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, sudo, utillinux, coreutils, systemd, cryptsetup, - buildGoPackage, fetchFromGitHub }: + buildGoPackage, fetchFromGitHub, fetchgit }: buildGoPackage rec { name = "interlock-${version}"; @@ -17,7 +17,7 @@ buildGoPackage rec { sha256 = "06aqx3jy744yx29xyg8ips0dw16186hfqbxdv3hfrmwxmaxhl4lz"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; nativeBuildInputs = [ sudo ]; buildFlags = [ "-tags textsecure" ]; diff --git a/pkgs/servers/interlock/deps.json b/pkgs/servers/interlock/deps.json deleted file mode 100644 index a501a3087d7be..0000000000000 --- a/pkgs/servers/interlock/deps.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "include": "../../../go-modules/libs.json", - "packages": [ - "github.com/Sirupsen/logrus", - "github.com/agl/ed25519", - "github.com/golang/protobuf", - "github.com/janimo/textsecure", - "golang.org/x/crypto", - "golang.org/x/net", - "gopkg.in/yaml.v2" - ] - } -] diff --git a/pkgs/servers/interlock/deps.nix b/pkgs/servers/interlock/deps.nix new file mode 100644 index 0000000000000..0a371d72a2eb3 --- /dev/null +++ b/pkgs/servers/interlock/deps.nix @@ -0,0 +1,59 @@ +{ fetchgit }: +[ + { + goPackagePath = "gopkg.in/yaml.v2"; + src = fetchgit { + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + src = fetchgit { + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/Sirupsen/logrus"; + src = fetchgit { + url = "https://github.com/Sirupsen/logrus"; + rev = "be52937128b38f1d99787bb476c789e2af1147f1"; + sha256 = "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4"; + }; + } + { + goPackagePath = "github.com/agl/ed25519"; + src = fetchgit { + url = "https://github.com/agl/ed25519"; + rev = "278e1ec8e8a6e017cd07577924d6766039146ced"; + sha256 = "165d89cc6dl28j4hkn86pny0jz3sa6hamzdvpvwdj4iha3x6lzc9"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + src = fetchgit { + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/janimo/textsecure"; + src = fetchgit { + url = "https://github.com/janimo/textsecure"; + rev = "c38f429e48d6b2776d17b4171f216f132185b0f6"; + sha256 = "191pwgfgphr0x04dwpvniax4wilpv52l25bw7d3igvnw302y7i94"; + }; + } + { + goPackagePath = "golang.org/x/net"; + src = fetchgit { + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } +] diff --git a/pkgs/servers/mesos-dns/default.nix b/pkgs/servers/mesos-dns/default.nix index 86944c036e497..246ca3057112c 100644 --- a/pkgs/servers/mesos-dns/default.nix +++ b/pkgs/servers/mesos-dns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchgit }: buildGoPackage rec { name = "mesos-dns-${version}"; @@ -17,5 +17,5 @@ buildGoPackage rec { sha256 = "0zs6lcgk43j7jp370qnii7n55cd9pa8gl56r8hy4nagfvlvrcm02"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; } diff --git a/pkgs/servers/mesos-dns/deps.json b/pkgs/servers/mesos-dns/deps.json deleted file mode 100644 index 8ac9d70584133..0000000000000 --- a/pkgs/servers/mesos-dns/deps.json +++ /dev/null @@ -1,18 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/gogo/protobuf", - "github.com/golang/glog", - "github.com/mesos/mesos-go", - "github.com/pmezard/go-difflib", - "github.com/samuel/go-zookeeper", - "github.com/stretchr/objx", - "github.com/davecgh/go-spew", - "github.com/emicklei/go-restful", - "github.com/stretchr/testify", - "github.com/miekg/dns", - "golang.org/x/net" - ] - } -] diff --git a/pkgs/servers/mesos-dns/deps.nix b/pkgs/servers/mesos-dns/deps.nix new file mode 100644 index 0000000000000..836c6e442d6cd --- /dev/null +++ b/pkgs/servers/mesos-dns/deps.nix @@ -0,0 +1,91 @@ +{ fetchgit }: +[ + { + goPackagePath = "golang.org/x/net"; + src = fetchgit { + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + src = fetchgit { + url = "https://github.com/miekg/dns"; + rev = "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa"; + sha256 = "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + src = fetchgit { + url = "https://github.com/gogo/protobuf"; + rev = "7883e1468d48d969e1c3ce4bcde89b6a7dd4adc4"; + sha256 = "16ja7lqq96q0pnzgnbwnh0j8qzvqgns1nfk8ndxgkg4sg93bg372"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + src = fetchgit { + url = "https://github.com/golang/glog"; + rev = "fca8c8854093a154ff1eb580aae10276ad6b1b5f"; + sha256 = "1nr2q0vas0a2f395f4shjxqpas18mjsf8yhgndsav7svngpbbpg8"; + }; + } + { + goPackagePath = "github.com/mesos/mesos-go"; + src = fetchgit { + url = "https://github.com/mesos/mesos-go"; + rev = "aaa5b2fecf0e2db463f4f996c89617d6766b2969"; + sha256 = "1pk1fpxksjln6kqvgm1igw3582jgrn14fwa8bdj5cwbpy6skjdvk"; + }; + } + { + goPackagePath = "github.com/pmezard/go-difflib"; + src = fetchgit { + url = "https://github.com/pmezard/go-difflib"; + rev = "d8ed2627bdf02c080bf22230dbb337003b7aba2d"; + sha256 = "0w1jp4k4zbnrxh3jvh8fgbjgqpf2hg31pbj8fb32kh26px9ldpbs"; + }; + } + { + goPackagePath = "github.com/samuel/go-zookeeper"; + src = fetchgit { + url = "https://github.com/samuel/go-zookeeper"; + rev = "5bb5cfc093ad18a28148c578f8632cfdb4d802e4"; + sha256 = "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z"; + }; + } + { + goPackagePath = "github.com/stretchr/objx"; + src = fetchgit { + url = "https://github.com/stretchr/objx"; + rev = "cbeaeb16a013161a98496fad62933b1d21786672"; + sha256 = "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + src = fetchgit { + url = "https://github.com/davecgh/go-spew"; + rev = "5215b55f46b2b919f50a1df0eaa5886afe4e3b3d"; + sha256 = "15h9kl73rdbzlfmsdxp13jja5gs7sknvqkpq2qizq3qv3nr1x8dk"; + }; + } + { + goPackagePath = "github.com/emicklei/go-restful"; + src = fetchgit { + url = "https://github.com/emicklei/go-restful"; + rev = "892402ba11a2e2fd5e1295dd633481f27365f14d"; + sha256 = "0gr9f53vayc6501a1kaw4p3h9pgf376cgxsfnr3f2dvp0xacvw8x"; + }; + } + { + goPackagePath = "github.com/stretchr/testify"; + src = fetchgit { + url = "https://github.com/stretchr/testify"; + rev = "089c7181b8c728499929ff09b62d3fdd8df8adff"; + sha256 = "03dzxkxbs298pvfsjz4kdadfaf9jkzsdhshqmg4p12wbyaj09s4p"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/cli.nix b/pkgs/servers/monitoring/prometheus/cli.nix index 21bc242ec467d..0fa6ea402ae3d 100644 --- a/pkgs/servers/monitoring/prometheus/cli.nix +++ b/pkgs/servers/monitoring/prometheus/cli.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchgit }: buildGoPackage rec { name = "prometheus_cli-${version}"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1qxqrcbd0d4mrjrgqz882jh7069nn5gz1b84rq7d7z1f1dqhczxn"; }; - goDeps = ./cli_deps.json; + goDeps = import ./cli_deps.nix { inherit fetchgit; }; meta = with stdenv.lib; { description = "Command line tool for querying the Prometheus HTTP API"; diff --git a/pkgs/servers/monitoring/prometheus/cli_deps.json b/pkgs/servers/monitoring/prometheus/cli_deps.json deleted file mode 100644 index 506263b51f243..0000000000000 --- a/pkgs/servers/monitoring/prometheus/cli_deps.json +++ /dev/null @@ -1,8 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/prometheus/client_golang" - ] - } -] diff --git a/pkgs/servers/monitoring/prometheus/cli_deps.nix b/pkgs/servers/monitoring/prometheus/cli_deps.nix new file mode 100644 index 0000000000000..4a65c7160006a --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/cli_deps.nix @@ -0,0 +1,11 @@ +{ fetchgit }: +[ + { + goPackagePath = "github.com/prometheus/client_golang"; + src = fetchgit { + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix index dc9b6fd843e29..91565eb566273 100644 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchgit, fetchhg }: buildGoPackage rec { name = "collectd-exporter-${version}"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1p0kb7c8g0r0sp5a6xrx8vnwbw14hhwlqzk4n2xx2y8pvnbivajz"; }; - goDeps = ./collectd-exporter_deps.json; + goDeps = import ./collectd-exporter_deps.nix { inherit fetchgit fetchhg; }; meta = with stdenv.lib; { description = "Relay server for exporting metrics from collectd to Prometheus"; diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.json b/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.json deleted file mode 100644 index ea82d4900ff2c..0000000000000 --- a/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/prometheus/client_golang", - "github.com/prometheus/client_model", - "github.com/prometheus/procfs", - "bitbucket.org/ww/goautoneg", - "github.com/beorn7/perks", - "github.com/golang/protobuf", - "github.com/matttproud/golang_protobuf_extensions" - ] - } -] diff --git a/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.nix new file mode 100644 index 0000000000000..242c612b30e73 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/collectd-exporter_deps.nix @@ -0,0 +1,59 @@ +{ fetchgit, fetchhg }: +[ + { + goPackagePath = "github.com/golang/protobuf"; + src = fetchgit { + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + src = fetchgit { + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + src = fetchgit { + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + src = fetchgit { + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + src = fetchgit { + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + src = fetchgit { + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + src = fetchhg { + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix index f2afd2aa27334..f1ccf6adb8f15 100644 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchgit, fetchhg }: buildGoPackage rec { name = "haproxy_exporter-${version}"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1jkijdawmnj5yps0yaj47nyfmcah0krwmqsjvicm3sl0dhwmac4w"; }; - goDeps = ./haproxy-exporter_deps.json; + goDeps = import ./haproxy-exporter_deps.nix { inherit fetchgit fetchhg; }; meta = with stdenv.lib; { description = "HAProxy Exporter for the Prometheus monitoring system"; diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.json b/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.json deleted file mode 100644 index 20a46eb370cf5..0000000000000 --- a/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.json +++ /dev/null @@ -1,14 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/prometheus/client_golang", - "github.com/prometheus/client_model", - "github.com/matttproud/golang_protobuf_extensions", - "github.com/prometheus/procfs", - "github.com/beorn7/perks", - "github.com/golang/protobuf", - "bitbucket.org/ww/goautoneg" - ] - } -] diff --git a/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.nix new file mode 100644 index 0000000000000..242c612b30e73 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/haproxy-exporter_deps.nix @@ -0,0 +1,59 @@ +{ fetchgit, fetchhg }: +[ + { + goPackagePath = "github.com/golang/protobuf"; + src = fetchgit { + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + src = fetchgit { + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + src = fetchgit { + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + src = fetchgit { + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + src = fetchgit { + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + src = fetchgit { + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + src = fetchhg { + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix index ddd7a17364bfe..8df4e34626a46 100644 --- a/pkgs/servers/monitoring/prometheus/mesos-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mesos-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchgit, fetchhg }: buildGoPackage rec { name = "mesos_exporter-${version}"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "059az73j717gd960g4jigrxnvqrjh9jw1c324xpwaafa0bf10llm"; }; - goDeps = ./mesos-exporter_deps.json; + goDeps = import ./mesos-exporter_deps.nix { inherit fetchgit fetchhg; }; meta = with stdenv.lib; { description = "Export Mesos metrics to Prometheus"; diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.json b/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.json deleted file mode 100644 index c250fb0495ee1..0000000000000 --- a/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.json +++ /dev/null @@ -1,16 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/golang/glog", - "github.com/prometheus/client_golang", - "github.com/prometheus/client_model", - "github.com/antonlindstrom/mesos_stats", - "github.com/beorn7/perks", - "github.com/golang/protobuf", - "github.com/matttproud/golang_protobuf_extensions", - "github.com/prometheus/procfs", - "bitbucket.org/ww/goautoneg" - ] - } -] diff --git a/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.nix new file mode 100644 index 0000000000000..991e3b14e7fd8 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/mesos-exporter_deps.nix @@ -0,0 +1,75 @@ +{ fetchgit, fetchhg }: +[ + { + goPackagePath = "github.com/golang/protobuf"; + src = fetchgit { + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + src = fetchgit { + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + src = fetchgit { + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + src = fetchgit { + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + src = fetchgit { + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + src = fetchgit { + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "github.com/golang/glog"; + src = fetchgit { + url = "https://github.com/golang/glog"; + rev = "fca8c8854093a154ff1eb580aae10276ad6b1b5f"; + sha256 = "1nr2q0vas0a2f395f4shjxqpas18mjsf8yhgndsav7svngpbbpg8"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + src = fetchhg { + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } + { + goPackagePath = "github.com/antonlindstrom/mesos_stats"; + src = fetchgit { + url = "https://github.com/antonlindstrom/mesos_stats"; + rev = "0c6ea494c19bedc67ebb85ce3d187ec21050e920"; + sha256 = "18ggyjf4nyn77gkn16wg9krp4dsphgzdgcr3mdflv6mvbr482ar4"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index 64a9e6cc28e36..b1113b1fc8b2a 100644 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchgit, fetchhg }: buildGoPackage rec { name = "mysqld_exporter-${version}"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "0pwf2vii9n9zgad1lxgw28c2743yc9c3qc03516fiwvlqc1cpddr"; }; - goDeps = ./mysqld-exporter_deps.json; + goDeps = import ./mysqld-exporter_deps.nix { inherit fetchgit fetchhg; }; meta = with stdenv.lib; { description = "Prometheus exporter for MySQL server metrics"; diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.json b/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.json deleted file mode 100644 index 42e2f263c53b0..0000000000000 --- a/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.json +++ /dev/null @@ -1,15 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/prometheus/client_golang", - "github.com/prometheus/client_model", - "github.com/matttproud/golang_protobuf_extensions", - "github.com/prometheus/procfs", - "github.com/beorn7/perks", - "github.com/golang/protobuf", - "bitbucket.org/ww/goautoneg", - "github.com/go-sql-driver/mysql" - ] - } -] diff --git a/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.nix new file mode 100644 index 0000000000000..dfeae6cdb3bab --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/mysqld-exporter_deps.nix @@ -0,0 +1,67 @@ +{ fetchgit, fetchhg }: +[ + { + goPackagePath = "github.com/golang/protobuf"; + src = fetchgit { + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + src = fetchgit { + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + src = fetchgit { + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + src = fetchgit { + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + src = fetchgit { + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + src = fetchgit { + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + src = fetchhg { + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } + { + goPackagePath = "github.com/go-sql-driver/mysql"; + src = fetchgit { + url = "https://github.com/go-sql-driver/mysql"; + rev = "fb7299726d2e68745a8805b14f2ff44b5c2cfa84"; + sha256 = "185af0x475hq2wmm2zdvxjyslkplf8zzqijdxa937zqxq63qiw4w"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 9adfdda1d077d..583bfa8379122 100644 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchgit, fetchhg }: buildGoPackage rec { name = "nginx_exporter-${version}"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "0p9j0bbr2lr734980x2p8d67lcify21glwc5k3i3j4ri4vadpxvc"; }; - goDeps = ./nginx-exporter_deps.json; + goDeps = import ./nginx-exporter_deps.nix { inherit fetchgit fetchhg; }; meta = with stdenv.lib; { description = "Metrics relay from nginx stats to Prometheus"; diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.json b/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.json deleted file mode 100644 index c7a2b3d1f6c60..0000000000000 --- a/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.json +++ /dev/null @@ -1,16 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/prometheus/log", - "github.com/prometheus/client_golang", - "github.com/prometheus/client_model", - "github.com/prometheus/procfs", - "github.com/Sirupsen/logrus", - "github.com/beorn7/perks", - "github.com/golang/protobuf", - "github.com/matttproud/golang_protobuf_extensions", - "bitbucket.org/ww/goautoneg" - ] - } -] diff --git a/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.nix b/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.nix new file mode 100644 index 0000000000000..b362bde99edee --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/nginx-exporter_deps.nix @@ -0,0 +1,75 @@ +{ fetchgit, fetchhg }: +[ + { + goPackagePath = "github.com/Sirupsen/logrus"; + src = fetchgit { + url = "https://github.com/Sirupsen/logrus"; + rev = "be52937128b38f1d99787bb476c789e2af1147f1"; + sha256 = "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + src = fetchgit { + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + src = fetchgit { + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + src = fetchgit { + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + src = fetchgit { + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + src = fetchgit { + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + src = fetchgit { + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + src = fetchhg { + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } + { + goPackagePath = "github.com/prometheus/log"; + src = fetchgit { + url = "https://github.com/prometheus/log"; + rev = "439e5db48fbb50ebbaf2c816030473a62f505f55"; + sha256 = "1fl23gsw2hn3c1y91qckr661sybqcw2gqnd1gllxn3hp6p2w6hxv"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/prom2json.nix b/pkgs/servers/monitoring/prometheus/prom2json.nix index 19148ec1cb40c..207490ec45b11 100644 --- a/pkgs/servers/monitoring/prometheus/prom2json.nix +++ b/pkgs/servers/monitoring/prometheus/prom2json.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchgit }: buildGoPackage rec { name = "prom2json-${version}"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "0wwh3mz7z81fwh8n78sshvj46akcgjhxapjgfic5afc4nv926zdl"; }; - goDeps = ./prom2json_deps.json; + goDeps = import ./prom2json_deps.nix { inherit fetchgit; }; meta = with stdenv.lib; { description = "Tool to scrape a Prometheus client and dump the result as JSON"; diff --git a/pkgs/servers/monitoring/prometheus/prom2json_deps.json b/pkgs/servers/monitoring/prometheus/prom2json_deps.json deleted file mode 100644 index a8569d8a25f87..0000000000000 --- a/pkgs/servers/monitoring/prometheus/prom2json_deps.json +++ /dev/null @@ -1,11 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/golang/protobuf", - "github.com/matttproud/golang_protobuf_extensions", - "github.com/prometheus/client_golang", - "github.com/prometheus/client_model" - ] - } -] diff --git a/pkgs/servers/monitoring/prometheus/prom2json_deps.nix b/pkgs/servers/monitoring/prometheus/prom2json_deps.nix new file mode 100644 index 0000000000000..f70fcc2a43768 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/prom2json_deps.nix @@ -0,0 +1,35 @@ +{ fetchgit }: +[ + { + goPackagePath = "github.com/golang/protobuf"; + src = fetchgit { + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + src = fetchgit { + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + src = fetchgit { + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + src = fetchgit { + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/pushgateway.nix b/pkgs/servers/monitoring/prometheus/pushgateway.nix index 65dda2403fcaa..bf3580a93a593 100644 --- a/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, go, buildGoPackage, go-bindata, fetchFromGitHub }: +{ stdenv, lib, go, buildGoPackage, go-bindata, fetchFromGitHub, fetchgit, fetchhg }: buildGoPackage rec { name = "pushgateway-${version}"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1bj0s4s3gbcnlp2z2yx7jf3jx14cdg2v4pr0yciai0g6jwwg63hd"; }; - goDeps = ./pushgateway_deps.json; + goDeps = import ./pushgateway_deps.nix { inherit fetchgit fetchhg; }; buildInputs = [ go-bindata ]; diff --git a/pkgs/servers/monitoring/prometheus/pushgateway_deps.json b/pkgs/servers/monitoring/prometheus/pushgateway_deps.json deleted file mode 100644 index 15e2815e0e2fe..0000000000000 --- a/pkgs/servers/monitoring/prometheus/pushgateway_deps.json +++ /dev/null @@ -1,15 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/julienschmidt/httprouter", - "github.com/prometheus/client_golang", - "github.com/prometheus/client_model", - "bitbucket.org/ww/goautoneg", - "github.com/golang/protobuf", - "github.com/matttproud/golang_protobuf_extensions", - "github.com/prometheus/procfs", - "github.com/beorn7/perks" - ] - } -] diff --git a/pkgs/servers/monitoring/prometheus/pushgateway_deps.nix b/pkgs/servers/monitoring/prometheus/pushgateway_deps.nix new file mode 100644 index 0000000000000..0a71b639f1c85 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/pushgateway_deps.nix @@ -0,0 +1,67 @@ +{ fetchgit, fetchhg }: +[ + { + goPackagePath = "github.com/golang/protobuf"; + src = fetchgit { + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + src = fetchgit { + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + src = fetchgit { + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + src = fetchgit { + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + src = fetchgit { + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + src = fetchgit { + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + src = fetchhg { + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } + { + goPackagePath = "github.com/julienschmidt/httprouter"; + src = fetchgit { + url = "https://github.com/julienschmidt/httprouter"; + rev = "6aacfd5ab513e34f7e64ea9627ab9670371b34e7"; + sha256 = "00rrjysmq898qcrf2hfwfh9s70vwvmjx2kp5w03nz1krxa4zhrkl"; + }; + } +] diff --git a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix index 935692bfa2e08..ff7b85623d575 100644 --- a/pkgs/servers/monitoring/prometheus/statsd-bridge.nix +++ b/pkgs/servers/monitoring/prometheus/statsd-bridge.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchgit, fetchhg }: buildGoPackage rec { name = "statsd_bridge-${version}"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1gg9v224n05khcwy27637w3rwh0cymm7hx6bginfxd7730rmpp2r"; }; - goDeps = ./statsd-bridge_deps.json; + goDeps = import ./statsd-bridge_deps.nix { inherit fetchgit fetchhg; }; meta = with stdenv.lib; { description = "Receives StatsD-style metrics and exports them to Prometheus"; diff --git a/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.json b/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.json deleted file mode 100644 index cda65257317d0..0000000000000 --- a/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.json +++ /dev/null @@ -1,15 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/howeyc/fsnotify", - "github.com/prometheus/client_golang", - "github.com/prometheus/client_model", - "bitbucket.org/ww/goautoneg", - "github.com/beorn7/perks", - "github.com/golang/protobuf", - "github.com/matttproud/golang_protobuf_extensions", - "github.com/prometheus/procfs" - ] - } -] diff --git a/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.nix b/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.nix new file mode 100644 index 0000000000000..27bd13aa28a39 --- /dev/null +++ b/pkgs/servers/monitoring/prometheus/statsd-bridge_deps.nix @@ -0,0 +1,67 @@ +{ fetchgit, fetchhg }: +[ + { + goPackagePath = "github.com/golang/protobuf"; + src = fetchgit { + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + src = fetchgit { + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + src = fetchgit { + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + src = fetchgit { + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + src = fetchgit { + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + src = fetchgit { + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + src = fetchhg { + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } + { + goPackagePath = "github.com/howeyc/fsnotify"; + src = fetchgit { + url = "https://github.com/fsnotify/fsnotify"; + rev = "ea925a0a47d225b2ca7f9932b01d2ed4f3ec74f6"; + sha256 = "15wqjpkfzsxnaxbz6y4r91hw6812g3sc4ipagxw1bya9klbnkdc9"; + }; + } +] diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index f0eb408cbc12e..51f430c6a1248 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchFromGitHub, src, version }: +{ lib, buildGoPackage, fetchFromGitHub, fetchgit, src, version }: buildGoPackage rec { name = "influxdb-${version}"; @@ -9,9 +9,10 @@ buildGoPackage rec { inherit src; + # TODO: `gdm2nix.rb` should produce deps.nix # Generated with the `gdm2nix.rb` script and the `Godeps` file from the # influxdb repo root. - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; meta = with lib; { description = "An open-source distributed time series database"; diff --git a/pkgs/servers/nosql/influxdb/deps.json b/pkgs/servers/nosql/influxdb/deps.json deleted file mode 100644 index 33388cc0fb79b..0000000000000 --- a/pkgs/servers/nosql/influxdb/deps.json +++ /dev/null @@ -1,200 +0,0 @@ -[ - { - "goPackagePath": "collectd.org", - "fetch": { - "type": "git", - "url": "https://github.com/collectd/go-collectd.git", - "rev": "9fc824c70f713ea0f058a07b49a4c563ef2a3b98", - "sha256": "0kjal6bsjpnppfnlqbg7g56xwssaj2ani499yykyj817zq56hi0w" - } - }, - { - "goPackagePath": "github.com/BurntSushi/toml", - "fetch": { - "type": "git", - "url": "https://github.com/BurntSushi/toml.git", - "rev": "a4eecd407cf4129fc902ece859a0114e4cf1a7f4", - "sha256": "1l74zvd534k2fs73gmaq4mgl48p1i9559k1gwq4vakca727z5sgf" - } - }, - { - "goPackagePath": "github.com/armon/go-metrics", - "fetch": { - "type": "git", - "url": "https://github.com/armon/go-metrics.git", - "rev": "345426c77237ece5dab0e1605c3e4b35c3f54757", - "sha256": "13bp2ykqhnhzif7wzrwsg54c2b0czhgs9csbvzbvc93n72s59jh5" - } - }, - { - "goPackagePath": "github.com/bmizerany/pat", - "fetch": { - "type": "git", - "url": "https://github.com/bmizerany/pat.git", - "rev": "b8a35001b773c267eb260a691f4e5499a3531600", - "sha256": "11zxd45rvjm6cn3wzbi18wy9j4vr1r1hgg6gzlqnxffiizkycxmz" - } - }, - { - "goPackagePath": "github.com/boltdb/bolt", - "fetch": { - "type": "git", - "url": "https://github.com/boltdb/bolt.git", - "rev": "2f846c3551b76d7710f159be840d66c3d064abbe", - "sha256": "0cvpcgmzlrn87jqrflwf4pciz6i25ri1r83sq7v1z9zry1ah16r5" - } - }, - { - "goPackagePath": "github.com/davecgh/go-spew", - "fetch": { - "type": "git", - "url": "https://github.com/davecgh/go-spew.git", - "rev": "fc32781af5e85e548d3f1abaf0fa3dbe8a72495c", - "sha256": "1dwwd4va0qnyr256i7n8d4g24d7yyvwd0975y6v4dy06qpwir232" - } - }, - { - "goPackagePath": "github.com/dgryski/go-bits", - "fetch": { - "type": "git", - "url": "https://github.com/dgryski/go-bits.git", - "rev": "86c69b3c986f9d40065df5bd8f765796549eef2e", - "sha256": "08i3p8lcisr88gmwvi8qdc8bgksxh5ydjspgfbi4aba9msybp78b" - } - }, - { - "goPackagePath": "github.com/dgryski/go-bitstream", - "fetch": { - "type": "git", - "url": "https://github.com/dgryski/go-bitstream.git", - "rev": "27cd5973303fde7d914860be1ea4b927a6be0c92", - "sha256": "12ji4vcfy0cz12yq43cz0w1f1k4c1kg0vwpsk1iy47kc38kzdkc6" - } - }, - { - "goPackagePath": "github.com/gogo/protobuf", - "fetch": { - "type": "git", - "url": "https://github.com/gogo/protobuf.git", - "rev": "74b6e9deaff6ba6da1389ec97351d337f0d08b06", - "sha256": "0045fz4bx72rikm2ggx9j1h3yrq518299qwaizrgy5jvxzj1707b" - } - }, - { - "goPackagePath": "github.com/golang/snappy", - "fetch": { - "type": "git", - "url": "https://github.com/golang/snappy.git", - "rev": "5979233c5d6225d4a8e438cdd0b411888449ddab", - "sha256": "0i0pvwc2a4xgsns6mr3xbc6p0sra34qsaagd7yf7v1as0z7ydl3s" - } - }, - { - "goPackagePath": "github.com/hashicorp/go-msgpack", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/go-msgpack.git", - "rev": "fa3f63826f7c23912c15263591e65d54d080b458", - "sha256": "1f6rd6bm2dm2rk46x8cqrxh5nks1gpk6dvvsag7s5pdjgdxy951k" - } - }, - { - "goPackagePath": "github.com/hashicorp/raft", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/raft.git", - "rev": "8fd9a2fdfd154f4b393aa24cff91e3c317efe839", - "sha256": "04k03x6r6h2xwxfvbzicfdblifdjn35agw9kwla6akw6l54ygy0f" - } - }, - { - "goPackagePath": "github.com/hashicorp/raft-boltdb", - "fetch": { - "type": "git", - "url": "https://github.com/hashicorp/raft-boltdb.git", - "rev": "d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee", - "sha256": "0p609w6x0h6bapx4b0d91dxnp2kj7dv0534q4blyxp79shv2a8ia" - } - }, - { - "goPackagePath": "github.com/influxdata/usage-client", - "fetch": { - "type": "git", - "url": "https://github.com/influxdata/usage-client.git", - "rev": "475977e68d79883d9c8d67131c84e4241523f452", - "sha256": "0yhywablqqpd2x70rax1kf7yaw1jpvrc2gks8360cwisda57d3qy" - } - }, - { - "goPackagePath": "github.com/jwilder/encoding", - "fetch": { - "type": "git", - "url": "https://github.com/jwilder/encoding.git", - "rev": "b421ab402545ef5a119f4f827784c6551d9bfc37", - "sha256": "0sjz2cl8kpni0mh0y4269k417dj06gn2y0ppi25i3wh9p4j4i4fq" - } - }, - { - "goPackagePath": "github.com/kimor79/gollectd", - "fetch": { - "type": "git", - "url": "https://github.com/kimor79/gollectd.git", - "rev": "61d0deeb4ffcc167b2a1baa8efd72365692811bc", - "sha256": "0als2v4d5hlw0sqam670p3fi471ikgl3l81bp31mf3s3jssdxwfs" - } - }, - { - "goPackagePath": "github.com/paulbellamy/ratecounter", - "fetch": { - "type": "git", - "url": "https://github.com/paulbellamy/ratecounter.git", - "rev": "5a11f585a31379765c190c033b6ad39956584447", - "sha256": "137p62imi91zhkjcjigdd64n7f9z6djjpsxcyifgrcxs41jj9ra0" - } - }, - { - "goPackagePath": "github.com/peterh/liner", - "fetch": { - "type": "git", - "url": "https://github.com/peterh/liner.git", - "rev": "82a939e738b0ee23e84ec7a12d8e216f4d95c53f", - "sha256": "1187c1rqmh9k9ap5bz3p9hbjp3ad5hysykh58kgv5clah1jbkg04" - } - }, - { - "goPackagePath": "github.com/rakyll/statik", - "fetch": { - "type": "git", - "url": "https://github.com/rakyll/statik.git", - "rev": "274df120e9065bdd08eb1120e0375e3dc1ae8465", - "sha256": "0llk7bxmk66wdiy42h32vj1jfk8zg351xq21hwhrq7gkfljghffp" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://github.com/golang/crypto.git", - "rev": "1f22c0103821b9390939b6776727195525381532", - "sha256": "1acy12f396sr3lrnbcnym5q72qnlign5bagving41qijzjnc219m" - } - }, - { - "goPackagePath": "golang.org/x/tools", - "fetch": { - "type": "git", - "url": "https://github.com/golang/tools.git", - "rev": "8b178a93c1f5b5c8f4e36cd6bd64e0d5bf0ee180", - "sha256": "0rqm56c4acrvyqsp53dkzr34pkz922x4rwknaslwlbkyc4gyg2c8" - } - }, - { - "goPackagePath": "gopkg.in/fatih/pool.v2", - "fetch": { - "type": "git", - "url": "https://github.com/fatih/pool.git", - "rev": "cba550ebf9bce999a02e963296d4bc7a486cb715", - "sha256": "1jlrakgnpvhi2ny87yrsj1gyrcncfzdhypa9i2mlvvzqlj4r0dn0" - } - } -] \ No newline at end of file diff --git a/pkgs/servers/nosql/influxdb/deps.nix b/pkgs/servers/nosql/influxdb/deps.nix new file mode 100644 index 0000000000000..9ec8167595ee3 --- /dev/null +++ b/pkgs/servers/nosql/influxdb/deps.nix @@ -0,0 +1,179 @@ +{ fetchgit }: +[ + { + goPackagePath = "collectd.org"; + src = fetchgit { + url = "https://github.com/collectd/go-collectd.git"; + rev = "9fc824c70f713ea0f058a07b49a4c563ef2a3b98"; + sha256 = "0kjal6bsjpnppfnlqbg7g56xwssaj2ani499yykyj817zq56hi0w"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + src = fetchgit { + url = "https://github.com/BurntSushi/toml.git"; + rev = "a4eecd407cf4129fc902ece859a0114e4cf1a7f4"; + sha256 = "1l74zvd534k2fs73gmaq4mgl48p1i9559k1gwq4vakca727z5sgf"; + }; + } + { + goPackagePath = "github.com/armon/go-metrics"; + src = fetchgit { + url = "https://github.com/armon/go-metrics.git"; + rev = "345426c77237ece5dab0e1605c3e4b35c3f54757"; + sha256 = "13bp2ykqhnhzif7wzrwsg54c2b0czhgs9csbvzbvc93n72s59jh5"; + }; + } + { + goPackagePath = "github.com/bmizerany/pat"; + src = fetchgit { + url = "https://github.com/bmizerany/pat.git"; + rev = "b8a35001b773c267eb260a691f4e5499a3531600"; + sha256 = "11zxd45rvjm6cn3wzbi18wy9j4vr1r1hgg6gzlqnxffiizkycxmz"; + }; + } + { + goPackagePath = "github.com/boltdb/bolt"; + src = fetchgit { + url = "https://github.com/boltdb/bolt.git"; + rev = "2f846c3551b76d7710f159be840d66c3d064abbe"; + sha256 = "0cvpcgmzlrn87jqrflwf4pciz6i25ri1r83sq7v1z9zry1ah16r5"; + }; + } + { + goPackagePath = "github.com/davecgh/go-spew"; + src = fetchgit { + url = "https://github.com/davecgh/go-spew.git"; + rev = "fc32781af5e85e548d3f1abaf0fa3dbe8a72495c"; + sha256 = "1dwwd4va0qnyr256i7n8d4g24d7yyvwd0975y6v4dy06qpwir232"; + }; + } + { + goPackagePath = "github.com/dgryski/go-bits"; + src = fetchgit { + url = "https://github.com/dgryski/go-bits.git"; + rev = "86c69b3c986f9d40065df5bd8f765796549eef2e"; + sha256 = "08i3p8lcisr88gmwvi8qdc8bgksxh5ydjspgfbi4aba9msybp78b"; + }; + } + { + goPackagePath = "github.com/dgryski/go-bitstream"; + src = fetchgit { + url = "https://github.com/dgryski/go-bitstream.git"; + rev = "27cd5973303fde7d914860be1ea4b927a6be0c92"; + sha256 = "12ji4vcfy0cz12yq43cz0w1f1k4c1kg0vwpsk1iy47kc38kzdkc6"; + }; + } + { + goPackagePath = "github.com/gogo/protobuf"; + src = fetchgit { + url = "https://github.com/gogo/protobuf.git"; + rev = "74b6e9deaff6ba6da1389ec97351d337f0d08b06"; + sha256 = "0045fz4bx72rikm2ggx9j1h3yrq518299qwaizrgy5jvxzj1707b"; + }; + } + { + goPackagePath = "github.com/golang/snappy"; + src = fetchgit { + url = "https://github.com/golang/snappy.git"; + rev = "5979233c5d6225d4a8e438cdd0b411888449ddab"; + sha256 = "0i0pvwc2a4xgsns6mr3xbc6p0sra34qsaagd7yf7v1as0z7ydl3s"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-msgpack"; + src = fetchgit { + url = "https://github.com/hashicorp/go-msgpack.git"; + rev = "fa3f63826f7c23912c15263591e65d54d080b458"; + sha256 = "1f6rd6bm2dm2rk46x8cqrxh5nks1gpk6dvvsag7s5pdjgdxy951k"; + }; + } + { + goPackagePath = "github.com/hashicorp/raft"; + src = fetchgit { + url = "https://github.com/hashicorp/raft.git"; + rev = "8fd9a2fdfd154f4b393aa24cff91e3c317efe839"; + sha256 = "04k03x6r6h2xwxfvbzicfdblifdjn35agw9kwla6akw6l54ygy0f"; + }; + } + { + goPackagePath = "github.com/hashicorp/raft-boltdb"; + src = fetchgit { + url = "https://github.com/hashicorp/raft-boltdb.git"; + rev = "d1e82c1ec3f15ee991f7cc7ffd5b67ff6f5bbaee"; + sha256 = "0p609w6x0h6bapx4b0d91dxnp2kj7dv0534q4blyxp79shv2a8ia"; + }; + } + { + goPackagePath = "github.com/influxdata/usage-client"; + src = fetchgit { + url = "https://github.com/influxdata/usage-client.git"; + rev = "475977e68d79883d9c8d67131c84e4241523f452"; + sha256 = "0yhywablqqpd2x70rax1kf7yaw1jpvrc2gks8360cwisda57d3qy"; + }; + } + { + goPackagePath = "github.com/jwilder/encoding"; + src = fetchgit { + url = "https://github.com/jwilder/encoding.git"; + rev = "b421ab402545ef5a119f4f827784c6551d9bfc37"; + sha256 = "0sjz2cl8kpni0mh0y4269k417dj06gn2y0ppi25i3wh9p4j4i4fq"; + }; + } + { + goPackagePath = "github.com/kimor79/gollectd"; + src = fetchgit { + url = "https://github.com/kimor79/gollectd.git"; + rev = "61d0deeb4ffcc167b2a1baa8efd72365692811bc"; + sha256 = "0als2v4d5hlw0sqam670p3fi471ikgl3l81bp31mf3s3jssdxwfs"; + }; + } + { + goPackagePath = "github.com/paulbellamy/ratecounter"; + src = fetchgit { + url = "https://github.com/paulbellamy/ratecounter.git"; + rev = "5a11f585a31379765c190c033b6ad39956584447"; + sha256 = "137p62imi91zhkjcjigdd64n7f9z6djjpsxcyifgrcxs41jj9ra0"; + }; + } + { + goPackagePath = "github.com/peterh/liner"; + src = fetchgit { + url = "https://github.com/peterh/liner.git"; + rev = "82a939e738b0ee23e84ec7a12d8e216f4d95c53f"; + sha256 = "1187c1rqmh9k9ap5bz3p9hbjp3ad5hysykh58kgv5clah1jbkg04"; + }; + } + { + goPackagePath = "github.com/rakyll/statik"; + src = fetchgit { + url = "https://github.com/rakyll/statik.git"; + rev = "274df120e9065bdd08eb1120e0375e3dc1ae8465"; + sha256 = "0llk7bxmk66wdiy42h32vj1jfk8zg351xq21hwhrq7gkfljghffp"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + src = fetchgit { + url = "https://github.com/golang/crypto.git"; + rev = "1f22c0103821b9390939b6776727195525381532"; + sha256 = "1acy12f396sr3lrnbcnym5q72qnlign5bagving41qijzjnc219m"; + }; + } + { + goPackagePath = "golang.org/x/tools"; + src = fetchgit { + url = "https://github.com/golang/tools.git"; + rev = "8b178a93c1f5b5c8f4e36cd6bd64e0d5bf0ee180"; + sha256 = "0rqm56c4acrvyqsp53dkzr34pkz922x4rwknaslwlbkyc4gyg2c8"; + }; + } + { + goPackagePath = "gopkg.in/fatih/pool.v2"; + src = fetchgit { + url = "https://github.com/fatih/pool.git"; + rev = "cba550ebf9bce999a02e963296d4bc7a486cb715"; + sha256 = "1jlrakgnpvhi2ny87yrsj1gyrcncfzdhypa9i2mlvvzqlj4r0dn0"; + }; + } +] diff --git a/pkgs/servers/nosql/influxdb/v0.nix b/pkgs/servers/nosql/influxdb/v0.nix index fca5f8ba622a3..556c67eae67c0 100644 --- a/pkgs/servers/nosql/influxdb/v0.nix +++ b/pkgs/servers/nosql/influxdb/v0.nix @@ -1,4 +1,4 @@ -{ lib, buildGoPackage, fetchFromGitHub }@args: +{ lib, buildGoPackage, fetchFromGitHub, fetchgit }@args: import ./default.nix (args // rec { diff --git a/pkgs/servers/nsq/default.nix b/pkgs/servers/nsq/default.nix index 334b78c91289f..6c43db29aa52d 100644 --- a/pkgs/servers/nsq/default.nix +++ b/pkgs/servers/nsq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchgit }: buildGoPackage rec { name = "nsq-${version}"; @@ -14,5 +14,5 @@ buildGoPackage rec { sha256 = "1r7jgplzn6bgwhd4vn8045n6cmm4iqbzssbjgj7j1c28zbficy2f"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; } diff --git a/pkgs/servers/nsq/deps.json b/pkgs/servers/nsq/deps.json deleted file mode 100644 index e23d3e15f669f..0000000000000 --- a/pkgs/servers/nsq/deps.json +++ /dev/null @@ -1,16 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/mreiferson/go-snappystream", - "github.com/bitly/go-nsq", - "github.com/bitly/go-simplejson", - "github.com/blang/semver", - "github.com/bmizerany/perks", - "github.com/BurntSushi/toml", - "github.com/bitly/go-hostpool", - "github.com/bitly/timer_metrics", - "github.com/mreiferson/go-options" - ] - } -] diff --git a/pkgs/servers/nsq/deps.nix b/pkgs/servers/nsq/deps.nix new file mode 100644 index 0000000000000..90aef9d3f2c80 --- /dev/null +++ b/pkgs/servers/nsq/deps.nix @@ -0,0 +1,75 @@ +{ fetchgit }: +[ + { + goPackagePath = "github.com/mreiferson/go-snappystream"; + src = fetchgit { + url = "https://github.com/mreiferson/go-snappystream"; + rev = "028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504"; + sha256 = "0jdd5whp74nvg35d9hzydsi3shnb1vrnd7shi9qz4wxap7gcrid6"; + }; + } + { + goPackagePath = "github.com/bitly/go-nsq"; + src = fetchgit { + url = "https://github.com/bitly/go-nsq"; + rev = "22a8bd48c443ec23bb559675b6df8284bbbdab29"; + sha256 = "06hrkwk84w8rshkanvfgmgbiml7n06ybv192dvibhwgk2wz2dl46"; + }; + } + { + goPackagePath = "github.com/bitly/go-simplejson"; + src = fetchgit { + url = "https://github.com/bitly/go-simplejson"; + rev = "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a"; + sha256 = "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy"; + }; + } + { + goPackagePath = "github.com/blang/semver"; + src = fetchgit { + url = "https://github.com/blang/semver"; + rev = "9bf7bff48b0388cb75991e58c6df7d13e982f1f2"; + sha256 = "11sinbf942dpyc9wdpidkhmqn438cfp5n8x3xqnmq9aszkld9hy7"; + }; + } + { + goPackagePath = "github.com/bmizerany/perks"; + src = fetchgit { + url = "https://github.com/bmizerany/perks"; + rev = "6cb9d9d729303ee2628580d9aec5db968da3a607"; + sha256 = "0cdh84hmn21is6hvv6dy9qjdcg9w3l2k8avlk0881a8cqm09s90j"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + src = fetchgit { + url = "https://github.com/BurntSushi/toml"; + rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; + sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + }; + } + { + goPackagePath = "github.com/bitly/go-hostpool"; + src = fetchgit { + url = "https://github.com/bitly/go-hostpool"; + rev = "d0e59c22a56e8dadfed24f74f452cea5a52722d2"; + sha256 = "14ph12krn5zlg00vh9g6g08lkfjxnpw46nzadrfb718yl1hgyk3g"; + }; + } + { + goPackagePath = "github.com/bitly/timer_metrics"; + src = fetchgit { + url = "https://github.com/bitly/timer_metrics"; + rev = "afad1794bb13e2a094720aeb27c088aa64564895"; + sha256 = "1b717vkwj63qb5kan4b92kx4rg6253l5mdb3lxpxrspy56a6rl0c"; + }; + } + { + goPackagePath = "github.com/mreiferson/go-options"; + src = fetchgit { + url = "https://github.com/mreiferson/go-options"; + rev = "7c174072188d0cfbe6f01bb457626abb22bdff52"; + sha256 = "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm"; + }; + } +] diff --git a/pkgs/servers/oauth2_proxy/default.nix b/pkgs/servers/oauth2_proxy/default.nix index 3e3bcea46a25b..0fd3db3770796 100644 --- a/pkgs/servers/oauth2_proxy/default.nix +++ b/pkgs/servers/oauth2_proxy/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchgit }: buildGoPackage rec { name = "oauth2_proxy-${version}"; @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "13f6kaq15f6ial9gqzrsx7i94jhd5j70js2k93qwxcw1vkh1b6si"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; } diff --git a/pkgs/servers/oauth2_proxy/deps.json b/pkgs/servers/oauth2_proxy/deps.json deleted file mode 100644 index ac8ac3d8ca21a..0000000000000 --- a/pkgs/servers/oauth2_proxy/deps.json +++ /dev/null @@ -1,16 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "google.golang.org/api", - "google.golang.org/cloud", - "golang.org/x/oauth2", - "github.com/18F/hmacauth", - "github.com/mreiferson/go-options", - "github.com/BurntSushi/toml", - "github.com/bitly/go-simplejson", - "golang.org/x/net", - "gopkg.in/fsnotify.v1" - ] - } -] diff --git a/pkgs/servers/oauth2_proxy/deps.nix b/pkgs/servers/oauth2_proxy/deps.nix new file mode 100644 index 0000000000000..0b568a6063873 --- /dev/null +++ b/pkgs/servers/oauth2_proxy/deps.nix @@ -0,0 +1,75 @@ +{ fetchgit }: +[ + { + goPackagePath = "gopkg.in/fsnotify.v1"; + src = fetchgit { + url = "https://gopkg.in/fsnotify.v1"; + rev = "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0"; + sha256 = "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2"; + }; + } + { + goPackagePath = "golang.org/x/net"; + src = fetchgit { + url = "https://go.googlesource.com/net"; + rev = "62ac18b461605b4be188bbc7300e9aa2bc836cd4"; + sha256 = "0lwwvbbwbf3yshxkfhn6z20gd45dkvnmw2ms36diiy34krgy402p"; + }; + } + { + goPackagePath = "github.com/bitly/go-simplejson"; + src = fetchgit { + url = "https://github.com/bitly/go-simplejson"; + rev = "18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a"; + sha256 = "0lj9cxyncchlw6p35j0yym5q5waiz0giw6ri41qdwm8y3dghwwiy"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + src = fetchgit { + url = "https://github.com/BurntSushi/toml"; + rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; + sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + }; + } + { + goPackagePath = "github.com/mreiferson/go-options"; + src = fetchgit { + url = "https://github.com/mreiferson/go-options"; + rev = "7c174072188d0cfbe6f01bb457626abb22bdff52"; + sha256 = "0ksyi2cb4k6r2fxamljg42qbz5hdcb9kv5i7y6cx4ajjy0xznwgm"; + }; + } + { + goPackagePath = "google.golang.org/api"; + src = fetchgit { + url = "https://code.googlesource.com/google-api-go-client"; + rev = "a5c3e2a4792aff40e59840d9ecdff0542a202a80"; + sha256 = "1kigddnbyrl9ddpj5rs8njvf1ck54ipi4q1282k0d6b3am5qfbj8"; + }; + } + { + goPackagePath = "google.golang.org/cloud"; + src = fetchgit { + url = "https://code.googlesource.com/gocloud"; + rev = "6335269abf9002cf5a84613c13cda6010842b834"; + sha256 = "15xrqxna5ms0r634k3bfzyymn431dvqcjwbsap8ay60x371kzbwf"; + }; + } + { + goPackagePath = "golang.org/x/oauth2"; + src = fetchgit { + url = "https://go.googlesource.com/oauth2"; + rev = "397fe7649477ff2e8ced8fc0b2696f781e53745a"; + sha256 = "0fza0l7iwh6llkq2yzqn7dxi138vab0da64lnghfj1p71fprjzn8"; + }; + } + { + goPackagePath = "github.com/18F/hmacauth"; + src = fetchgit { + url = "https://github.com/18F/hmacauth"; + rev = "9232a6386b737d7d1e5c1c6e817aa48d5d8ee7cd"; + sha256 = "056mcqrf2bv0g9gn2ixv19srk613h4sasl99w9375mpvmadb3pz1"; + }; + } +] diff --git a/pkgs/servers/serf/default.nix b/pkgs/servers/serf/default.nix index 4a37213846a19..476364b75a0fd 100644 --- a/pkgs/servers/serf/default.nix +++ b/pkgs/servers/serf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchgit }: buildGoPackage rec { name = "serf-${version}"; @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "1h05h5xhaj27r1mh5zshnykax29lqjhfc0bx4v9swiwb873c24qk"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; } diff --git a/pkgs/servers/serf/deps.json b/pkgs/servers/serf/deps.json deleted file mode 100644 index 3f13d0684797f..0000000000000 --- a/pkgs/servers/serf/deps.json +++ /dev/null @@ -1,23 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/armon/go-metrics", - "github.com/mattn/go-isatty", - "github.com/hashicorp/logutils", - "github.com/armon/go-radix", - "github.com/bgentry/speakeasy", - "github.com/hashicorp/go-syslog", - "github.com/hashicorp/memberlist", - "github.com/mitchellh/mapstructure", - "github.com/armon/circbuf", - "github.com/hashicorp/go-msgpack", - "github.com/hashicorp/go.net", - "github.com/hashicorp/mdns", - "github.com/mitchellh/cli", - "github.com/ryanuber/columnize", - "github.com/miekg/dns", - "golang.org/x/crypto" - ] - } -] diff --git a/pkgs/servers/serf/deps.nix b/pkgs/servers/serf/deps.nix new file mode 100644 index 0000000000000..df37ec383bd53 --- /dev/null +++ b/pkgs/servers/serf/deps.nix @@ -0,0 +1,123 @@ +{ fetchgit }: +[ + { + goPackagePath = "golang.org/x/crypto"; + src = fetchgit { + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + src = fetchgit { + url = "https://github.com/miekg/dns"; + rev = "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa"; + sha256 = "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl"; + }; + } + { + goPackagePath = "github.com/armon/go-metrics"; + src = fetchgit { + url = "https://github.com/armon/go-metrics"; + rev = "b2d95e5291cdbc26997d1301a5e467ecbb240e25"; + sha256 = "1jvdf98jlbyzbb9w159nifvv8fihrcs66drnl8pilqdjpmkmyyck"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + src = fetchgit { + url = "https://github.com/mattn/go-isatty"; + rev = "ae0b1f8f8004be68d791a576e3d8e7648ab41449"; + sha256 = "0qrcsh7j9mxcaspw8lfxh9hhflz55vj4aq1xy00v78301czq6jlj"; + }; + } + { + goPackagePath = "github.com/hashicorp/logutils"; + src = fetchgit { + url = "https://github.com/hashicorp/logutils"; + rev = "0dc08b1671f34c4250ce212759ebd880f743d883"; + sha256 = "0rynhjwvacv9ibl2k4fwz0xy71d583ac4p33gm20k9yldqnznc7r"; + }; + } + { + goPackagePath = "github.com/armon/go-radix"; + src = fetchgit { + url = "https://github.com/armon/go-radix"; + rev = "fbd82e84e2b13651f3abc5ffd26b65ba71bc8f93"; + sha256 = "16y64r1v054c2ln0bi5mrqq1cmvy6d6pnxk1glb8lw2g31ksa80c"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-syslog"; + src = fetchgit { + url = "https://github.com/hashicorp/go-syslog"; + rev = "42a2b573b664dbf281bd48c3cc12c086b17a39ba"; + sha256 = "1j53m2wjyczm9m55znfycdvm4c8vfniqgk93dvzwy8vpj5gm6sb3"; + }; + } + { + goPackagePath = "github.com/hashicorp/memberlist"; + src = fetchgit { + url = "https://github.com/hashicorp/memberlist"; + rev = "6025015f2dc659ca2c735112d37e753bda6e329d"; + sha256 = "01s2gwnbgvwz4wshz9d4za0p12ji4fnapnlmz3jwfcmcwjpyqfb7"; + }; + } + { + goPackagePath = "github.com/mitchellh/mapstructure"; + src = fetchgit { + url = "https://github.com/mitchellh/mapstructure"; + rev = "281073eb9eb092240d33ef253c404f1cca550309"; + sha256 = "1zjx9fv29639sp1fn84rxs830z7gp7bs38yd5y1hl5adb8s5x1mh"; + }; + } + { + goPackagePath = "github.com/armon/circbuf"; + src = fetchgit { + url = "https://github.com/armon/circbuf"; + rev = "f092b4f207b6e5cce0569056fba9e1a2735cb6cf"; + sha256 = "06kwwdwa3hskdh6ws7clj1vim80dyc3ldim8k9y5qpd30x0avn5s"; + }; + } + { + goPackagePath = "github.com/hashicorp/mdns"; + src = fetchgit { + url = "https://github.com/hashicorp/mdns"; + rev = "2b439d37011456df8ff83a70ffd1cd6046410113"; + sha256 = "17zwk212zmyramnjylpvvrvbbsz0qb5crkhly6yiqkyll3qzpb96"; + }; + } + { + goPackagePath = "github.com/mitchellh/cli"; + src = fetchgit { + url = "https://github.com/mitchellh/cli"; + rev = "8102d0ed5ea2709ade1243798785888175f6e415"; + sha256 = "08mj1l94pww72jy34gk9a483hpic0rrackskfw13r3ycy997w7m2"; + }; + } + { + goPackagePath = "github.com/ryanuber/columnize"; + src = fetchgit { + url = "https://github.com/ryanuber/columnize"; + rev = "44cb4788b2ec3c3d158dd3d1b50aba7d66f4b59a"; + sha256 = "1qrqr76cw58x2hkjic6h88na5ihgvkmp8mqapj8kmjcjzdxkzhr9"; + }; + } + { + goPackagePath = "github.com/hashicorp/go-msgpack"; + src = fetchgit { + url = "https://github.com/ugorji/go"; + rev = "03e33114d4d60a1f37150325e15f51b0fa6fc4f6"; + sha256 = "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v"; + }; + } + { + goPackagePath = "github.com/hashicorp/go.net"; + src = fetchgit { + url = "https://github.com/hashicorp/go.net"; + rev = "104dcad90073cd8d1e6828b2af19185b60cf3e29"; + sha256 = "0pfi09h4q6w2x833qxr8r609ml4kw1flqm265j752sb08sbf3zwf"; + }; + } +] diff --git a/pkgs/servers/skydns/default.nix b/pkgs/servers/skydns/default.nix index 657352634efcb..6c9ca24a92ac8 100644 --- a/pkgs/servers/skydns/default.nix +++ b/pkgs/servers/skydns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchgit, fetchhg }: buildGoPackage rec { name = "skydns-${version}"; @@ -14,5 +14,5 @@ buildGoPackage rec { sha256 = "0i1iaif79cwnwm7pc8nxfa261cgl4zhm3p2a5a3smhy1ibgccpq7"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit fetchhg; }; } diff --git a/pkgs/servers/skydns/deps.json b/pkgs/servers/skydns/deps.json deleted file mode 100644 index 446f60f3279df..0000000000000 --- a/pkgs/servers/skydns/deps.json +++ /dev/null @@ -1,21 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/miekg/dns", - "github.com/prometheus/client_golang", - "github.com/prometheus/client_model", - "bitbucket.org/ww/goautoneg", - "github.com/prometheus/common", - "github.com/prometheus/procfs", - "github.com/coreos/go-systemd", - "github.com/matttproud/golang_protobuf_extensions", - "github.com/ugorji/go", - "github.com/golang/protobuf", - "github.com/stathat/go", - "github.com/beorn7/perks", - "github.com/coreos/go-etcd", - "github.com/rcrowley/go-metrics" - ] - } -] diff --git a/pkgs/servers/skydns/deps.nix b/pkgs/servers/skydns/deps.nix new file mode 100644 index 0000000000000..8ff072601188b --- /dev/null +++ b/pkgs/servers/skydns/deps.nix @@ -0,0 +1,115 @@ +{ fetchgit, fetchhg }: +[ + { + goPackagePath = "github.com/golang/protobuf"; + src = fetchgit { + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/coreos/go-systemd"; + src = fetchgit { + url = "https://github.com/coreos/go-systemd"; + rev = "a606a1e936df81b70d85448221c7b1c6d8a74ef1"; + sha256 = "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28"; + }; + } + { + goPackagePath = "github.com/rcrowley/go-metrics"; + src = fetchgit { + url = "https://github.com/rcrowley/go-metrics"; + rev = "1ce93efbc8f9c568886b2ef85ce305b2217b3de3"; + sha256 = "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa"; + }; + } + { + goPackagePath = "github.com/prometheus/client_model"; + src = fetchgit { + url = "https://github.com/prometheus/client_model"; + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; + }; + } + { + goPackagePath = "github.com/prometheus/common"; + src = fetchgit { + url = "https://github.com/prometheus/common"; + rev = "40456948a47496dc22168e6af39297a2f8fbf38c"; + sha256 = "15700w18pifng0l2isa6v25y91r5rb7yfgljqw2g2gqrvac6sr5l"; + }; + } + { + goPackagePath = "github.com/beorn7/perks"; + src = fetchgit { + url = "https://github.com/beorn7/perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; + }; + } + { + goPackagePath = "github.com/coreos/go-etcd"; + src = fetchgit { + url = "https://github.com/coreos/go-etcd"; + rev = "9847b93751a5fbaf227b893d172cee0104ac6427"; + sha256 = "1ihq01ayqzxvn6hca5j00vl189vi5lm78f0fy2wpk5mrm3xi01l4"; + }; + } + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + src = fetchgit { + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; + }; + } + { + goPackagePath = "github.com/prometheus/client_golang"; + src = fetchgit { + url = "https://github.com/prometheus/client_golang"; + rev = "6dbab8106ed3ed77359ac85d9cf08e30290df864"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; + }; + } + { + goPackagePath = "github.com/stathat/go"; + src = fetchgit { + url = "https://github.com/stathat/go"; + rev = "91dfa3a59c5b233fef9a346a1460f6e2bc889d93"; + sha256 = "105ql5v8r4hqcsq0ag7asdxqg9n7rvf83y1q1dj2nfjyn4manv6r"; + }; + } + { + goPackagePath = "github.com/ugorji/go"; + src = fetchgit { + url = "https://github.com/ugorji/go"; + rev = "03e33114d4d60a1f37150325e15f51b0fa6fc4f6"; + sha256 = "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v"; + }; + } + { + goPackagePath = "github.com/miekg/dns"; + src = fetchgit { + url = "https://github.com/miekg/dns"; + rev = "7e024ce8ce18b21b475ac6baf8fa3c42536bf2fa"; + sha256 = "0hlwb52lnnj3c6papjk9i5w5cjdw6r7c891v4xksnfvk1f9cy9kl"; + }; + } + { + goPackagePath = "github.com/prometheus/procfs"; + src = fetchgit { + url = "https://github.com/prometheus/procfs"; + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; + }; + } + { + goPackagePath = "bitbucket.org/ww/goautoneg"; + src = fetchhg { + url = "bitbucket.org/ww/goautoneg"; + rev = "75cd24fc2f2c2a2088577d12123ddee5f54e0675"; + sha256 = "19khhn5xhqv1yp7d6k987gh5w5rhrjnp4p0c6fyrd8z6lzz5h9qi"; + }; + } +] diff --git a/pkgs/shells/elvish/default.nix b/pkgs/shells/elvish/default.nix index 021d4f074edd9..3bfb9f077a48a 100644 --- a/pkgs/shells/elvish/default.nix +++ b/pkgs/shells/elvish/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchgit }: buildGoPackage rec { name = "elvish-${version}"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "1xwhjbw0y6j5xy19hz39456l0v6vjg2icd7c1jx4h1cydk3yn39f"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; meta = with stdenv.lib; { description = "A Novel unix shell in go language"; diff --git a/pkgs/shells/elvish/deps.json b/pkgs/shells/elvish/deps.json deleted file mode 100644 index 827614a4268f6..0000000000000 --- a/pkgs/shells/elvish/deps.json +++ /dev/null @@ -1,9 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/mattn/go-sqlite3", - "github.com/elves/getopt" - ] - } -] diff --git a/pkgs/shells/elvish/deps.nix b/pkgs/shells/elvish/deps.nix new file mode 100644 index 0000000000000..067c1d3645861 --- /dev/null +++ b/pkgs/shells/elvish/deps.nix @@ -0,0 +1,19 @@ +{ fetchgit }: +[ + { + goPackagePath = "github.com/elves/getopt"; + src = fetchgit { + url = "https://github.com/elves/getopt"; + rev = "f91a7bf920995832d55a1182f26657bc975b9c24"; + sha256 = "0wz5dz0iq1b1c2w30mmcgll9xidsrnlvs2906jw9szy0h67310za"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + src = fetchgit { + url = "https://github.com/mattn/go-sqlite3"; + rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; + sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"; + }; + } +] diff --git a/pkgs/shells/oh/default.nix b/pkgs/shells/oh/default.nix index c6d3ad06df460..fdcb4244b0d57 100644 --- a/pkgs/shells/oh/default.nix +++ b/pkgs/shells/oh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchgit }: buildGoPackage rec { name = "oh-${version}"; @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "0ajidzs0aisbw74nri9ks6sx6644nmwkisc9mvxm3f89zmnlsgwr"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; } diff --git a/pkgs/shells/oh/deps.json b/pkgs/shells/oh/deps.json deleted file mode 100644 index a0e67ed42dcc7..0000000000000 --- a/pkgs/shells/oh/deps.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/michaelmacinnis/adapted", - "github.com/peterh/liner", - "golang.org/x/sys" - ] - } -] diff --git a/pkgs/shells/oh/deps.nix b/pkgs/shells/oh/deps.nix new file mode 100644 index 0000000000000..db38571740153 --- /dev/null +++ b/pkgs/shells/oh/deps.nix @@ -0,0 +1,27 @@ +{ fetchgit }: +[ + { + goPackagePath = "golang.org/x/sys"; + src = fetchgit { + url = "https://go.googlesource.com/sys"; + rev = "d9157a9621b69ad1d8d77a1933590c416593f24f"; + sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"; + }; + } + { + goPackagePath = "github.com/michaelmacinnis/adapted"; + src = fetchgit { + url = "https://github.com/michaelmacinnis/adapted"; + rev = "0dd5fa34d6f9d74c7c0deed1fc224f9a87e02978"; + sha256 = "16n3a87m33pqx4qih713q3gw2j6ksj1q3ngjax6bpn5b11rqvikv"; + }; + } + { + goPackagePath = "github.com/peterh/liner"; + src = fetchgit { + url = "https://github.com/peterh/liner"; + rev = "ad1edfd30321d8f006ccf05f1e0524adeb943060"; + sha256 = "0c24d9j1gnq7r982h1l2isp3d37379qw155hr8ihx9i2mhpfz317"; + }; + } +] diff --git a/pkgs/tools/X11/go-sct/default.nix b/pkgs/tools/X11/go-sct/default.nix index 197a7b80af362..2954f058dd40c 100644 --- a/pkgs/tools/X11/go-sct/default.nix +++ b/pkgs/tools/X11/go-sct/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, xorg, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, xorg, buildGoPackage, fetchgit }: buildGoPackage rec { name = "go-sct-${version}"; @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "1iqdagrq0j7sqxgsj31skgk73k2rbpbvj41v087af9103wf8h9z7"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; buildInputs = [ xorg.libX11 xorg.libXrandr ]; diff --git a/pkgs/tools/X11/go-sct/deps.json b/pkgs/tools/X11/go-sct/deps.json deleted file mode 100644 index 7a7ce4989d356..0000000000000 --- a/pkgs/tools/X11/go-sct/deps.json +++ /dev/null @@ -1,8 +0,0 @@ -[ - { - "include": "../../../go-modules/libs.json", - "packages": [ - "github.com/cpucycle/astrotime" - ] - } -] diff --git a/pkgs/tools/X11/go-sct/deps.nix b/pkgs/tools/X11/go-sct/deps.nix new file mode 100644 index 0000000000000..09507a1877917 --- /dev/null +++ b/pkgs/tools/X11/go-sct/deps.nix @@ -0,0 +1,11 @@ +{ fetchgit }: +[ + { + goPackagePath = "github.com/cpucycle/astrotime"; + src = fetchgit { + url = "https://github.com/cpucycle/astrotime"; + rev = "9c7d514efdb561775030eaf8f1a9ae6bddb3a2ca"; + sha256 = "024sc7g55v4s54irssm5wsn74sr2k2ynsm6z16w47q66cxhgvby1"; + }; + } +] diff --git a/pkgs/tools/admin/lxd/default.nix b/pkgs/tools/admin/lxd/default.nix index be7d534b3d6ec..610d8a2eb1b22 100644 --- a/pkgs/tools/admin/lxd/default.nix +++ b/pkgs/tools/admin/lxd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, lxc, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, pkgconfig, lxc, buildGoPackage, fetchFromGitHub, fetchgit }: buildGoPackage rec { name = "lxd-${version}"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1rs9g1snjymg6pjz5bj77zk5wbs0w8xmrfxzqs32w6zr1dxhf9hs"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ lxc ]; diff --git a/pkgs/tools/admin/lxd/deps.json b/pkgs/tools/admin/lxd/deps.json deleted file mode 100644 index 3e9a811accef7..0000000000000 --- a/pkgs/tools/admin/lxd/deps.json +++ /dev/null @@ -1,26 +0,0 @@ -[ - { - "include": "../../../go-modules/libs.json", - "packages": [ - "github.com/golang/protobuf", - "github.com/gorilla/websocket", - "github.com/syndtr/gocapability", - "gopkg.in/inconshreveable/log15.v2", - "github.com/gorilla/mux", - "github.com/pborman/uuid", - "golang.org/x/crypto", - "gopkg.in/flosch/pongo2.v3", - "gopkg.in/tomb.v2", - "github.com/olekukonko/tablewriter", - "github.com/mattn/go-sqlite3", - "gopkg.in/lxc/go-lxc.v2", - "gopkg.in/yaml.v2", - "github.com/mattn/go-runewidth", - "github.com/coreos/go-systemd", - "github.com/dustinkirkland/golang-petname", - "github.com/gorilla/context", - "github.com/mattn/go-colorable", - "github.com/gosexy/gettext" - ] - } -] diff --git a/pkgs/tools/admin/lxd/deps.nix b/pkgs/tools/admin/lxd/deps.nix new file mode 100644 index 0000000000000..a0eb5e71ae318 --- /dev/null +++ b/pkgs/tools/admin/lxd/deps.nix @@ -0,0 +1,155 @@ +{ fetchgit }: +[ + { + goPackagePath = "gopkg.in/yaml.v2"; + src = fetchgit { + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + src = fetchgit { + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + src = fetchgit { + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "gopkg.in/tomb.v2"; + src = fetchgit { + url = "https://gopkg.in/tomb.v2"; + rev = "14b3d72120e8d10ea6e6b7f87f7175734b1faab8"; + sha256 = "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + src = fetchgit { + url = "https://github.com/gorilla/websocket"; + rev = "a622679ebd7a3b813862379232f645f8e690e43f"; + sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"; + }; + } + { + goPackagePath = "github.com/syndtr/gocapability"; + src = fetchgit { + url = "https://github.com/syndtr/gocapability"; + rev = "2c00daeb6c3b45114c80ac44119e7b8801fdd852"; + sha256 = "1x7jdcg2r5pakjf20q7bdiidfmv7vcjiyg682186rkp2wz0yws0l"; + }; + } + { + goPackagePath = "gopkg.in/inconshreveable/log15.v2"; + src = fetchgit { + url = "https://gopkg.in/inconshreveable/log15.v2"; + rev = "b105bd37f74e5d9dc7b6ad7806715c7a2b83fd3f"; + sha256 = "18rldvi60i7b3lljfrsqgcc24gdkw2pcixxydznyggaqhh96l6a8"; + }; + } + { + goPackagePath = "github.com/gorilla/mux"; + src = fetchgit { + url = "https://github.com/gorilla/mux"; + rev = "8096f47503459bcc74d1f4c487b7e6e42e5746b5"; + sha256 = "0163fm9jsh54df471mx9kfhdg0070klqhw9ja0qwdzqibxq791b9"; + }; + } + { + goPackagePath = "github.com/pborman/uuid"; + src = fetchgit { + url = "https://github.com/pborman/uuid"; + rev = "ca53cad383cad2479bbba7f7a1a05797ec1386e4"; + sha256 = "0rcx669bbjkkwdlw81spnra4ffgzd4rbpywnrj3w41m9vq6mk1gn"; + }; + } + { + goPackagePath = "gopkg.in/flosch/pongo2.v3"; + src = fetchgit { + url = "https://gopkg.in/flosch/pongo2.v3"; + rev = "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9"; + sha256 = "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8"; + }; + } + { + goPackagePath = "github.com/olekukonko/tablewriter"; + src = fetchgit { + url = "https://github.com/olekukonko/tablewriter"; + rev = "cca8bbc0798408af109aaaa239cbd2634846b340"; + sha256 = "0f9ph3z7lh6p6gihbl1461j9yq5qiaqxr9mzdkp512n18v89ml48"; + }; + } + { + goPackagePath = "github.com/mattn/go-sqlite3"; + src = fetchgit { + url = "https://github.com/mattn/go-sqlite3"; + rev = "b4142c444a8941d0d92b0b7103a24df9cd815e42"; + sha256 = "0xq2y4am8dz9w9aaq24s1npg1sn8pf2gn4nki73ylz2fpjwq9vla"; + }; + } + { + goPackagePath = "gopkg.in/lxc/go-lxc.v2"; + src = fetchgit { + url = "https://gopkg.in/lxc/go-lxc.v2"; + rev = "8f9e220b36393c03854c2d224c5a55644b13e205"; + sha256 = "1dc1n2561k3pxbm2zzh3qwlh30bcb2k9v22ghvr7ps2j9lmhs0ip"; + }; + } + { + goPackagePath = "github.com/mattn/go-runewidth"; + src = fetchgit { + url = "https://github.com/mattn/go-runewidth"; + rev = "d6bea18f789704b5f83375793155289da36a3c7f"; + sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; + }; + } + { + goPackagePath = "github.com/coreos/go-systemd"; + src = fetchgit { + url = "https://github.com/coreos/go-systemd"; + rev = "a606a1e936df81b70d85448221c7b1c6d8a74ef1"; + sha256 = "0fhan564swp982dnzzspb6jzfdl453489c0qavh65g3shy5x8x28"; + }; + } + { + goPackagePath = "github.com/dustinkirkland/golang-petname"; + src = fetchgit { + url = "https://github.com/dustinkirkland/golang-petname"; + rev = "2182cecef7f257230fc998bc351a08a5505f5e6c"; + sha256 = "1xagj34y5rxl7rykhil8iqxlls9rbgcxgdvgfp7kg39pinw83arl"; + }; + } + { + goPackagePath = "github.com/gorilla/context"; + src = fetchgit { + url = "https://github.com/gorilla/context"; + rev = "215affda49addc4c8ef7e2534915df2c8c35c6cd"; + sha256 = "1ybvjknncyx1f112mv28870n0l7yrymsr0861vzw10gc4yn1h97g"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + src = fetchgit { + url = "https://github.com/mattn/go-colorable"; + rev = "3dac7b4f76f6e17fb39b768b89e3783d16e237fe"; + sha256 = "08680mba8hh2rghymqbzd4m40r9k765w5kbzvrif9ngd6h85qnw6"; + }; + } + { + goPackagePath = "github.com/gosexy/gettext"; + src = fetchgit { + url = "https://github.com/gosexy/gettext"; + rev = "305f360aee30243660f32600b87c3c1eaa947187"; + sha256 = "0sm7ziv56ms0lrk30ipbl6i17azar3a44dd2xvr011442zs5ym09"; + }; + } +] diff --git a/pkgs/tools/filesystems/go-mtpfs/default.nix b/pkgs/tools/filesystems/go-mtpfs/default.nix index 0bb92f14e15cc..fffa375f77d14 100644 --- a/pkgs/tools/filesystems/go-mtpfs/default.nix +++ b/pkgs/tools/filesystems/go-mtpfs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, libusb1, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, pkgconfig, libusb1, buildGoPackage, fetchgit }: buildGoPackage rec { name = "go-mtpfs-${version}"; @@ -16,5 +16,5 @@ buildGoPackage rec { sha256 = "1jcqp9n8fd9psfsnhfj6w97yp0zmyxplsig8pyp2gqzh4lnb5fqm"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; } diff --git a/pkgs/tools/filesystems/go-mtpfs/deps.json b/pkgs/tools/filesystems/go-mtpfs/deps.json deleted file mode 100644 index cc2ce33ac3017..0000000000000 --- a/pkgs/tools/filesystems/go-mtpfs/deps.json +++ /dev/null @@ -1,17 +0,0 @@ -[ - { - "include": "../../../go-modules/libs.json", - "packages": [ - "github.com/hanwen/go-fuse" - ] - }, - { - "goPackagePath": "github.com/hanwen/usb", - "fetch": { - "type": "git", - "url": "https://github.com/hanwen/usb", - "rev": "69aee4530ac705cec7c5344418d982aaf15cf0b1", - "sha256": "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky" - } - } -] diff --git a/pkgs/tools/filesystems/go-mtpfs/deps.nix b/pkgs/tools/filesystems/go-mtpfs/deps.nix new file mode 100644 index 0000000000000..3ada7ba11ab14 --- /dev/null +++ b/pkgs/tools/filesystems/go-mtpfs/deps.nix @@ -0,0 +1,19 @@ +{ fetchgit }: +[ + { + goPackagePath = "github.com/hanwen/go-fuse"; + src = fetchgit { + url = "https://github.com/hanwen/go-fuse"; + rev = "bd746dd8bcc8c059a9d953a786a6156eb83f398e"; + sha256 = "1dvvclp418j3d02v9717sfqhl6fw6yyddr9r3j8gsiv8nb62ib56"; + }; + } + { + goPackagePath = "github.com/hanwen/usb"; + src = fetchgit { + url = "https://github.com/hanwen/usb"; + rev = "69aee4530ac705cec7c5344418d982aaf15cf0b1"; + sha256 = "01k0c2g395j65vm1w37mmrfkg6nm900khjrrizzpmx8f8yf20dky"; + }; + } +] diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 6ba2b8817849c..22c63c2ccb060 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, ncurses, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, ncurses, buildGoPackage, fetchFromGitHub, fetchgit }: buildGoPackage rec { name = "fzf-${version}"; @@ -16,7 +16,7 @@ buildGoPackage rec { buildInputs = [ ncurses ]; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; patchPhase = '' sed -i -e "s|expand(':h:h').'/bin/fzf'|'$bin/bin/fzf'|" plugin/fzf.vim diff --git a/pkgs/tools/misc/fzf/deps.json b/pkgs/tools/misc/fzf/deps.json deleted file mode 100644 index a856d2d5fa817..0000000000000 --- a/pkgs/tools/misc/fzf/deps.json +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - "goPackagePath": "github.com/junegunn/go-runewidth", - "fetch": { - "type": "git", - "url": "https://github.com/junegunn/go-runewidth", - "rev": "63c378b851290989b19ca955468386485f118c65", - "sha256": "1z5mhfrpqdssn3603vwd95w69z28igwq96lh7b9rrdcx440i822d" - } - }, - { - "goPackagePath": "github.com/junegunn/go-shellwords", - "fetch": { - "type": "git", - "url": "https://github.com/junegunn/go-shellwords", - "rev": "35d512af75e283aae4ca1fc3d44b159ed66189a4", - "sha256": "08la0axabk9hiba9mm4ypp6a116qhvdlxa1jvkxhv3d4zpjsp4n7" - } - } -] diff --git a/pkgs/tools/misc/fzf/deps.nix b/pkgs/tools/misc/fzf/deps.nix new file mode 100644 index 0000000000000..2cfbab07d63d3 --- /dev/null +++ b/pkgs/tools/misc/fzf/deps.nix @@ -0,0 +1,19 @@ +{ fetchgit }: +[ + { + goPackagePath = "github.com/junegunn/go-runewidth"; + src = fetchgit { + url = "https://github.com/junegunn/go-runewidth"; + rev = "63c378b851290989b19ca955468386485f118c65"; + sha256 = "1z5mhfrpqdssn3603vwd95w69z28igwq96lh7b9rrdcx440i822d"; + }; + } + { + goPackagePath = "github.com/junegunn/go-shellwords"; + src = fetchgit { + url = "https://github.com/junegunn/go-shellwords"; + rev = "35d512af75e283aae4ca1fc3d44b159ed66189a4"; + sha256 = "08la0axabk9hiba9mm4ypp6a116qhvdlxa1jvkxhv3d4zpjsp4n7"; + }; + } +] diff --git a/pkgs/tools/misc/gawp/default.nix b/pkgs/tools/misc/gawp/default.nix index 6e3fe1223fc4d..00f80e84dfe8a 100644 --- a/pkgs/tools/misc/gawp/default.nix +++ b/pkgs/tools/misc/gawp/default.nix @@ -15,5 +15,5 @@ buildGoPackage rec { sha256 = "0bbmbb1xxdgvqvg1ssn9d4j213li7bbbx3y42iz4fs10xv7x4r0c"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; } diff --git a/pkgs/tools/misc/gawp/deps.json b/pkgs/tools/misc/gawp/deps.json deleted file mode 100644 index 28b9216ca007e..0000000000000 --- a/pkgs/tools/misc/gawp/deps.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "include": "../../../../development/go-modules/libs.json", - "packages": [ - "golang.org/x/sys", - "gopkg.in/yaml.v2", - "gopkg.in/fsnotify.v1" - ] - } -] diff --git a/pkgs/tools/misc/gawp/deps.nix b/pkgs/tools/misc/gawp/deps.nix new file mode 100644 index 0000000000000..4f64d7167fbe1 --- /dev/null +++ b/pkgs/tools/misc/gawp/deps.nix @@ -0,0 +1,27 @@ +{ fetchgit }: +[ + { + goPackagePath = "golang.org/x/sys"; + src = fetchgit { + url = "https://go.googlesource.com/sys"; + rev = "d9157a9621b69ad1d8d77a1933590c416593f24f"; + sha256 = "1asdbp7rj1j1m1aar1a022wpcwbml6zih6cpbxaw7b2m8v8is931"; + }; + } + { + goPackagePath = "gopkg.in/fsnotify.v1"; + src = fetchgit { + url = "https://gopkg.in/fsnotify.v1"; + rev = "96c060f6a6b7e0d6f75fddd10efeaca3e5d1bcb0"; + sha256 = "1308z1by82fbymcra26wjzw7lpjy91kbpp2skmwqcq4q1iwwzvk2"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v2"; + src = fetchgit { + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } +] diff --git a/pkgs/tools/misc/i3cat/default.nix b/pkgs/tools/misc/i3cat/default.nix index 1cda3149bb426..e1a8dbc67c883 100644 --- a/pkgs/tools/misc/i3cat/default.nix +++ b/pkgs/tools/misc/i3cat/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchgit }: buildGoPackage rec { name = "i3cat-${version}"; @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "1xlm5c9ajdb71985nq7hcsaraq2z06przbl6r4ykvzi8w2lwgv72"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; } diff --git a/pkgs/tools/misc/i3cat/deps.json b/pkgs/tools/misc/i3cat/deps.json deleted file mode 100644 index cd4c703aed65b..0000000000000 --- a/pkgs/tools/misc/i3cat/deps.json +++ /dev/null @@ -1,8 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/vincent-petithory/structfield" - ] - } -] diff --git a/pkgs/tools/misc/i3cat/deps.nix b/pkgs/tools/misc/i3cat/deps.nix new file mode 100644 index 0000000000000..b199f736c504e --- /dev/null +++ b/pkgs/tools/misc/i3cat/deps.nix @@ -0,0 +1,11 @@ +{ fetchgit }: +[ + { + goPackagePath = "github.com/vincent-petithory/structfield"; + src = fetchgit { + url = "https://github.com/vincent-petithory/structfield"; + rev = "01a738558a47fbf16712994d1737fb31c77e7d11"; + sha256 = "1kyx71z13mf6hc8ly0j0b9zblgvj5lzzvgnc3fqh61wgxrsw24dw"; + }; + } +] diff --git a/pkgs/tools/misc/mongodb-tools/default.nix b/pkgs/tools/misc/mongodb-tools/default.nix index 113b8b2b4cec5..6a7769c943964 100644 --- a/pkgs/tools/misc/mongodb-tools/default.nix +++ b/pkgs/tools/misc/mongodb-tools/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchgit }: let tools = [ @@ -21,7 +21,7 @@ buildGoPackage rec { sha256 = "142vxgniri1mfy2xmfgxhbdp6k6h8c5milv454krv1b51v43hsbm"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; # Mongodb incorrectly names all of their binaries main # Let's work around this with our own installer diff --git a/pkgs/tools/misc/mongodb-tools/deps.json b/pkgs/tools/misc/mongodb-tools/deps.json deleted file mode 100644 index 1489b9e57adb1..0000000000000 --- a/pkgs/tools/misc/mongodb-tools/deps.json +++ /dev/null @@ -1,12 +0,0 @@ -[ - { - "include": "../../../go-modules/libs.json", - "packages": [ - "github.com/howeyc/gopass", - "github.com/jessevdk/go-flags", - "golang.org/x/crypto", - "gopkg.in/mgo.v2", - "gopkg.in/tomb.v2" - ] - } -] diff --git a/pkgs/tools/misc/mongodb-tools/deps.nix b/pkgs/tools/misc/mongodb-tools/deps.nix new file mode 100644 index 0000000000000..fd9adc3740eae --- /dev/null +++ b/pkgs/tools/misc/mongodb-tools/deps.nix @@ -0,0 +1,43 @@ +{ fetchgit }: +[ + { + goPackagePath = "golang.org/x/crypto"; + src = fetchgit { + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/howeyc/gopass"; + src = fetchgit { + url = "https://github.com/howeyc/gopass"; + rev = "2c70fa70727c953c51695f800f25d6b44abb368e"; + sha256 = "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8"; + }; + } + { + goPackagePath = "gopkg.in/mgo.v2"; + src = fetchgit { + url = "https://gopkg.in/mgo.v2"; + rev = "c6a7dce14133ccac2dcac3793f1d6e2ef048503a"; + sha256 = "0rg232q1bkq3y3kd5816hgk1jpf7i38aha5q5ia7j6p9xashz7vj"; + }; + } + { + goPackagePath = "gopkg.in/tomb.v2"; + src = fetchgit { + url = "https://gopkg.in/tomb.v2"; + rev = "14b3d72120e8d10ea6e6b7f87f7175734b1faab8"; + sha256 = "1nza31jvkpka5431c4bdbirvjdy36b1b55sbzljqhqih25jrcjx5"; + }; + } + { + goPackagePath = "github.com/jessevdk/go-flags"; + src = fetchgit { + url = "https://github.com/jessevdk/go-flags"; + rev = "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539"; + sha256 = "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680"; + }; + } +] diff --git a/pkgs/tools/misc/upower-notify/default.nix b/pkgs/tools/misc/upower-notify/default.nix index d02e2865c8f51..0230a8a456399 100644 --- a/pkgs/tools/misc/upower-notify/default.nix +++ b/pkgs/tools/misc/upower-notify/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchgit }: # To use upower-notify, the maintainer suggests adding something like this to your configuration.nix: # @@ -19,5 +19,5 @@ buildGoPackage rec { sha256 = "16zlvn53p9m10ph8n9gps51fkkvl6sf4afdzni6azk05j0ng49jw"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; } diff --git a/pkgs/tools/misc/upower-notify/deps.json b/pkgs/tools/misc/upower-notify/deps.json deleted file mode 100644 index 3a254084ae361..0000000000000 --- a/pkgs/tools/misc/upower-notify/deps.json +++ /dev/null @@ -1,8 +0,0 @@ -[ - { - "include": "../../../go-modules/libs.json", - "packages": [ - "github.com/godbus/dbus" - ] - } -] diff --git a/pkgs/tools/misc/upower-notify/deps.nix b/pkgs/tools/misc/upower-notify/deps.nix new file mode 100644 index 0000000000000..ee99def1b9471 --- /dev/null +++ b/pkgs/tools/misc/upower-notify/deps.nix @@ -0,0 +1,11 @@ +{ fetchgit }: +[ + { + goPackagePath = "github.com/godbus/dbus"; + src = fetchgit { + url = "https://github.com/godbus/dbus"; + rev = "32c6cc29c14570de4cf6d7e7737d68fb2d01ad15"; + sha256 = "0v401f761l88yapiaw23pxvxviqrwl2r2vfd6lq02044i7x4i5r3"; + }; + } +] diff --git a/pkgs/tools/networking/ngrok/default.nix b/pkgs/tools/networking/ngrok/default.nix index 9644fa069722e..97f16a6436fcf 100644 --- a/pkgs/tools/networking/ngrok/default.nix +++ b/pkgs/tools/networking/ngrok/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, pkgconfig, buildGoPackage, go-bindata, fetchFromGitHub }: +{ stdenv, lib, pkgconfig, buildGoPackage, go-bindata, fetchFromGitHub, fetchgit }: buildGoPackage rec { name = "ngrok-${version}"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1r4nc9knp0nxg4vglg7v7jbyd1nh1j2590l720ahll8a4fbsx5a4"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; buildInputs = [ go-bindata ]; diff --git a/pkgs/tools/networking/ngrok/deps.json b/pkgs/tools/networking/ngrok/deps.json deleted file mode 100644 index 61dfbf3372660..0000000000000 --- a/pkgs/tools/networking/ngrok/deps.json +++ /dev/null @@ -1,19 +0,0 @@ -[ - { - "include": "../../../go-modules/libs.json", - "packages": [ - "gopkg.in/yaml.v1", - "github.com/gorilla/websocket", - "github.com/rcrowley/go-metrics", - "github.com/inconshreveable/go-vhost", - "code.google.com/p/log4go", - "github.com/daviddengcn/go-colortext", - "gopkg.in/yaml.v1", - "github.com/inconshreveable/mousetrap", - "github.com/nsf/termbox-go", - "gopkg.in/inconshreveable/go-update.v0", - "github.com/kardianos/osext", - "github.com/kr/binarydist" - ] - } -] diff --git a/pkgs/tools/networking/ngrok/deps.nix b/pkgs/tools/networking/ngrok/deps.nix new file mode 100644 index 0000000000000..0b9fd61e75f1a --- /dev/null +++ b/pkgs/tools/networking/ngrok/deps.nix @@ -0,0 +1,91 @@ +{ fetchgit }: +[ + { + goPackagePath = "github.com/gorilla/websocket"; + src = fetchgit { + url = "https://github.com/gorilla/websocket"; + rev = "a622679ebd7a3b813862379232f645f8e690e43f"; + sha256 = "1nc9jbcmgya1i6dmf6sbcqsnxi9hbjg6dz1z0k7zmc6xdwlq0y4q"; + }; + } + { + goPackagePath = "github.com/rcrowley/go-metrics"; + src = fetchgit { + url = "https://github.com/rcrowley/go-metrics"; + rev = "1ce93efbc8f9c568886b2ef85ce305b2217b3de3"; + sha256 = "06gg72krlmd0z3zdq6s716blrga95pyj8dc2f2psfbknbkyrkfqa"; + }; + } + { + goPackagePath = "github.com/inconshreveable/go-vhost"; + src = fetchgit { + url = "https://github.com/inconshreveable/go-vhost"; + rev = "c4c28117502e4bf00960c8282b2d1c51c865fe2c"; + sha256 = "1rway6sls6fl2s2jk20ajj36rrlzh9944ncc9pdd19kifix54z32"; + }; + } + { + goPackagePath = "code.google.com/p/log4go"; + src = fetchgit { + url = "https://github.com/ccpaging/log4go"; + rev = "cb4cc51cd03958183d3b637d0750497d88c2f7a8"; + sha256 = "0l9f86zzhla9hq35q4xhgs837283qrm4gxbp5lrwwls54ifiq7k2"; + }; + } + { + goPackagePath = "github.com/daviddengcn/go-colortext"; + src = fetchgit { + url = "https://github.com/daviddengcn/go-colortext"; + rev = "13eaeb896f5985a1ab74ddea58707a73d875ba57"; + sha256 = "0618xs9lc5xfp5zkkb5j47dr7i30ps3zj5fj0zpv8afqh2cc689x"; + }; + } + { + goPackagePath = "gopkg.in/yaml.v1"; + src = fetchgit { + url = "https://github.com/go-yaml/yaml"; + rev = "b0c168ac0cf9493da1f9bb76c34b26ffef940b4a"; + sha256 = "0jbdy41pplf2d1j24qwr8gc5qsig6ai5ch8rwgvg72kq9q0901cy"; + }; + } + { + goPackagePath = "github.com/inconshreveable/mousetrap"; + src = fetchgit { + url = "https://github.com/inconshreveable/mousetrap"; + rev = "9dbb96d2c3a964935b0870b5abaea13c98b483aa"; + sha256 = "1f9g8vm18qv1rcb745a4iahql9vfrz0jni9mnzriab2wy1pfdl5b"; + }; + } + { + goPackagePath = "github.com/nsf/termbox-go"; + src = fetchgit { + url = "https://github.com/nsf/termbox-go"; + rev = "9aecf65084a5754f12d27508fa2e6ed56851953b"; + sha256 = "16sak07bgvmax4zxfrd4jia1dgygk733xa8vk8cdx28z98awbfsh"; + }; + } + { + goPackagePath = "gopkg.in/inconshreveable/go-update.v0"; + src = fetchgit { + url = "https://github.com/inconshreveable/go-update"; + rev = "d8b0b1d421aa1cbf392c05869f8abbc669bb7066"; + sha256 = "0cvkik2w368fzimx3y29ncfgw7004qkbdf2n3jy5czvzn35q7dpa"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + src = fetchgit { + url = "https://github.com/kardianos/osext"; + rev = "29ae4ffbc9a6fe9fb2bc5029050ce6996ea1d3bc"; + sha256 = "1mawalaz84i16njkz6f9fd5jxhcbxkbsjnav3cmqq2dncv2hyv8a"; + }; + } + { + goPackagePath = "github.com/kr/binarydist"; + src = fetchgit { + url = "https://github.com/kr/binarydist"; + rev = "9955b0ab8708602d411341e55fffd7e0700f86bd"; + sha256 = "11wncbbbrdcxl5ff3h6w8vqfg4bxsf8709mh6vda0cv236flkyn3"; + }; + } +] diff --git a/pkgs/tools/networking/s3gof3r/default.nix b/pkgs/tools/networking/s3gof3r/default.nix index 6231d5005dc9a..030a90328f533 100644 --- a/pkgs/tools/networking/s3gof3r/default.nix +++ b/pkgs/tools/networking/s3gof3r/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchgit }: buildGoPackage rec { name = "s3gof3r-${version}"; @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "10banc8hnhxpsdmlkf9nc5fjkh1349bgpd9k7lggw3yih1rvmh7k"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; } diff --git a/pkgs/tools/networking/s3gof3r/deps.json b/pkgs/tools/networking/s3gof3r/deps.json deleted file mode 100644 index d4a41d349b28e..0000000000000 --- a/pkgs/tools/networking/s3gof3r/deps.json +++ /dev/null @@ -1,8 +0,0 @@ -[ - { - "include": "../../../go-modules/libs.json", - "packages": [ - "github.com/jessevdk/go-flags" - ] - } -] diff --git a/pkgs/tools/networking/s3gof3r/deps.nix b/pkgs/tools/networking/s3gof3r/deps.nix new file mode 100644 index 0000000000000..ed29a8a113f2c --- /dev/null +++ b/pkgs/tools/networking/s3gof3r/deps.nix @@ -0,0 +1,11 @@ +{ fetchgit }: +[ + { + goPackagePath = "github.com/jessevdk/go-flags"; + src = fetchgit { + url = "https://github.com/jessevdk/go-flags"; + rev = "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539"; + sha256 = "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680"; + }; + } +] diff --git a/pkgs/tools/package-management/gx/default.nix b/pkgs/tools/package-management/gx/default.nix index 89d795c8e505a..7cc0fe2298cf5 100644 --- a/pkgs/tools/package-management/gx/default.nix +++ b/pkgs/tools/package-management/gx/default.nix @@ -1,5 +1,5 @@ # This file was generated by go2nix. -{ stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, buildGoPackage, fetchgit }: buildGoPackage rec { name = "gx-${version}"; @@ -19,7 +19,7 @@ buildGoPackage rec { --replace "github.com/ipfs/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-random" "github.com/jbenet/go-random" ''; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; meta = with stdenv.lib; { description = "A packaging tool built around IPFS"; diff --git a/pkgs/tools/package-management/gx/deps.json b/pkgs/tools/package-management/gx/deps.json deleted file mode 100644 index 3dd8e8f6ab31c..0000000000000 --- a/pkgs/tools/package-management/gx/deps.json +++ /dev/null @@ -1,200 +0,0 @@ -[ - { - "goPackagePath": "github.com/anacrolix/missinggo", - "fetch": { - "type": "git", - "url": "https://github.com/anacrolix/missinggo", - "rev": "e40875155efce3d98562ca9e265e152c364ada3e", - "sha256": "1p1qgnb430dz84d2395i6417jqnlvrx9zwg9rq1ri8d5v7dif4fg" - } - }, - { - "goPackagePath": "github.com/anacrolix/sync", - "fetch": { - "type": "git", - "url": "https://github.com/anacrolix/sync", - "rev": "812602587b72df6a2a4f6e30536adc75394a374b", - "sha256": "0pc38wanzws3vzqj0l5pakg3gn2hacqrb4n7pd0sqz083rss5k0l" - } - }, - { - "goPackagePath": "github.com/anacrolix/utp", - "fetch": { - "type": "git", - "url": "https://github.com/anacrolix/utp", - "rev": "d7ad5aff2b8a5fa415d1c1ed00b71cfd8b4c69e0", - "sha256": "07piwfny3b4prxf2shc512ai0qmrmrj839lbza9clhgcmj1a75d7" - } - }, - { - "goPackagePath": "github.com/blang/semver", - "fetch": { - "type": "git", - "url": "https://github.com/blang/semver", - "rev": "aea32c919a18e5ef4537bbd283ff29594b1b0165", - "sha256": "1s80qlij6j6wrh0fhm0l11hbf3qjra67nca5bl7izyfjj4621fcd" - } - }, - { - "goPackagePath": "github.com/bradfitz/iter", - "fetch": { - "type": "git", - "url": "https://github.com/bradfitz/iter", - "rev": "454541ec3da2a73fc34fd049b19ee5777bf19345", - "sha256": "0v07zlq2h2rjz5mdvh0rgizyzcj68qa235gci6hvlrai7igyi57i" - } - }, - { - "goPackagePath": "github.com/codegangsta/cli", - "fetch": { - "type": "git", - "url": "https://github.com/codegangsta/cli", - "rev": "e5bef42c62aa7d25aba4880dc02b7624f01e9e19", - "sha256": "1g0z2klbaivd0w1fwf1k1dkyk8jbq28qd7fvczjv0yj6hg4vz1wq" - } - }, - { - "goPackagePath": "github.com/ipfs/go-ipfs-api", - "fetch": { - "type": "git", - "url": "https://github.com/ipfs/go-ipfs-api", - "rev": "7c354892da3abdaafb6ac576c100b259b1a73dac", - "sha256": "0n8k9ydn2l362vq0bpbjkciw08div3hpc22qygp6zsrlammizcvc" - } - }, - { - "goPackagePath": "github.com/jbenet/go-base58", - "fetch": { - "type": "git", - "url": "https://github.com/jbenet/go-base58", - "rev": "6237cf65f3a6f7111cd8a42be3590df99a66bc7d", - "sha256": "11yp7yg62bhw6jqdrlf2144bffk12jmb1nvqkm172pdhxfwrp3bf" - } - }, - { - "goPackagePath": "github.com/jbenet/go-multiaddr", - "fetch": { - "type": "git", - "url": "https://github.com/jbenet/go-multiaddr", - "rev": "f3dff105e44513821be8fbe91c89ef15eff1b4d4", - "sha256": "0rz17cvhslspp2z8jbxah22kndqiq9zl8nlf14ng8hfxdfm1x4n7" - } - }, - { - "goPackagePath": "github.com/jbenet/go-multiaddr-net", - "fetch": { - "type": "git", - "url": "https://github.com/jbenet/go-multiaddr-net", - "rev": "d4cfd691db9f50e430528f682ca603237b0eaae0", - "sha256": "031xb8j5nysw052cm36rjn19c5wkjf8dh8x21vrbyb7220h5zp90" - } - }, - { - "goPackagePath": "github.com/jbenet/go-multihash", - "fetch": { - "type": "git", - "url": "https://github.com/jbenet/go-multihash", - "rev": "e8d2374934f16a971d1e94a864514a21ac74bf7f", - "sha256": "1hlzgmjszn8mfvn848jbnpsvccm9g3m42saavgbh48qdryraqscp" - } - }, - { - "goPackagePath": "github.com/jbenet/go-os-rename", - "fetch": { - "type": "git", - "url": "https://github.com/jbenet/go-os-rename", - "rev": "3ac97f61ef67a6b87b95c1282f6c317ed0e693c2", - "sha256": "0fmsmmh9h3l7swf5d56spy9jyrnrvw0vnxgh11mpvxmw5hv3lclr" - } - }, - { - "goPackagePath": "github.com/jbenet/go-random", - "fetch": { - "type": "git", - "url": "https://github.com/jbenet/go-random", - "rev": "384f606e91f542a98e779e652eed88051618f0f7", - "sha256": "0gcshzl9n3apzc0jaxqrjsc038yfrzfyhpdqgbpcnajin83l2msa" - } - }, - { - "goPackagePath": "github.com/jbenet/go-random-files", - "fetch": { - "type": "git", - "url": "https://github.com/jbenet/go-random-files", - "rev": "737479700b40b4b50e914e963ce8d9d44603e3c8", - "sha256": "1klpdc4qkrfy31r7qh00fcz42blswzabmcnry9byd5adhszxj9bw" - } - }, - { - "goPackagePath": "github.com/kr/fs", - "fetch": { - "type": "git", - "url": "https://github.com/kr/fs", - "rev": "2788f0dbd16903de03cb8186e5c7d97b69ad387b", - "sha256": "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly" - } - }, - { - "goPackagePath": "github.com/mitchellh/go-homedir", - "fetch": { - "type": "git", - "url": "https://github.com/mitchellh/go-homedir", - "rev": "1111e456ffea841564ac0fa5f69c26ef44dafec9", - "sha256": "1ycb1cffgs46jnj4cbpjd46mcl584kxdmldlvfysg0wza9pp4x23" - } - }, - { - "goPackagePath": "github.com/sabhiram/go-git-ignore", - "fetch": { - "type": "git", - "url": "https://github.com/sabhiram/go-git-ignore", - "rev": "228fcfa2a06e870a3ef238d54c45ea847f492a37", - "sha256": "0xyj2zsxjjbyd3ppxvs294c8y2ip181dxhvycaxxx6qysbm2nlzj" - } - }, - { - "goPackagePath": "github.com/whyrusleeping/go-multipart-files", - "fetch": { - "type": "git", - "url": "https://github.com/whyrusleeping/go-multipart-files", - "rev": "3be93d9f6b618f2b8564bfb1d22f1e744eabbae2", - "sha256": "0lf58q5nrxp10v7mj4b0lz01jz8is1xysxwdwkhhs88qxha8vm2f" - } - }, - { - "goPackagePath": "github.com/whyrusleeping/json-filter", - "fetch": { - "type": "git", - "url": "https://github.com/whyrusleeping/json-filter", - "rev": "e9937f5649231265a56d0a419f062530425401a1", - "sha256": "1b7czlx57acbi30b9m1w2lvlxnh65c4pmxaa0546pjjip83byb3s" - } - }, - { - "goPackagePath": "github.com/whyrusleeping/stump", - "fetch": { - "type": "git", - "url": "https://github.com/whyrusleeping/stump", - "rev": "206f8f13aae1697a6fc1f4a55799faf955971fc5", - "sha256": "1s40qdppjnk8gijk7x6kbviiqz62nz3h6gic2q9cwcmq8r5isw7n" - } - }, - { - "goPackagePath": "github.com/whyrusleeping/tar-utils", - "fetch": { - "type": "git", - "url": "https://github.com/whyrusleeping/tar-utils", - "rev": "beab27159606f5a7c978268dd1c3b12a0f1de8a7", - "sha256": "07z4is00ridjp8c6cn68lkg1fz6ksj1q7f26g7ir7qx8mx10fj72" - } - }, - { - "goPackagePath": "golang.org/x/crypto", - "fetch": { - "type": "git", - "url": "https://go.googlesource.com/crypto", - "rev": "f3241ce8505855877cc8a9717bd61a0f7c4ea83c", - "sha256": "0wxfnbhaq1m3i5jylww9llm2xl9hk33q6nxyz5i475rfrg0p3wsq" - } - } -] diff --git a/pkgs/tools/package-management/gx/deps.nix b/pkgs/tools/package-management/gx/deps.nix new file mode 100644 index 0000000000000..91abdab4e1147 --- /dev/null +++ b/pkgs/tools/package-management/gx/deps.nix @@ -0,0 +1,179 @@ +{ fetchgit }: +[ + { + goPackagePath = "github.com/anacrolix/missinggo"; + src = fetchgit { + url = "https://github.com/anacrolix/missinggo"; + rev = "e40875155efce3d98562ca9e265e152c364ada3e"; + sha256 = "1p1qgnb430dz84d2395i6417jqnlvrx9zwg9rq1ri8d5v7dif4fg"; + }; + } + { + goPackagePath = "github.com/anacrolix/sync"; + src = fetchgit { + url = "https://github.com/anacrolix/sync"; + rev = "812602587b72df6a2a4f6e30536adc75394a374b"; + sha256 = "0pc38wanzws3vzqj0l5pakg3gn2hacqrb4n7pd0sqz083rss5k0l"; + }; + } + { + goPackagePath = "github.com/anacrolix/utp"; + src = fetchgit { + url = "https://github.com/anacrolix/utp"; + rev = "d7ad5aff2b8a5fa415d1c1ed00b71cfd8b4c69e0"; + sha256 = "07piwfny3b4prxf2shc512ai0qmrmrj839lbza9clhgcmj1a75d7"; + }; + } + { + goPackagePath = "github.com/blang/semver"; + src = fetchgit { + url = "https://github.com/blang/semver"; + rev = "aea32c919a18e5ef4537bbd283ff29594b1b0165"; + sha256 = "1s80qlij6j6wrh0fhm0l11hbf3qjra67nca5bl7izyfjj4621fcd"; + }; + } + { + goPackagePath = "github.com/bradfitz/iter"; + src = fetchgit { + url = "https://github.com/bradfitz/iter"; + rev = "454541ec3da2a73fc34fd049b19ee5777bf19345"; + sha256 = "0v07zlq2h2rjz5mdvh0rgizyzcj68qa235gci6hvlrai7igyi57i"; + }; + } + { + goPackagePath = "github.com/codegangsta/cli"; + src = fetchgit { + url = "https://github.com/codegangsta/cli"; + rev = "e5bef42c62aa7d25aba4880dc02b7624f01e9e19"; + sha256 = "1g0z2klbaivd0w1fwf1k1dkyk8jbq28qd7fvczjv0yj6hg4vz1wq"; + }; + } + { + goPackagePath = "github.com/ipfs/go-ipfs-api"; + src = fetchgit { + url = "https://github.com/ipfs/go-ipfs-api"; + rev = "7c354892da3abdaafb6ac576c100b259b1a73dac"; + sha256 = "0n8k9ydn2l362vq0bpbjkciw08div3hpc22qygp6zsrlammizcvc"; + }; + } + { + goPackagePath = "github.com/jbenet/go-base58"; + src = fetchgit { + url = "https://github.com/jbenet/go-base58"; + rev = "6237cf65f3a6f7111cd8a42be3590df99a66bc7d"; + sha256 = "11yp7yg62bhw6jqdrlf2144bffk12jmb1nvqkm172pdhxfwrp3bf"; + }; + } + { + goPackagePath = "github.com/jbenet/go-multiaddr"; + src = fetchgit { + url = "https://github.com/jbenet/go-multiaddr"; + rev = "f3dff105e44513821be8fbe91c89ef15eff1b4d4"; + sha256 = "0rz17cvhslspp2z8jbxah22kndqiq9zl8nlf14ng8hfxdfm1x4n7"; + }; + } + { + goPackagePath = "github.com/jbenet/go-multiaddr-net"; + src = fetchgit { + url = "https://github.com/jbenet/go-multiaddr-net"; + rev = "d4cfd691db9f50e430528f682ca603237b0eaae0"; + sha256 = "031xb8j5nysw052cm36rjn19c5wkjf8dh8x21vrbyb7220h5zp90"; + }; + } + { + goPackagePath = "github.com/jbenet/go-multihash"; + src = fetchgit { + url = "https://github.com/jbenet/go-multihash"; + rev = "e8d2374934f16a971d1e94a864514a21ac74bf7f"; + sha256 = "1hlzgmjszn8mfvn848jbnpsvccm9g3m42saavgbh48qdryraqscp"; + }; + } + { + goPackagePath = "github.com/jbenet/go-os-rename"; + src = fetchgit { + url = "https://github.com/jbenet/go-os-rename"; + rev = "3ac97f61ef67a6b87b95c1282f6c317ed0e693c2"; + sha256 = "0fmsmmh9h3l7swf5d56spy9jyrnrvw0vnxgh11mpvxmw5hv3lclr"; + }; + } + { + goPackagePath = "github.com/jbenet/go-random"; + src = fetchgit { + url = "https://github.com/jbenet/go-random"; + rev = "384f606e91f542a98e779e652eed88051618f0f7"; + sha256 = "0gcshzl9n3apzc0jaxqrjsc038yfrzfyhpdqgbpcnajin83l2msa"; + }; + } + { + goPackagePath = "github.com/jbenet/go-random-files"; + src = fetchgit { + url = "https://github.com/jbenet/go-random-files"; + rev = "737479700b40b4b50e914e963ce8d9d44603e3c8"; + sha256 = "1klpdc4qkrfy31r7qh00fcz42blswzabmcnry9byd5adhszxj9bw"; + }; + } + { + goPackagePath = "github.com/kr/fs"; + src = fetchgit { + url = "https://github.com/kr/fs"; + rev = "2788f0dbd16903de03cb8186e5c7d97b69ad387b"; + sha256 = "1c0fipl4rsh0v5liq1ska1dl83v3llab4k6lm8mvrx9c4dyp71ly"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + src = fetchgit { + url = "https://github.com/mitchellh/go-homedir"; + rev = "1111e456ffea841564ac0fa5f69c26ef44dafec9"; + sha256 = "1ycb1cffgs46jnj4cbpjd46mcl584kxdmldlvfysg0wza9pp4x23"; + }; + } + { + goPackagePath = "github.com/sabhiram/go-git-ignore"; + src = fetchgit { + url = "https://github.com/sabhiram/go-git-ignore"; + rev = "228fcfa2a06e870a3ef238d54c45ea847f492a37"; + sha256 = "0xyj2zsxjjbyd3ppxvs294c8y2ip181dxhvycaxxx6qysbm2nlzj"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/go-multipart-files"; + src = fetchgit { + url = "https://github.com/whyrusleeping/go-multipart-files"; + rev = "3be93d9f6b618f2b8564bfb1d22f1e744eabbae2"; + sha256 = "0lf58q5nrxp10v7mj4b0lz01jz8is1xysxwdwkhhs88qxha8vm2f"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/json-filter"; + src = fetchgit { + url = "https://github.com/whyrusleeping/json-filter"; + rev = "e9937f5649231265a56d0a419f062530425401a1"; + sha256 = "1b7czlx57acbi30b9m1w2lvlxnh65c4pmxaa0546pjjip83byb3s"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/stump"; + src = fetchgit { + url = "https://github.com/whyrusleeping/stump"; + rev = "206f8f13aae1697a6fc1f4a55799faf955971fc5"; + sha256 = "1s40qdppjnk8gijk7x6kbviiqz62nz3h6gic2q9cwcmq8r5isw7n"; + }; + } + { + goPackagePath = "github.com/whyrusleeping/tar-utils"; + src = fetchgit { + url = "https://github.com/whyrusleeping/tar-utils"; + rev = "beab27159606f5a7c978268dd1c3b12a0f1de8a7"; + sha256 = "07z4is00ridjp8c6cn68lkg1fz6ksj1q7f26g7ir7qx8mx10fj72"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + src = fetchgit { + url = "https://go.googlesource.com/crypto"; + rev = "f3241ce8505855877cc8a9717bd61a0f7c4ea83c"; + sha256 = "0wxfnbhaq1m3i5jylww9llm2xl9hk33q6nxyz5i475rfrg0p3wsq"; + }; + } +] diff --git a/pkgs/tools/package-management/gx/go/default.nix b/pkgs/tools/package-management/gx/go/default.nix index 912c870c27b03..c0a2ec6e7c6a4 100644 --- a/pkgs/tools/package-management/gx/go/default.nix +++ b/pkgs/tools/package-management/gx/go/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { sha256 = "0qxp7gqrx1rhcbqvp4jdb3gj1dlj200bdc4gq8pfklc8fcz1lc6l"; }; - goDeps = ../deps.json; + goDeps = import ../deps.nix { inherit fetchgit; }; extraSrcs = [ { diff --git a/pkgs/tools/security/hologram/default.nix b/pkgs/tools/security/hologram/default.nix index 5e8d260d69369..03cd3fb0be6af 100644 --- a/pkgs/tools/security/hologram/default.nix +++ b/pkgs/tools/security/hologram/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: +{ stdenv, lib, buildGoPackage, fetchgit }: buildGoPackage rec { name = "hologram-${version}"; @@ -13,5 +13,5 @@ buildGoPackage rec { sha256 = "0i0p170brdsczfz079mqbc5y7x7mdph04p3wgqsd7xcrddvlkkaf"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; } diff --git a/pkgs/tools/security/hologram/deps.json b/pkgs/tools/security/hologram/deps.json deleted file mode 100644 index 177c960933e8a..0000000000000 --- a/pkgs/tools/security/hologram/deps.json +++ /dev/null @@ -1,19 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/aybabtme/rgbterm", - "github.com/vaughan0/go-ini", - "github.com/howeyc/gopass", - "github.com/AdRoll/hologram", - "github.com/mitchellh/go-homedir", - "github.com/goamz/goamz", - "github.com/nmcclain/asn1-ber", - "gopkg.in/asn1-ber.v1", - "github.com/peterbourgon/g2s", - "github.com/nmcclain/ldap", - "github.com/golang/protobuf", - "golang.org/x/crypto" - ] - } -] diff --git a/pkgs/tools/security/hologram/deps.nix b/pkgs/tools/security/hologram/deps.nix new file mode 100644 index 0000000000000..fb253e13deeab --- /dev/null +++ b/pkgs/tools/security/hologram/deps.nix @@ -0,0 +1,91 @@ +{ fetchgit }: +[ + { + goPackagePath = "golang.org/x/crypto"; + src = fetchgit { + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/golang/protobuf"; + src = fetchgit { + url = "https://github.com/golang/protobuf"; + rev = "59b73b37c1e45995477aae817e4a653c89a858db"; + sha256 = "1dx22jvhvj34ivpr7gw01fncg9yyx35mbpal4mpgnqka7ajmgjsa"; + }; + } + { + goPackagePath = "github.com/howeyc/gopass"; + src = fetchgit { + url = "https://github.com/howeyc/gopass"; + rev = "2c70fa70727c953c51695f800f25d6b44abb368e"; + sha256 = "152lrkfxk205rlxiign0w5wb0fmfh910yz4jhlv4f4l1qr1h2lx8"; + }; + } + { + goPackagePath = "github.com/aybabtme/rgbterm"; + src = fetchgit { + url = "https://github.com/aybabtme/rgbterm"; + rev = "c07e2f009ed2311e9c35bca12ec00b38ccd48283"; + sha256 = "1qph7drds44jzx1whqlrh1hs58k0wv0v58zyq2a81hmm72gsgzam"; + }; + } + { + goPackagePath = "github.com/vaughan0/go-ini"; + src = fetchgit { + url = "https://github.com/vaughan0/go-ini"; + rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"; + sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + src = fetchgit { + url = "https://github.com/mitchellh/go-homedir"; + rev = "1f6da4a72e57d4e7edd4a7295a585e0a3999a2d4"; + sha256 = "1l5lrsjrnwxn299mhvyxvz8hd0spkx0d31gszm4cyx21bg1xsiy9"; + }; + } + { + goPackagePath = "github.com/goamz/goamz"; + src = fetchgit { + url = "https://github.com/goamz/goamz"; + rev = "2a8fed5e89ab9e16210fc337d1aac780e8c7bbb7"; + sha256 = "0rlinp0cvgw66qjndg4padr5s0wd3n7kjfggkx6czqj9bqaxcz4b"; + }; + } + { + goPackagePath = "github.com/nmcclain/asn1-ber"; + src = fetchgit { + url = "https://github.com/go-asn1-ber/asn1-ber"; + rev = "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72"; + sha256 = "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9"; + }; + } + { + goPackagePath = "gopkg.in/asn1-ber.v1"; + src = fetchgit { + url = "https://github.com/go-asn1-ber/asn1-ber"; + rev = "f4b6f4a84f5cde443d1925b5ec185ee93c2bdc72"; + sha256 = "0qdyax6yw3hvplzqc2ykpihi3m5y4nii581ay0mxy9c54bzs2nk9"; + }; + } + { + goPackagePath = "github.com/peterbourgon/g2s"; + src = fetchgit { + url = "https://github.com/peterbourgon/g2s"; + rev = "ec76db4c1ac16400ac0e17ca9c4840e1d23da5dc"; + sha256 = "1p4p8755v2nrn54rik7yifpg9szyg44y5rpp0kryx4ycl72307rj"; + }; + } + { + goPackagePath = "github.com/nmcclain/ldap"; + src = fetchgit { + url = "https://github.com/go-ldap/ldap"; + rev = "83e65426fd1c06626e88aa8a085e5bfed0208e29"; + sha256 = "179lwaf0hvczl8g4xzkpcpzq25p1b23f7399bx5zl55iin62d8yz"; + }; + } +] diff --git a/pkgs/tools/system/confd/default.nix b/pkgs/tools/system/confd/default.nix index 5da87f4ce46ef..67fa20c75782b 100644 --- a/pkgs/tools/system/confd/default.nix +++ b/pkgs/tools/system/confd/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchgit }: buildGoPackage rec { name = "confd-${version}"; @@ -15,5 +15,5 @@ buildGoPackage rec { sha256 = "0rz533575hdcln8ciqaz79wbnga3czj243g7fz8869db6sa7jwlr"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; } diff --git a/pkgs/tools/system/confd/deps.json b/pkgs/tools/system/confd/deps.json deleted file mode 100644 index a3d9753927f1e..0000000000000 --- a/pkgs/tools/system/confd/deps.json +++ /dev/null @@ -1,15 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/kelseyhightower/memkv", - "github.com/armon/consul-api", - "github.com/garyburd/redigo", - "github.com/samuel/go-zookeeper", - "github.com/BurntSushi/toml", - "github.com/Sirupsen/logrus", - "github.com/coreos/go-etcd", - "github.com/ugorji/go" - ] - } -] diff --git a/pkgs/tools/system/confd/deps.nix b/pkgs/tools/system/confd/deps.nix new file mode 100644 index 0000000000000..f31e9913afa52 --- /dev/null +++ b/pkgs/tools/system/confd/deps.nix @@ -0,0 +1,67 @@ +{ fetchgit }: +[ + { + goPackagePath = "github.com/Sirupsen/logrus"; + src = fetchgit { + url = "https://github.com/Sirupsen/logrus"; + rev = "be52937128b38f1d99787bb476c789e2af1147f1"; + sha256 = "1m6vvd4pg4lwglhk54lv5mf6cc8h7bi0d9zb3gar4crz531r66y4"; + }; + } + { + goPackagePath = "github.com/coreos/go-etcd"; + src = fetchgit { + url = "https://github.com/coreos/go-etcd"; + rev = "9847b93751a5fbaf227b893d172cee0104ac6427"; + sha256 = "1ihq01ayqzxvn6hca5j00vl189vi5lm78f0fy2wpk5mrm3xi01l4"; + }; + } + { + goPackagePath = "github.com/ugorji/go"; + src = fetchgit { + url = "https://github.com/ugorji/go"; + rev = "03e33114d4d60a1f37150325e15f51b0fa6fc4f6"; + sha256 = "01kdzgx23cgb4k867m1pvsw14hhdr9jf2frqy6i4j4221055m57v"; + }; + } + { + goPackagePath = "github.com/samuel/go-zookeeper"; + src = fetchgit { + url = "https://github.com/samuel/go-zookeeper"; + rev = "5bb5cfc093ad18a28148c578f8632cfdb4d802e4"; + sha256 = "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + src = fetchgit { + url = "https://github.com/BurntSushi/toml"; + rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; + sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + }; + } + { + goPackagePath = "github.com/kelseyhightower/memkv"; + src = fetchgit { + url = "https://github.com/kelseyhightower/memkv"; + rev = "7f9c7f36f45ba80c62fe22779ee78d9b4ca36580"; + sha256 = "090x65kr3gqh8fc8z4rm9hc2r0v0k7rfm5vsbmhdh21f48ixw540"; + }; + } + { + goPackagePath = "github.com/armon/consul-api"; + src = fetchgit { + url = "https://github.com/armon/consul-api"; + rev = "f79efe463cdbb62f6d5a55f879a63ec554eb13e5"; + sha256 = "1rkmzfhsazj9p2b6ywvs8yramzvxfxyvplzxi0ldvhcv04887gcp"; + }; + } + { + goPackagePath = "github.com/garyburd/redigo"; + src = fetchgit { + url = "https://github.com/garyburd/redigo"; + rev = "535138d7bcd717d6531c701ef5933d98b1866257"; + sha256 = "1m7nc1gvv5yqnq8ii75f33485il6y6prf8gxl97dimsw94qccc5v"; + }; + } +] diff --git a/pkgs/tools/text/platinum-searcher/default.nix b/pkgs/tools/text/platinum-searcher/default.nix index 21a49d493aa75..a61231a3fe8aa 100644 --- a/pkgs/tools/text/platinum-searcher/default.nix +++ b/pkgs/tools/text/platinum-searcher/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchgit }: buildGoPackage rec { name = "the_platinum_searcher-${version}"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "09pkdfh7fqn3x4l9zaw5wzk20k7nfdwry7br9vfy3vv3fwv61ynp"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; meta = with stdenv.lib; { homepage = https://github.com/monochromegane/the_platinum_searcher; diff --git a/pkgs/tools/text/platinum-searcher/deps.json b/pkgs/tools/text/platinum-searcher/deps.json deleted file mode 100644 index fc137e2629831..0000000000000 --- a/pkgs/tools/text/platinum-searcher/deps.json +++ /dev/null @@ -1,16 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/BurntSushi/toml", - "github.com/monochromegane/conflag", - "github.com/monochromegane/go-home", - "github.com/monochromegane/terminal", - "github.com/monochromegane/go-gitignore", - "github.com/shiena/ansicolor", - "golang.org/x/text", - "gopkg.in/yaml.v2", - "github.com/jessevdk/go-flags" - ] - } -] diff --git a/pkgs/tools/text/platinum-searcher/deps.nix b/pkgs/tools/text/platinum-searcher/deps.nix new file mode 100644 index 0000000000000..e2849eac47d1d --- /dev/null +++ b/pkgs/tools/text/platinum-searcher/deps.nix @@ -0,0 +1,75 @@ +{ fetchgit }: +[ + { + goPackagePath = "gopkg.in/yaml.v2"; + src = fetchgit { + url = "https://gopkg.in/yaml.v2"; + rev = "a83829b6f1293c91addabc89d0571c246397bbf4"; + sha256 = "1m4dsmk90sbi17571h6pld44zxz7jc4lrnl4f27dpd1l8g5xvjhh"; + }; + } + { + goPackagePath = "github.com/jessevdk/go-flags"; + src = fetchgit { + url = "https://github.com/jessevdk/go-flags"; + rev = "1b89bf73cd2c3a911d7b2a279ab085c4a18cf539"; + sha256 = "027nglc5xx1cm03z9sisg0iqrhwcj6gh5z254rrpl8p4fwrxx680"; + }; + } + { + goPackagePath = "github.com/BurntSushi/toml"; + src = fetchgit { + url = "https://github.com/BurntSushi/toml"; + rev = "056c9bc7be7190eaa7715723883caffa5f8fa3e4"; + sha256 = "0gkgkw04ndr5y7hrdy0r4v2drs5srwfcw2bs1gyas066hwl84xyw"; + }; + } + { + goPackagePath = "golang.org/x/text"; + src = fetchgit { + url = "https://go.googlesource.com/text"; + rev = "5eb8d4684c4796dd36c74f6452f2c0fa6c79597e"; + sha256 = "1cjwm2pv42dbfqc6ylr7jmma902zg4gng5aarqrbjf1k2nf2vs14"; + }; + } + { + goPackagePath = "github.com/monochromegane/conflag"; + src = fetchgit { + url = "https://github.com/monochromegane/conflag"; + rev = "6d68c9aa4183844ddc1655481798fe4d90d483e9"; + sha256 = "0csfr5c8d3kbna9sqhzfp2z06wq6mc6ijja1zj2i82kzsq8534wa"; + }; + } + { + goPackagePath = "github.com/monochromegane/go-home"; + src = fetchgit { + url = "https://github.com/monochromegane/go-home"; + rev = "25d9dda593924a11ea52e4ffbc8abdb0dbe96401"; + sha256 = "172chakrj22xfm0bcda4qj5zqf7lwr53pzwc3xj6wz8vd2bcxkww"; + }; + } + { + goPackagePath = "github.com/monochromegane/terminal"; + src = fetchgit { + url = "https://github.com/monochromegane/terminal"; + rev = "2da212063ce19aed90ee5bbb00ad1ad7393d7f48"; + sha256 = "1rddaq9pk5q57ildms35iihghqk505gb349pb0f6k3svchay38nh"; + }; + } + { + goPackagePath = "github.com/monochromegane/go-gitignore"; + src = fetchgit { + url = "https://github.com/monochromegane/go-gitignore"; + rev = "38717d0a108ca0e5af632cd6845ca77d45b50729"; + sha256 = "0r1inabpgg6sn6i47b02hcmd2p4dc1ab1mcy20mn1b2k3mpdj4b7"; + }; + } + { + goPackagePath = "github.com/shiena/ansicolor"; + src = fetchgit { + url = "https://github.com/shiena/ansicolor"; + rev = "a5e2b567a4dd6cc74545b8a4f27c9d63b9e7735b"; + sha256 = "0gwplb1b4fvav1vjf4b2dypy5rcp2w41vrbxkd1dsmac870cy75p"; + }; + } +] diff --git a/pkgs/tools/text/sift/default.nix b/pkgs/tools/text/sift/default.nix index 9a93b64e3693e..a00e2c1a56cc8 100644 --- a/pkgs/tools/text/sift/default.nix +++ b/pkgs/tools/text/sift/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, buildGoPackage, fetchFromGitHub }: +{ stdenv, lib, buildGoPackage, fetchFromGitHub, fetchgit }: buildGoPackage rec { name = "sift-${version}"; @@ -14,7 +14,7 @@ buildGoPackage rec { sha256 = "1nb042k420xr6000ipwhqn41vg8jfp6ghq4z7y1sjnndkrhclzm1"; }; - goDeps = ./deps.json; + goDeps = import ./deps.nix { inherit fetchgit; }; meta = with lib; { description = "sift is a fast and powerful alternative to grep"; diff --git a/pkgs/tools/text/sift/deps.json b/pkgs/tools/text/sift/deps.json deleted file mode 100644 index 649660353ad21..0000000000000 --- a/pkgs/tools/text/sift/deps.json +++ /dev/null @@ -1,10 +0,0 @@ -[ - { - "include": "../../libs.json", - "packages": [ - "github.com/svent/go-flags", - "github.com/svent/go-nbreader", - "golang.org/x/crypto" - ] - } -] diff --git a/pkgs/tools/text/sift/deps.nix b/pkgs/tools/text/sift/deps.nix new file mode 100644 index 0000000000000..8c4fd3a1c44c4 --- /dev/null +++ b/pkgs/tools/text/sift/deps.nix @@ -0,0 +1,27 @@ +{ fetchgit }: +[ + { + goPackagePath = "golang.org/x/crypto"; + src = fetchgit { + url = "https://go.googlesource.com/crypto"; + rev = "575fdbe86e5dd89229707ebec0575ce7d088a4a6"; + sha256 = "1kgv1mkw9y404pk3lcwbs0vgl133mwyp294i18jg9hp10s5d56xa"; + }; + } + { + goPackagePath = "github.com/svent/go-flags"; + src = fetchgit { + url = "https://github.com/svent/go-flags"; + rev = "4bcbad344f0318adaf7aabc16929701459009aa3"; + sha256 = "1gb416fgxl9gq4q6wsv3i2grq1mzbi7lvfvmfdqbxqbv9vizzh34"; + }; + } + { + goPackagePath = "github.com/svent/go-nbreader"; + src = fetchgit { + url = "https://github.com/svent/go-nbreader"; + rev = "7cef48da76dca6a496faa7fe63e39ed665cbd219"; + sha256 = "0hw11jj5r3f6qwydg41nc3c6aadlbkhc1qpxra2609lis0qa9h4r"; + }; + } +]