commit 8743663280fddc86d33257a0c48aad572f6866d6
parent 761ab00f002e8804ca0af39e07c32cd5d5ab68d7
Author: Vincent Demeester <vincent@sbr.pm>
Date: Tue, 14 Aug 2018 15:24:47 +0200
Update dobi to v0.11.1…
… using `dep2nix` too
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Diffstat:
3 files changed, 190 insertions(+), 79 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -3,6 +3,9 @@
let
pkgs = import <nixpkgs> { inherit system; };
in rec {
+ dobi = import ./dobi {
+ inherit (pkgs) stdenv lib fetchFromGitHub buildGoPackage;
+ };
prm = import ./prm {
inherit (pkgs) stdenv lib fetchgit;
};
diff --git a/pkgs/dobi/default.nix b/pkgs/dobi/default.nix
@@ -2,8 +2,8 @@
buildGoPackage rec {
name = "dobi-${version}";
- version = "v0.9";
- rev = "0cb9d4c4290d8c044b34f1fb5c662ac4116c2f25";
+ version = "v0.11.1";
+ rev = "7cca562fb4df4d06d0b0107108478d3d434c775f";
buildFlagsArray = let t = "${goPackagePath}/cmd"; in ''
-ldflags=
@@ -17,7 +17,7 @@ buildGoPackage rec {
inherit rev;
owner = "dnephin";
repo = "dobi";
- sha256 = "11a3nhhxcixz3sb92vr57gj5dpg4h47xy2v0wczxzcn1fhf2s06n";
+ sha256 = "0pv622dgdpl2nd4yvhjx6pgr1cd2bz5v9pisiaxivh1n7x5y3nzq";
};
goDeps = ./deps.nix;
diff --git a/pkgs/dobi/deps.nix b/pkgs/dobi/deps.nix
@@ -1,220 +1,327 @@
+# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix)
[
{
- goPackagePath = "github.com/Azure/go-ansiterm";
+ goPackagePath = "github.com/Azure/go-ansiterm";
fetch = {
type = "git";
url = "https://github.com/Azure/go-ansiterm";
- rev = "fa152c58bc15761d0200cb75fe958b89a9d4888e";
- sha256 = "09qlywlnp8gwjn4n5ri376bnvmkid823la8xsp0v0si8a98z8bv4";
+ rev = "d6e3b3328b783f23731bc4d058875b0371ff8109";
+ sha256 = "010khrkhkf9cxlvvb6ncqv4c1qcdmpbz9jn38g4fxf4xsma8xx1q";
};
}
{
- goPackagePath = "github.com/dnephin/configtf";
+ goPackagePath = "github.com/Microsoft/go-winio";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Microsoft/go-winio";
+ rev = "7da180ee92d8bd8bb8c37fc560e673e6557c392f";
+ sha256 = "19gjjhmzswhm11wzj38r5alxypmflmy0z42flhc3czhmmwv7b1av";
+ };
+ }
+ {
+ goPackagePath = "github.com/Nvveen/Gotty";
+ fetch = {
+ type = "git";
+ url = "https://github.com/ijc/Gotty";
+ rev = "a8b993ba6abdb0e0c12b0125c603323a71c7790c";
+ sha256 = "03fablbhvksc40l5jkzipqi2x90rq0awl29vbkbqdsf8iwn52f17";
+ };
+ }
+ {
+ goPackagePath = "github.com/Unknwon/com";
+ fetch = {
+ type = "git";
+ url = "https://github.com/Unknwon/com";
+ rev = "0db4a625e949e956314d7d1adea9bf82384cc10c";
+ sha256 = "09idg84jf8wx3aazgm9s392cxjz3afq41923y19hhx7ki19s49yh";
+ };
+ }
+ {
+ goPackagePath = "github.com/containerd/continuity";
+ fetch = {
+ type = "git";
+ url = "https://github.com/containerd/continuity";
+ rev = "3e8f2ea4b190484acb976a5b378d373429639a1a";
+ sha256 = "1zq8q2g1ik9pxqz5gqjjjig2fhssa9yi407bsmpbmrczw0274925";
+ };
+ }
+ {
+ goPackagePath = "github.com/dnephin/configtf";
fetch = {
type = "git";
url = "https://github.com/dnephin/configtf";
- rev = "6b0d1fdf5e68504061777fe78693fba1b40aef85";
+ rev = "6b0d1fdf5e68504061777fe78693fba1b40aef85";
sha256 = "0qbcpq2vqm8wws3ixb25z9dz5v4n62w8m10vhy68vvblsp46x2jp";
};
}
{
- goPackagePath = "github.com/dnephin/go-os-user";
+ goPackagePath = "github.com/dnephin/go-os-user";
fetch = {
type = "git";
url = "https://github.com/dnephin/go-os-user";
- rev = "44e2994deb1ed3c8bf21e28cbd5d2e3107b35e0b";
+ rev = "44e2994deb1ed3c8bf21e28cbd5d2e3107b35e0b";
sha256 = "0dk122hicmqvkdl7lm099mwsbhb0zrndafm7r9qxvlbffigipx1f";
};
}
{
- goPackagePath = "github.com/docker/docker";
+ goPackagePath = "github.com/docker/cli";
+ fetch = {
+ type = "git";
+ url = "https://github.com/docker/cli";
+ rev = "03a46a66bd0629b5097289c6180e7a72a0efd823";
+ sha256 = "15fb9993p1khyvn4bnn4v9vqrxdxl5v502qr0spqk43sy4ca0cl8";
+ };
+ }
+ {
+ goPackagePath = "github.com/docker/docker";
fetch = {
type = "git";
url = "https://github.com/docker/docker";
- rev = "515e5dade7a006dbd2c42880f1af695da22ece60";
- sha256 = "1m4cll2v0j0l00mp117x7gbs5r5shxgf7ydbp21pgjxb9v8f969y";
+ rev = "38588656727d19f4a36d14c3620ecaff73160315";
+ sha256 = "0nqyr6f8hi326pr8ai4rhgk7482sz14dcn68fx4pab6x5cv557bx";
};
}
{
- goPackagePath = "github.com/docker/go-connections";
+ goPackagePath = "github.com/docker/go-connections";
fetch = {
type = "git";
url = "https://github.com/docker/go-connections";
- rev = "1494b6df4050e60923d68cd8cc6a19e7af9f1c01";
- sha256 = "1r1r2a3giir1ixdqwqvg82mjvnah19xjry2i1nv30ri3xfxcz33n";
+ rev = "3ede32e2033de7505e6500d6c868c2b9ed9f169d";
+ sha256 = "0v1pkr8apwmhyzbjfriwdrs1ihlk6pw7izm57r24mf9jdmg3fyb0";
};
}
{
- goPackagePath = "github.com/docker/go-units";
+ goPackagePath = "github.com/docker/go-units";
fetch = {
type = "git";
url = "https://github.com/docker/go-units";
- rev = "8a7beacffa3009a9ac66bad506b18ffdd110cf97";
- sha256 = "0cljjl9j2bi10fy16y7icb3iz95x1zhjfswhc2yj0w2l8wvgzfjp";
+ rev = "0dadbb0345b35ec7ef35e228dabb8de89a65bf52";
+ sha256 = "1sqwvcszxqpv77xf2d8fxvryxphdwj9v8f93231wpnk9kpilhyii";
};
}
{
- goPackagePath = "github.com/fsouza/go-dockerclient";
+ goPackagePath = "github.com/fsouza/go-dockerclient";
fetch = {
type = "git";
url = "https://github.com/fsouza/go-dockerclient";
- rev = "348eb84e7de87ad89fd9a2656f56081b2a4d837b";
- sha256 = "0gm4cn2wcbnwb4zc5qwj4nry4hg9k922kk6b23zvhl63hy35mizv";
+ rev = "eb4b27262d9a41d4004d101c32e0598782a39415";
+ sha256 = "14n3q7fiwdkxw6vlrsi96agnahsvhrjrgk5mp9d7aa6iv577icjz";
};
}
{
- goPackagePath = "github.com/gogits/git-module";
+ goPackagePath = "github.com/gogits/git-module";
fetch = {
type = "git";
url = "https://github.com/gogits/git-module";
- rev = "b3009dc4f5842cf9e2e80fef1e125e79c38e4949";
- sha256 = "1f5mms15hknnj17nvb5dwwk8fcm8a9msy9qdjvkplihxgaqm0amz";
+ rev = "1de103dca47a72afccccb4ccd6085110874f3551";
+ sha256 = "0pblzhzpkyzqrxd0ph4svk07w7a659p5nnr8sa68jgwlxzyp06r2";
+ };
+ }
+ {
+ goPackagePath = "github.com/gogo/protobuf";
+ fetch = {
+ type = "git";
+ url = "https://github.com/gogo/protobuf";
+ rev = "6d097162a51e308ecd76eb70b4dbe07344534041";
+ sha256 = "1csg6hczpmndgk0fbnvnzmqpfj6f653wg8s8jdicapy8pkg1b0as";
};
}
{
- goPackagePath = "github.com/hashicorp/go-cleanhttp";
+ goPackagePath = "github.com/golang/mock";
fetch = {
type = "git";
- url = "https://github.com/hashicorp/go-cleanhttp";
- rev = "ad28ea4487f05916463e2423a55166280e8254b5";
- sha256 = "0xw0qas3ixg8p2xh09hhc81km0mfn9lbnfgrdb309hzcwhmiyqjm";
+ url = "https://github.com/golang/mock";
+ rev = "13f360950a79f5864a972c786a10a50e44b69541";
+ sha256 = "1inq0hq9sckpz1rr8j7g8sm3w5kjzpk2xwc5q4n6vsi19cdkrvgk";
};
}
- /*
{
- goPackagePath = "github.com/inconshreveable/mousetrap";
+ goPackagePath = "github.com/google/go-cmp";
+ fetch = {
+ type = "git";
+ url = "https://github.com/google/go-cmp";
+ rev = "3af367b6b30c263d47e8895973edcca9a49cf029";
+ sha256 = "1fbv0x27k9sn8svafc0hjwsnckk864lv4yi7bvzrxvmd3d5hskds";
+ };
+ }
+ {
+ goPackagePath = "github.com/inconshreveable/mousetrap";
fetch = {
type = "git";
url = "https://github.com/inconshreveable/mousetrap";
- rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
- sha256 = "1j51aaskfqc953p5s9naqimr04hzfijm4yczdsiway1xnnvvpfr1";
+ rev = "76626ae9c91c4f2a10f34cad8ce83ea42c93bb75";
+ sha256 = "1mn0kg48xkd74brf48qf5hzp0bc6g8cf5a77w895rl3qnlpfw152";
};
}
- */
{
- goPackagePath = "github.com/kballard/go-shellquote";
+ goPackagePath = "github.com/kballard/go-shellquote";
fetch = {
type = "git";
url = "https://github.com/kballard/go-shellquote";
- rev = "d8ec1a69a250a17bb0e419c386eac1f3711dc142";
- sha256 = "1a57hm0zwyi70am670s0pkglnkk1ilddnmfxz1ba7innpkf5z6s7";
+ rev = "cd60e84ee657ff3dc51de0b4f55dd299a3e136f2";
+ sha256 = "1xjpin4jq1zl84dcn96xhjmn9bsfyszf6g9aqyj2dc0xfi6c88y0";
};
}
{
- goPackagePath = "github.com/mcuadros/go-version";
+ goPackagePath = "github.com/mcuadros/go-version";
fetch = {
type = "git";
url = "https://github.com/mcuadros/go-version";
- rev = "d52711f8d6bea8dc01efafdb68ad95a4e2606630";
- sha256 = "08ps27vvn77jhrnks8p8mx5cwgb1ikhaddcnrpgpz7aq905a5kzn";
+ rev = "257f7b9a7d87427c8d7f89469a5958d57f8abd7c";
+ sha256 = "0mpbcc698503hbrlc74l3nqd6hdr0n6vybfzw10pg7qx3cpmn512";
};
}
{
- goPackagePath = "github.com/metakeule/fmtdate";
+ goPackagePath = "github.com/metakeule/fmtdate";
fetch = {
type = "git";
url = "https://github.com/metakeule/fmtdate";
- rev = "427373e7d2f8fcaa70a83e289c15fb3618a945bc";
+ rev = "427373e7d2f8fcaa70a83e289c15fb3618a945bc";
sha256 = "1xfcg8vd1z12kvp03arp5rbvrf5717blwippia9c1yxn050a4qwy";
};
}
{
- goPackagePath = "github.com/Microsoft/go-winio";
+ goPackagePath = "github.com/opencontainers/go-digest";
fetch = {
type = "git";
- url = "https://github.com/Microsoft/go-winio";
- rev = "ce2922f643c8fd76b46cadc7f404a06282678b34";
- sha256 = "162533q8jhbpl48hcpxyzbldrkmm9v803s8r6ssds5xbqx7gv2s1";
+ url = "https://github.com/opencontainers/go-digest";
+ rev = "279bed98673dd5bef374d3b6e4b09e2af76183bf";
+ sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9";
+ };
+ }
+ {
+ goPackagePath = "github.com/opencontainers/image-spec";
+ fetch = {
+ type = "git";
+ url = "https://github.com/opencontainers/image-spec";
+ rev = "b8fec85fd4e360fc136fc5f137a5ea02872d117a";
+ sha256 = "0rp93mk6isz0yjfa1w77811pn5p2cyzlpvhlz42l4lgb1l39sm84";
};
}
{
- goPackagePath = "github.com/opencontainers/runc";
+ goPackagePath = "github.com/opencontainers/runc";
fetch = {
type = "git";
url = "https://github.com/opencontainers/runc";
- rev = "4c8007f34a0077a1040923ee4c7cec64b6e070d4";
- sha256 = "0dlrlflam74035gz6c351ay32yb7vysv5wf0a971hy01lvm68d7c";
+ rev = "825b5c020aced5e457fa384bd4bb6927c5f8de56";
+ sha256 = "0n1hqj0f3ppr59c7riz6rg0kn9fsbr45i84ffmsm8z0gndkwfq0y";
+ };
+ }
+ {
+ goPackagePath = "github.com/pkg/errors";
+ fetch = {
+ type = "git";
+ url = "https://github.com/pkg/errors";
+ rev = "645ef00459ed84a119197bfb8d8205042c6df63d";
+ sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5";
};
}
{
- goPackagePath = "github.com/renstorm/dedent";
+ goPackagePath = "github.com/renstrom/dedent";
fetch = {
type = "git";
url = "https://github.com/renstrom/dedent";
- rev = "020d11c3b9c0c7a3c2efcc8e5cf5b9ef7bcea21f";
+ rev = "020d11c3b9c0c7a3c2efcc8e5cf5b9ef7bcea21f";
sha256 = "0awsnc3hf4n46p388zg0cijh2sk813cyqpqk6f95kbzx9h9gv7lk";
};
}
{
- goPackagePath = "github.com/Sirupsen/logrus";
+ goPackagePath = "github.com/sirupsen/logrus";
fetch = {
type = "git";
- url = "https://github.com/Sirupsen/logrus";
- rev = "26709e2714106fb8ad40b773b711ebce25b78914";
- sha256 = "11sd2dc5w3ny84zk1pcvvirkmq84ac0bnf1vq4p9j5qj05zjz3rb";
+ url = "https://github.com/sirupsen/logrus";
+ rev = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc";
+ sha256 = "0g5z7al7kky11ai2dhac6gkp3b5pxsvx72yj3xg4wg3265gbn7yz";
};
}
{
- goPackagePath = "github.com/spf13/cobra";
+ goPackagePath = "github.com/spf13/cobra";
fetch = {
type = "git";
url = "https://github.com/dnephin/cobra";
- rev = "8e4c18bd418c1b9060ddf7760316aa7c2a468127";
- sha256 = "0an8mv9xn3zlzvy0whq8k9wi9jwqk2mwb2rv7fks6yknyfpvdh98";
+ rev = "5d13e8c9d917d962ffc593fb2529d281ae04a7fd";
+ sha256 = "091pbg3rscj9096iwa5mxmx852xdabdnyffxqgqp6xc02267in9z";
};
}
{
- goPackagePath = "github.com/spf13/pflag";
+ goPackagePath = "github.com/spf13/pflag";
fetch = {
type = "git";
url = "https://github.com/spf13/pflag";
- rev = "5ccb023bc27df288a957c5e994cd44fd19619465";
- sha256 = "1r65j8sw15pz0iacwnf303p6s51vkv0k6qc5cyb2kybfraqd7f7z";
+ rev = "e57e3eeb33f795204c1ca35f56c44f83227c6e66";
+ sha256 = "13mhx4i913jil32j295m3a36jzvq1y64xig0naadiz7q9ja011r2";
};
}
{
- goPackagePath = "github.com/Unknwon/com";
+ goPackagePath = "github.com/valyala/bytebufferpool";
fetch = {
type = "git";
- url = "https://github.com/Unknwon/com";
- rev = "28b053d5a2923b87ce8c5a08f3af779894a72758";
- sha256 = "09i9slj4zbsqmwkkx9bqi7cgpv6hqby6r98l6qx1wag89qijybz2";
+ url = "https://github.com/valyala/bytebufferpool";
+ rev = "e746df99fe4a3986f4d4f79e13c1e0117ce9c2f7";
+ sha256 = "01lqzjddq6kz9v41nkky7wbgk7f1cw036sa7ldz10d82g5klzl93";
};
}
{
- goPackagePath = "github.com/valyala/fasttemplate";
+ goPackagePath = "github.com/valyala/fasttemplate";
fetch = {
type = "git";
url = "https://github.com/valyala/fasttemplate";
- rev = "3b874956e03f1636d171bda64b130f9135f42cff";
- sha256 = "0h17a316a148g3diylpasa9hwx0rp8l619kqdz6spmf9l5iml4hh";
+ rev = "dcecefd839c4193db0d35b88ec65b4c12d360ab0";
+ sha256 = "0kkxn0ad5a36533djh50n9l6wsylmnykridkm91dqlqbjirn7216";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/crypto";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/crypto";
+ rev = "88942b9c40a4c9d203b82b3731787b672d6e809b";
+ sha256 = "0jw1faq8krcxwf1fv3w75apk1ncnykwg8y5ahs5rasjmspvkv8cw";
};
}
{
- goPackagePath = "golang.org/x/net";
+ goPackagePath = "golang.org/x/net";
fetch = {
type = "git";
url = "https://go.googlesource.com/net";
- rev = "3fe3024eef808ba2798cc1855690f49e2b860573";
- sha256 = "0r6i9b3r33lzpcww0sijzw16dw4klz97m4dynja1ids7g6yddq4a";
+ rev = "b3756b4b77d7b13260a0a2ec658753cf48922eac";
+ sha256 = "1c6g3cw7ljz6bnwh7sy0pnxjr1ssmzygcsdrgva0kyxzcha5wynq";
};
}
{
- goPackagePath = "golang.org/x/sys";
+ goPackagePath = "golang.org/x/sys";
fetch = {
type = "git";
url = "https://go.googlesource.com/sys";
- rev = "c200b10b5d5e122be351b67af224adc6128af5bf";
- sha256 = "1f764m3q05q2dq1pdms07jcixw4xakqw46w1djrmbhjmd9q8b0av";
+ rev = "13d03a9a82fba647c21a0ef8fba44a795d0f0835";
+ sha256 = "1lmyd4mk7lbgnxyvr6ndfdfafazp9a4cc6c0a2q2j4n53g2vwbgk";
+ };
+ }
+ {
+ goPackagePath = "golang.org/x/time";
+ fetch = {
+ type = "git";
+ url = "https://go.googlesource.com/time";
+ rev = "6dc17368e09b0e8634d71cac8168d853e869a0c7";
+ sha256 = "1fx4cf5fpdz00g3c7vxzy92hdcg0vh4yqw00qp5s52j72qixynbk";
+ };
+ }
+ {
+ goPackagePath = "gopkg.in/yaml.v2";
+ fetch = {
+ type = "git";
+ url = "https://github.com/go-yaml/yaml";
+ rev = "3b4ad1db5b2a649883ff3782f5f9f6fb52be71af";
+ sha256 = "05kaxpcbq1mwb4yw4r04gg0y877n85gq4k055v2ss1jc6a2fmv0b";
};
}
{
- goPackagePath = "gopkg.in/yaml.v2";
+ goPackagePath = "gotest.tools";
fetch = {
type = "git";
- url = "https://gopkg.in/yaml.v2";
- rev = "a5b47d31c556af34a302ce5d659e6fea44d90de0";
- sha256 = "0v6l48fshdjrqzyq1kwn22gy7vy434xdr1i0lm3prsf6jbln9fam";
+ url = "https://github.com/gotestyourself/gotest.tools";
+ rev = "14eefd8766a1439cddfc295ecf6327cb422b4bb2";
+ sha256 = "19iwbpnzh8x1cvpr7dfhp7y50arlpqk4n7zk3yr2vjc1bx5bcq47";
};
}
-]
+]+
\ No newline at end of file
