From e6baec86270dc1306a6f7091891fee21c66b49a7 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Mon, 2 Feb 2015 23:55:17 -0800 Subject: Update Packer to 0.7.5 Change-Id: I7822ac036947fb933fb66730f39426e499a097f9 --- pkgs/development/tools/packer/default.nix | 2 +- pkgs/development/tools/packer/deps.nix | 358 +++++++++++++++++++++--------- 2 files changed, 249 insertions(+), 111 deletions(-) (limited to 'pkgs') diff --git a/pkgs/development/tools/packer/default.nix b/pkgs/development/tools/packer/default.nix index 073de5137f85..8b89e8ae82db 100644 --- a/pkgs/development/tools/packer/default.nix +++ b/pkgs/development/tools/packer/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, gox, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: stdenv.mkDerivation rec { - name = "packer-0.6.0"; + name = "packer-0.7.5"; src = import ./deps.nix { inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; diff --git a/pkgs/development/tools/packer/deps.nix b/pkgs/development/tools/packer/deps.nix index ce56ecad8a28..e2272574f81e 100644 --- a/pkgs/development/tools/packer/deps.nix +++ b/pkgs/development/tools/packer/deps.nix @@ -1,44 +1,44 @@ -{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: +# This file was generated by go2nix. +{ stdenv, lib, fetchFromGitHub, fetchgit, fetchhg, fetchbzr }: let goDeps = [ - { - root = "github.com/mitchellh/packer"; - src = fetchFromGitHub { - owner = "mitchellh"; - repo = "packer"; - rev = "12e28f257f66299e3bb13a053bf06ccd236e7efd"; - sha256 = "1r5j864kr7lx137c23kk5s82znk11hsrgq98zfz5r8sbzq1xpbzw"; - }; - } { root = "code.google.com/p/go.crypto"; src = fetchhg { - url = "http://code.google.com/p/go.crypto"; - rev = "199"; - sha256 = "0ibrpc6kknzl6a2g2fkxn03mvrd635lcnvf4a9rk1dfrpjbpcixh"; + url = "https://code.google.com/p/go.crypto"; + rev = "235"; + sha256 = "0b3nlkhmraj84n9mhg5nqcd3815ipyj1xx1yzkajcdf2pz2ym4l6"; }; } { root = "code.google.com/p/goauth2"; src = fetchhg { - url = "http://code.google.com/p/goauth2"; - rev = "67"; - sha256 = "053vajj8hd9869by7z9qfgzn84h6avpcjvyxcyw5jml8dsln4bah"; + url = "https://code.google.com/p/goauth2"; + rev = "80"; + sha256 = "0xgkgcb97hv2rvzvh21rvydq5cc83j7sdsdb1chrymq8k7l4dzc1"; }; } { root = "code.google.com/p/google-api-go-client"; src = fetchhg { - url = "http://code.google.com/p/google-api-go-client"; - rev = "111"; - sha256 = "1ib8i1c2mb86lkrr5w7bgwb70gkqmp860wa3h1j8080gxdx3yy16"; + url = "https://code.google.com/p/google-api-go-client"; + rev = "135"; + sha256 = "17a0mlq76cmgv84xh5vjzi72r6rjq0abl6gv3zkbmj3cphl9cis9"; + }; + } + { + root = "code.google.com/p/goprotobuf"; + src = fetchhg { + url = "https://code.google.com/p/goprotobuf"; + rev = "267"; + sha256 = "0kamslfmxs6hi9ww52izmsq48ldaf67xawwhzwwdsbslhv0b9lf7"; }; } { root = "code.google.com/p/gosshold"; src = fetchhg { - url = "http://code.google.com/p/gosshold"; + url = "https://code.google.com/p/gosshold"; rev = "2"; sha256 = "1ljl8pcxxfz5rv89b2ajd31gxxzifl57kzpksvdhyjdxh98gkvg8"; }; @@ -48,25 +48,17 @@ let src = fetchFromGitHub { owner = "ActiveState"; repo = "tail"; - rev = "8dcd1ad3e57aa8ce5614a837cbbdb21945fbb55a"; - sha256 = "1jxj576dd7mawawwg5nzwf6k7sks0r3lp2x8f6kxaps50n3k1wiz"; + rev = "068b72961a6bc5b4a82cf4fc14ccc724c0cfa73a"; + sha256 = "08zwlrsyr75cqdar51cihhp1qfm6wnn03i9srdkyzllw4zfymcd2"; }; } { - root = "github.com/howeyc/fsnotify"; + root = "github.com/bmizerany/assert"; src = fetchFromGitHub { - owner = "howeyc"; - repo = "fsnotify"; - rev = "441bbc86b167f3c1f4786afae9931403b99fdacf"; - sha256 = "1v5vrwhmidxjj6sppinyizf85v60zrmn7i6c9xk0pvx6k0kw2mr2"; - }; - } - { - root = "launchpad.net/tomb"; - src = fetchbzr { - url = "https://launchpad.net/tomb"; - rev = "17"; - sha256 = "1cjw0sr9hald1darq6n8akfpkzcgrk3mcq59hga3ibf2lrg35ha0"; + owner = "bmizerany"; + repo = "assert"; + rev = "e17e99893cb6509f428e1728281c2ad60a6b31e3"; + sha256 = "1lfrvqqmb09y6pcr76yjv4r84cshkd4s7fpmiy7268kfi2cvqnpc"; }; } { @@ -79,73 +71,102 @@ let }; } { - root = "code.google.com/p/goprotobuf"; - src = fetchhg { - url = "http://code.google.com/p/goprotobuf"; - rev = "246"; - sha256 = "0k4wcv1dnkwcp0gdrajj6kr25f1lg4lgpbi0h5v9l9n7sdwzplf4"; + root = "github.com/golang/protobuf"; + src = fetchFromGitHub { + owner = "golang"; + repo = "protobuf"; + rev = "a11b6342f0e28eab4059c0cabbad38cef38b9b6e"; + sha256 = "1bjig0bwgw1r56r8paskm880lw36nh4c6n64v4ww6mszwmk7dkn7"; }; } { - root = "github.com/bmizerany/assert"; + root = "github.com/hashicorp/atlas-go"; src = fetchFromGitHub { - owner = "bmizerany"; - repo = "assert"; - rev = "e17e99893cb6509f428e1728281c2ad60a6b31e3"; - sha256 = "1lfrvqqmb09y6pcr76yjv4r84cshkd4s7fpmiy7268kfi2cvqnpc"; + owner = "hashicorp"; + repo = "atlas-go"; + rev = "137646809ce33b755be51e5e82b40775217ff74d"; + sha256 = "06ilw0bwd3ijfcpkg84j3q9gwgllzwg0g6gab3w08cn1p49jicjg"; }; } { - root = "github.com/kr/pretty"; + root = "github.com/hashicorp/go-checkpoint"; src = fetchFromGitHub { - owner = "kr"; - repo = "pretty"; - rev = "bc9499caa0f45ee5edb2f0209fbd61fbf3d9018f"; - sha256 = "1m61y592qsnwsqn76v54mm6h2pcvh4wlzbzscc1ag645x0j33vvl"; + owner = "hashicorp"; + repo = "go-checkpoint"; + rev = "efefdc69845f7fa7245d20827d31fb27b848d955"; + sha256 = "1vpi414bw3rsyg5rx52hpvjhnk2qazmsvl3f13g79zwwkvbj2vvq"; }; } { - root = "github.com/kr/text"; + root = "github.com/hashicorp/go-msgpack"; src = fetchFromGitHub { - owner = "kr"; - repo = "text"; - rev = "6807e777504f54ad073ecef66747de158294b639"; - sha256 = "1wkszsg08zar3wgspl9sc8bdsngiwdqmg3ws4y0bh02sjx5a4698"; + owner = "hashicorp"; + repo = "go-msgpack"; + rev = "71c2886f5a673a35f909803f38ece5810165097b"; + sha256 = "157f24xnkhclrjwwa1b7lmpj112ynlbf7g1cfw0c657iqny5720j"; }; } { - root = "github.com/kr/pty"; + root = "github.com/hashicorp/go-version"; + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "go-version"; + rev = "bb92dddfa9792e738a631f04ada52858a139bcf7"; + sha256 = "0fl5a6j6nk1xsxwjdpa24a24fxvgnvm3jjlgpyrnmbdn380zil3m"; + }; + } + { + root = "github.com/hashicorp/yamux"; + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "yamux"; + rev = "9feabe6854fadca1abec9cd3bd2a613fe9a34000"; + sha256 = "03lgbhwhiqk6rivc5cl6zxph5n2pdbdz95h0x7m0ngp3yk3aqgan"; + }; + } + { + root = "github.com/howeyc/fsnotify"; + src = fetchFromGitHub { + owner = "howeyc"; + repo = "fsnotify"; + rev = "4894fe7efedeeef21891033e1cce3b23b9af7ad2"; + sha256 = "09r3h200nbw8a4d3rn9wxxmgma2a8i6ssaplf3zbdc2ykizsq7mn"; + }; + } + { + root = "github.com/kr/pretty"; src = fetchFromGitHub { owner = "kr"; - repo = "pty"; - rev = "67e2db24c831afa6c64fc17b4a143390674365ef"; - sha256 = "1l3z3wbb112ar9br44m8g838z0pq2gfxcp5s3ka0xvm1hjvanw2d"; + repo = "pretty"; + rev = "cb0850c1681cbca3233e84f7e6ec3e4c3f352085"; + sha256 = "0j3jd7qlfv6iw7icn66y1fpdn88ri29n9qv9di92mkc6vjw4ifb1"; }; } { - root = "github.com/xiocode/toolkit"; + root = "github.com/kr/pty"; src = fetchFromGitHub { - owner = "xiocode"; - repo = "toolkit"; - rev = "352fd7c6700074a81056cdfc9e82b3e8c5681ac5"; - sha256 = "0p33zh57xpxyk2wyp9xahdxyrkq48ysihpr0n9kj713q0dh7x4a3"; + owner = "kr"; + repo = "pty"; + rev = "05017fcccf23c823bfdea560dcc958a136e54fb7"; + sha256 = "0f7xa8lkazif2jzacryryrg8rqz5lfl3j7hqvnis4qa8cjy5dpqb"; }; } { - root = "launchpad.net/gocheck"; - src = fetchbzr { - url = "https://launchpad.net/gocheck"; - rev = "87"; - sha256 = "1y9fa2mv61if51gpik9isls48idsdz87zkm1p3my7swjdix7fcl0"; + root = "github.com/kr/text"; + src = fetchFromGitHub { + owner = "kr"; + repo = "text"; + rev = "6807e777504f54ad073ecef66747de158294b639"; + sha256 = "1wkszsg08zar3wgspl9sc8bdsngiwdqmg3ws4y0bh02sjx5a4698"; }; } { - root = "github.com/hashicorp/go-version"; + root = "github.com/mitchellh/cli"; src = fetchFromGitHub { - owner = "hashicorp"; - repo = "go-version"; - rev = "bb92dddfa9792e738a631f04ada52858a139bcf7"; - sha256 = "0fl5a6j6nk1xsxwjdpa24a24fxvgnvm3jjlgpyrnmbdn380zil3m"; + owner = "mitchellh"; + repo = "cli"; + rev = "e3c2e3d39391e9beb9660ccd6b4bd9a2f38dd8a0"; + sha256 = "1fwf7wmlhri19bl2yyjd4zlgndgwwqrdry45clpszzjsr8b5wfgm"; }; } { @@ -171,17 +192,17 @@ let src = fetchFromGitHub { owner = "mitchellh"; repo = "goamz"; - rev = "c3ff5f734c89f1ea1f290c6aadbbceeeb19a623c"; - sha256 = "1nyi1p5yh21r161icnwkcgmj2y38b4m1jis47vvjbqinrp45w1gq"; + rev = "6932a73f35dfdd5489a95284552c0ae868be0944"; + sha256 = "03hbakfxvxkj1r0xy2c4b8xpb7bw6nbryyxpwlii6qv7gsx478yw"; }; } { - root = "github.com/motain/gocheck"; + root = "github.com/mitchellh/gophercloud-fork-40444fb"; src = fetchFromGitHub { - owner = "motain"; - repo = "gocheck"; - rev = "9beb271d26e640863a5bf4a3c5ea40ccdd466b84"; - sha256 = "07arpwfdb51b5f7kzqnm5s5ndfmxv5j793hpn30nbdcya46diwjd"; + owner = "mitchellh"; + repo = "gophercloud-fork-40444fb"; + rev = "40444fbc2b10960682b34e6822eb9179216e1ae1"; + sha256 = "06bm7hfi03c75npzy51wbl9qyln35c3kzj9yn2w4fhn0k9dia9s3"; }; } { @@ -198,8 +219,8 @@ let src = fetchFromGitHub { owner = "mitchellh"; repo = "mapstructure"; - rev = "743fcf103ac7cdbc159e540d9d0e3a7889b87d68"; - sha256 = "1qqxsnxabd7c04n0ip1wmpr2g913qchqrbmblq0shrf5p1hnszgn"; + rev = "442e588f213303bec7936deba67901f8fc8f18b1"; + sha256 = "076svhy5jlnw4jykm3dsrx2dswifajrpr7d09mz9y6g3lg901rqd"; }; } { @@ -220,22 +241,40 @@ let sha256 = "02pczqml6p1mnfdrygm3rs02g0r65qx8v1bi3x24dx8wv9dr5y23"; }; } + { + root = "github.com/mitchellh/packer"; + src = fetchFromGitHub { + owner = "mitchellh"; + repo = "packer"; + rev = "e3c2f01cb8d8f759c02bd3cfc9d27cc1a941d498"; + sha256 = "0sp2qjdsf0cqmw11a3vfs9alyz76vf415vv71bwdarfagz466inw"; + }; + } { root = "github.com/mitchellh/panicwrap"; src = fetchFromGitHub { owner = "mitchellh"; repo = "panicwrap"; - rev = "1aedff2aaa8b8ff7f65ab58e94ef9f593e2e3bf4"; - sha256 = "05brbpc7kizzbs1a128fmjddh7rdyg0jzzxgbvrl58cgklh4yzaa"; + rev = "45cbfd3bae250c7676c077fb275be1a2968e066a"; + sha256 = "0mbha0nz6zcgp2pny2x03chq1igf9ylpz55xxq8z8g2jl6cxaghn"; }; } { - root = "github.com/rackspace/gophercloud"; + root = "github.com/mitchellh/prefixedio"; src = fetchFromGitHub { - owner = "rackspace"; - repo = "gophercloud"; - rev = "2285a429874c1365ef6c6d3ceb08b1d428e26aca"; - sha256 = "0py3h64r4wkl2r9j7xlh81nazpg2b0r5ba9iblh6d1380yk4fa7f"; + owner = "mitchellh"; + repo = "prefixedio"; + rev = "89d9b535996bf0a185f85b59578f2e245f9e1724"; + sha256 = "0lc64rlizb412msd32am2fixkh0536pjv7czvgyw5fskn9kgk3y2"; + }; + } + { + root = "github.com/motain/gocheck"; + src = fetchFromGitHub { + owner = "motain"; + repo = "gocheck"; + rev = "9beb271d26e640863a5bf4a3c5ea40ccdd466b84"; + sha256 = "07arpwfdb51b5f7kzqnm5s5ndfmxv5j793hpn30nbdcya46diwjd"; }; } { @@ -243,8 +282,26 @@ let src = fetchFromGitHub { owner = "racker"; repo = "perigee"; - rev = "01db3191866051f2ec854c2d876ac1a179d3049c"; - sha256 = "05pmlgwjynbr59bw50zhrklzhr5pgnij9ym5hqvijjrpw3qd9ivf"; + rev = "44a7879d89b7040bcdb51164a83292ef5bf9deec"; + sha256 = "04wscffagpbcfjs6br96n46aqy43cq6ndq16nlpvank0m98jaax0"; + }; + } + { + root = "github.com/rackspace/gophercloud"; + src = fetchFromGitHub { + owner = "rackspace"; + repo = "gophercloud"; + rev = "d7f07fc0a7ff4b608c6f9e34197930093c7c7ee1"; + sha256 = "1cyfvynwl5z6f9s0lmj92mhsriy7nl7kq5f8jay67wmdn0nhyybs"; + }; + } + { + root = "github.com/rasa/oauth2-fork-b3f9a68"; + src = fetchFromGitHub { + owner = "rasa"; + repo = "oauth2-fork-b3f9a68"; + rev = "94a7bc9691e0841393b875eaad68fbfd069b2a18"; + sha256 = "101bv0zwbchdql86x8c4qhvmlahkfcw4bnqw7v8hihqxd5zf9fxp"; }; } { @@ -252,8 +309,26 @@ let src = fetchFromGitHub { owner = "ugorji"; repo = "go"; - rev = "71c2886f5a673a35f909803f38ece5810165097b"; - sha256 = "157f24xnkhclrjwwa1b7lmpj112ynlbf7g1cfw0c657iqny5720j"; + rev = "39815c8993d27d88435f3d267be35a6d26e43f03"; + sha256 = "1g5nbcs3900chwv0jz1a9x0s3scxjhksi1268w112mq2k1rinq3j"; + }; + } + { + root = "github.com/ugorji/go-msgpack"; + src = fetchFromGitHub { + owner = "ugorji"; + repo = "go-msgpack"; + rev = "75092644046c5e38257395b86ed26c702dc95b92"; + sha256 = "1bmqi16bfiqw7qhb3d5hbh0dfzhx2bbq1g15nh2pxwxckwh80x98"; + }; + } + { + root = "github.com/vaughan0/go-ini"; + src = fetchFromGitHub { + owner = "vaughan0"; + repo = "go-ini"; + rev = "a98ad7ee00ec53921f08832bc06ecf7fd600e6a1"; + sha256 = "1l1isi3czis009d9k5awsj4xdxgbxn4n9yqjc1ac7f724x6jacfa"; }; } { @@ -261,17 +336,89 @@ let src = fetchFromGitHub { owner = "vmihailenco"; repo = "msgpack"; - rev = "20c1b88a6c7fc5432037439f4e8c582e236fb205"; - sha256 = "1dj5scpfhgnw0yrh0w6jlrb9d03halvsv4l3wgjhazrrimdqf0q0"; + rev = "1efcd9943dd320d41d8a00189e568d794f1b4e78"; + sha256 = "0brbrss7hja2d06cca633ggn5jawqwb8p0prp5cg1m26w9f3hzis"; }; } { - root = "github.com/ugorji/go-msgpack"; + root = "github.com/xiocode/toolkit"; src = fetchFromGitHub { - owner = "ugorji"; - repo = "go-msgpack"; - rev = "75092644046c5e38257395b86ed26c702dc95b92"; - sha256 = "1bmqi16bfiqw7qhb3d5hbh0dfzhx2bbq1g15nh2pxwxckwh80x98"; + owner = "xiocode"; + repo = "toolkit"; + rev = "352fd7c6700074a81056cdfc9e82b3e8c5681ac5"; + sha256 = "0p33zh57xpxyk2wyp9xahdxyrkq48ysihpr0n9kj713q0dh7x4a3"; + }; + } + { + root = "golang.org/x/crypto"; + src = fetchgit { + url = "https://go.googlesource.com/crypto"; + rev = "bfc286917c5fcb7420d7e3092b50bbfd31b38a98"; + sha256 = "04ryvpbd2z4q4wqaffmj4wc541y744rfjg6arhwf4qn64r171am0"; + }; + } + { + root = "golang.org/x/net"; + src = fetchgit { + url = "https://go.googlesource.com/net"; + rev = "2033b3a5e8688bdd590c647ca70a12384ddc6824"; + sha256 = "06zla6nja6af735b2rskb5l2pjggw99v05fl4n306dcnvwj3gvg6"; + }; + } + { + root = "golang.org/x/text"; + src = fetchgit { + url = "https://go.googlesource.com/text"; + rev = "bfad311ce93436dc888b40d76c78f99dc3104473"; + sha256 = "1mbhp5q24drz2l2x6ib3180i42f9015ry80bn7jhr7rwizvyp6lh"; + }; + } + { + root = "google.golang.org/appengine"; + src = fetchgit { + url = "https://github.com/golang/appengine.git"; + rev = "d1e7e222a24d1e085466ed8b44aedd572f5a51c4"; + sha256 = "045dmq0m56m1n16fygdghmkaqh7xb2g80xrm7lkcbkf3763w8gfw"; + }; + } + { + root = "gopkg.in/check.v1"; + src = fetchgit { + url = "https://gopkg.in/check.v1"; + rev = "64131543e7896d5bcc6bd5a76287eb75ea96c673"; + sha256 = "0ybxgxkkmfhgd4pmjf7hgpp7d7zxsskc7kv9dklqbaf6aszsqbxl"; + }; + } + { + root = "gopkg.in/tomb.v1"; + src = fetchgit { + url = "https://gopkg.in/tomb.v1"; + rev = "dd632973f1e7218eb1089048e0798ec9ae7dceb8"; + sha256 = "1lqmq1ag7s4b3gc3ddvr792c5xb5k6sfn0cchr3i2s7f1c231zjv"; + }; + } + { + root = "gopkg.in/vmihailenco/msgpack.v2"; + src = fetchgit { + url = "https://gopkg.in/vmihailenco/msgpack.v2"; + rev = "1efcd9943dd320d41d8a00189e568d794f1b4e78"; + sha256 = "0brbrss7hja2d06cca633ggn5jawqwb8p0prp5cg1m26w9f3hzis"; + }; + } + { + root = "labix.org/v2/mgo"; + src = fetchbzr { + url = "https://launchpad.net/mgo/v2"; + rev = "287"; + sha256 = "0602x0liyp3w2v8cj1nyq73576vbxlxx1z1a8nn173pajxx9pm2z"; + }; + } + { + root = "launchpad.net/gocheck"; + src = fetchbzr { + url = "https://launchpad.net/gocheck"; + rev = "87"; + sha256 = "1y9fa2mv61if51gpik9isls48idsdz87zkm1p3my7swjdix7fcl0"; }; } { @@ -282,15 +429,6 @@ let sha256 = "0h1dxzyx5c4r4gfnmjxv92hlhjxrgx9p4g53p4fhmz6x2fdglb0x"; }; } - { - root = "github.com/vmihailenco/bufio"; - src = fetchFromGitHub { - owner = "vmihailenco"; - repo = "bufio"; - rev = "24e7e48f60fc2d9e99e43c07485d9fff42051e66"; - sha256 = "0x46qnf2f15v7m0j2dcb16raxjamk5rdc7hqwgyxfr1sqmmw3983"; - }; - } ]; in -- cgit 1.4.1