From 94809f691606d4ffef3f26465116690520c0c467 Mon Sep 17 00:00:00 2001 From: Ding Xiang Fei <6884440+dingxiangfei2009@users.noreply.github.com> Date: Mon, 7 Jan 2019 17:33:07 +0800 Subject: [PATCH] bump concourse to next unstable master (#10) --- .../concourse/worker.nix | 1 + .../assets/resources/git-resource/default.nix | 4 +- .../registry-image-resource/default.nix | 4 +- .../registry-image-resource/deps.nix | 113 ++--- .../assets/resources/time-resource/deps.nix | 1 + .../concourse/default.nix | 4 +- .../continuous-integration/concourse/deps.nix | 199 ++++---- .../concourse/garden-runc/default.nix | 4 +- .../concourse/garden-runc/grootfs/default.nix | 6 +- .../concourse/garden-runc/grootfs/deps.nix | 472 +++++++++++++++++- 10 files changed, 636 insertions(+), 172 deletions(-) diff --git a/nixos/modules/services/continuous-integration/concourse/worker.nix b/nixos/modules/services/continuous-integration/concourse/worker.nix index dbb798e69d0a7..f42341604c26d 100644 --- a/nixos/modules/services/continuous-integration/concourse/worker.nix +++ b/nixos/modules/services/continuous-integration/concourse/worker.nix @@ -213,6 +213,7 @@ in gzip iproute iptables + kmod utillinux ]; diff --git a/pkgs/development/tools/continuous-integration/concourse/assets/resources/git-resource/default.nix b/pkgs/development/tools/continuous-integration/concourse/assets/resources/git-resource/default.nix index b878a0a196b72..5ce1033e4cd50 100644 --- a/pkgs/development/tools/continuous-integration/concourse/assets/resources/git-resource/default.nix +++ b/pkgs/development/tools/continuous-integration/concourse/assets/resources/git-resource/default.nix @@ -8,12 +8,12 @@ runCommand, }: let - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "concourse"; repo = "git-resource"; rev = "v${version}"; - sha256 = "1nhzk9mxawzvdwk601ykllwhalfc64hpfva1x2v3xsacsgn3zvym"; + sha256 = "0mkc4scc8n49ah2yqjp0s0ivhinfi4992362sk1iybivz0dr8sxz"; }; env = buildEnv { name = "system-path"; diff --git a/pkgs/development/tools/continuous-integration/concourse/assets/resources/registry-image-resource/default.nix b/pkgs/development/tools/continuous-integration/concourse/assets/resources/registry-image-resource/default.nix index dd3ed1d0f9de3..23f4db22d0a0b 100644 --- a/pkgs/development/tools/continuous-integration/concourse/assets/resources/registry-image-resource/default.nix +++ b/pkgs/development/tools/continuous-integration/concourse/assets/resources/registry-image-resource/default.nix @@ -8,7 +8,7 @@ runCommand, }: let - version = "0.1.1"; + version = "0.2.0"; registry-image-resource = buildGoPackage { name = "registry-image-resource"; goPackagePath = "github.com/concourse/registry-image-resource"; @@ -17,7 +17,7 @@ let owner = "concourse"; repo = "registry-image-resource"; rev = "v${version}"; - sha256 = "134fqvvcyldhpkv38f0anlrmplmsz0if71fvmgzm1d0wi5lxg9za"; + sha256 = "0sz5ig1f1297ma3yi7fc3p4jmn9wm2svnlv2j1l2j5zpv0nqpjx2"; }; }; diff --git a/pkgs/development/tools/continuous-integration/concourse/assets/resources/registry-image-resource/deps.nix b/pkgs/development/tools/continuous-integration/concourse/assets/resources/registry-image-resource/deps.nix index 6cca7443351a3..f1635ad771d5c 100644 --- a/pkgs/development/tools/continuous-integration/concourse/assets/resources/registry-image-resource/deps.nix +++ b/pkgs/development/tools/continuous-integration/concourse/assets/resources/registry-image-resource/deps.nix @@ -1,3 +1,4 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ { @@ -15,8 +16,8 @@ fetch = { type = "git"; url = "https://github.com/concourse/go-archive"; - rev = "784931698f4f"; - sha256 = "19cy51yi4sdr3i6agxk0kn0i8lxdcv4hi8wi24wy5nqbpcr5g1mp"; + rev = "v1.0.0"; + sha256 = "14imydlc86sv19jp5v087vz16gpbcvql1g88w40kk299p7rwapp0"; }; } @@ -25,8 +26,8 @@ fetch = { type = "git"; url = "https://github.com/davecgh/go-spew"; - rev = "v1.1.0"; - sha256 = "0d4jfmak5p6lb7n2r6yvf5p1zcw0l8j74kn55ghvr7zr7b7axm6c"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; }; } @@ -55,8 +56,8 @@ fetch = { type = "git"; url = "https://github.com/golang/protobuf"; - rev = "v1.1.0"; - sha256 = "0ya4ha7m20bw048m1159ppqzlvda4x0vdprlbk5sdgmy74h3xcdq"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; }; } @@ -75,8 +76,8 @@ fetch = { type = "git"; url = "https://github.com/google/go-containerregistry"; - rev = "52f3c54ec23c"; - sha256 = "1aqx3kcwgga2x7sbwyb4026f5phvnaavla688sjv6bswdxb1nnwr"; + rev = "61e4aeff7593"; + sha256 = "1l9r4mbpdr23ncfhcpi1f44xrcp5s46j8nhsw9aanhm27mb1nag6"; }; } @@ -90,6 +91,16 @@ }; } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.1"; + sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + }; + } + { goPackagePath = "github.com/kr/pretty"; fetch = { @@ -135,8 +146,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.3"; - sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; + rev = "v0.0.4"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; }; } @@ -145,8 +156,8 @@ fetch = { type = "git"; url = "https://github.com/onsi/ginkgo"; - rev = "v1.6.0"; - sha256 = "0x0gc89vgq38xhgmi2h22bhr73cf2gmk42g89nz89k8dgg9hhr25"; + rev = "v1.7.0"; + sha256 = "14wgpdrvpc35rdz3859bz53sc1g4vpr1fysy15wy3ff9gmqs14yg"; }; } @@ -155,28 +166,8 @@ fetch = { type = "git"; url = "https://github.com/onsi/gomega"; - rev = "v1.4.1"; - sha256 = "14179j7pj1h2vx60i68x2m6650ldji4xhanhc702i8a8iy7b49ja"; - }; - } - - { - goPackagePath = "github.com/opencontainers/go-digest"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/go-digest"; - rev = "v1.0.0-rc1"; - sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9"; - }; - } - - { - goPackagePath = "github.com/opencontainers/image-spec"; - fetch = { - type = "git"; - url = "https://github.com/opencontainers/image-spec"; - rev = "v1.0.1"; - sha256 = "03dvbj3dln8c55v9gp79mgmz2yi2ws3r08iyz2fk41y3i22iaw1q"; + rev = "v1.4.3"; + sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v"; }; } @@ -195,8 +186,18 @@ fetch = { type = "git"; url = "https://github.com/sirupsen/logrus"; - rev = "v1.0.6"; - sha256 = "029irw2lsbqi944gdrbkwdw0m2794sqni4g21gsnmz142hbzds8c"; + rev = "v1.2.0"; + sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; + }; + } + + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; }; } @@ -215,8 +216,8 @@ fetch = { type = "git"; url = "https://github.com/vbauerster/mpb"; - rev = "v3.3.1"; - sha256 = "1826w0rm6bapsyzlqn2sxizlrdzpqp9xxiqlg5rs4ayg2w0r3zz7"; + rev = "v3.3.2"; + sha256 = "18m66b80iv9z768c15dqsx5mnjq6iaa6b5lckpdqnynqzkkvw8kk"; }; } @@ -225,8 +226,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "f027049dab0a"; - sha256 = "026475grqvylk9n2ld4ygaxmzck6v97j48sc2x58jjsmqflnhzld"; + rev = "9eb0be3963ea"; + sha256 = "1iq3w7kykjaan7bblr3jj50vvxl4bs91s5x81gspllkpn40ikx2h"; }; } @@ -235,8 +236,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "f4c29de78a2a"; - sha256 = "02nibjrr1il8sxnr0w1s5fj7gz6ayhg3hsywf948qhc68n5adv8x"; + rev = "adae6a3d119a"; + sha256 = "1fx860zsgzqk28j7lmp96qsfrgb0kzbfjvr294hywswcbwdwkb01"; }; } @@ -245,8 +246,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sync"; - rev = "1d60e4601c6f"; - sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; + rev = "42b317875d0f"; + sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3"; }; } @@ -255,8 +256,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "2be389f392cd"; - sha256 = "13kpzm947r2298n7p4wk5ql59ss6fqsn5padr0q0rms3yshdvz0h"; + rev = "62eef0e2fa9b"; + sha256 = "0mslbflrh422mcfg2hs2q1xwm3xwd5prn597w7xqhi3s41mx1vs4"; }; } @@ -270,16 +271,6 @@ }; } - { - goPackagePath = "gopkg.in/airbrake/gobrake.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/airbrake/gobrake.v2"; - rev = "v2.0.9"; - sha256 = "1x06f7n7qlyzqgyz0sdfcidf3w4ldn6zs6qx2mhibggk2z4whcjw"; - }; - } - { goPackagePath = "gopkg.in/check.v1"; fetch = { @@ -300,16 +291,6 @@ }; } - { - goPackagePath = "gopkg.in/gemnasium/logrus-airbrake-hook.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/gemnasium/logrus-airbrake-hook.v2"; - rev = "v2.1.2"; - sha256 = "0sbg0dn6cysmf8f2bi209jwl4jnpiwp4rdghnxlzirw3c32ms5y5"; - }; - } - { goPackagePath = "gopkg.in/tomb.v1"; fetch = { diff --git a/pkgs/development/tools/continuous-integration/concourse/assets/resources/time-resource/deps.nix b/pkgs/development/tools/continuous-integration/concourse/assets/resources/time-resource/deps.nix index ddaf1864d782b..4afc797e7082c 100644 --- a/pkgs/development/tools/continuous-integration/concourse/assets/resources/time-resource/deps.nix +++ b/pkgs/development/tools/continuous-integration/concourse/assets/resources/time-resource/deps.nix @@ -1,3 +1,4 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ { diff --git a/pkgs/development/tools/continuous-integration/concourse/default.nix b/pkgs/development/tools/continuous-integration/concourse/default.nix index 04240820a035e..624fa2f00f186 100644 --- a/pkgs/development/tools/continuous-integration/concourse/default.nix +++ b/pkgs/development/tools/continuous-integration/concourse/default.nix @@ -8,13 +8,13 @@ let - version = "d41bd4369bedff638cb02ad16ab042c3c9165b3a"; + version = "c862322702eea2fd561b1a04de18ab1c1ef4810b"; src = fetchFromGitHub { repo = "concourse"; owner = "concourse"; rev = "${version}"; - sha256 = "1wmx675xrav3mwcmk52fav69wmni8cn1xf9xklk18lpr8vz7khcw"; + sha256 = "1l8grpr6w5badz9khwdcrhf07a8g8p9gax6djkbr0sq50xn68lfc"; }; main-asset = callPackage ./assets/main { diff --git a/pkgs/development/tools/continuous-integration/concourse/deps.nix b/pkgs/development/tools/continuous-integration/concourse/deps.nix index e8b910d471a0c..49688f532d404 100644 --- a/pkgs/development/tools/continuous-integration/concourse/deps.nix +++ b/pkgs/development/tools/continuous-integration/concourse/deps.nix @@ -1,15 +1,6 @@ +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ - { - goPackagePath = "bou.ke/monkey"; - fetch = { - type = "git"; - url = "https://github.com/bouk/monkey"; - rev = "v1.0.1"; - sha256 = "050y07pwx5zk7fchp0lhf35w417sml7lxkkzly8f932fy25rydz5"; - }; - } - { goPackagePath = "cloud.google.com/go"; fetch = { @@ -55,8 +46,8 @@ fetch = { type = "git"; url = "https://github.com/cloudfoundry/lager"; - rev = "v1.1.0"; - sha256 = "1wa63l1iqfikfi0f4gfnw0i33xslyi0zsqhxdar0nhvgfsp61zfi"; + rev = "v2.0.0"; + sha256 = "05ml0z2931ywl1l1a25wz16in8n7a9hyk29rn4mwmlq2z6r7aas3"; }; } @@ -310,13 +301,23 @@ }; } + { + goPackagePath = "github.com/caarlos0/env"; + fetch = { + type = "git"; + url = "https://github.com/caarlos0/env"; + rev = "v3.5.0"; + sha256 = "0avhrcxf6p7lh82nx9pc170szkvcqwr62fh2slya4qal23z8y823"; + }; + } + { goPackagePath = "github.com/cenkalti/backoff"; fetch = { type = "git"; url = "https://github.com/cenkalti/backoff"; - rev = "v2.0.0"; - sha256 = "0k4899ifpir6kmfxli8a2xfj5zdh0xb2jd0fq2r38wzd4pk25ipr"; + rev = "v2.1.0"; + sha256 = "0brq52h6r99rfikbc7p2q7pcnymaf5xz6xb73gpxi1px3vr1m7mv"; }; } @@ -355,8 +356,8 @@ fetch = { type = "git"; url = "https://github.com/cloudfoundry/bosh-cli"; - rev = "v5.1.1"; - sha256 = "19cm5xi1xvjir7ngr7v3hx6ajrd30w7w3ldgr5zvm4m329jazacq"; + rev = "v5.4.0"; + sha256 = "055fk1ljl68h0m1i9hikk394dwi8h53s802swmafl726k60hp8g9"; }; } @@ -390,23 +391,13 @@ }; } - { - goPackagePath = "github.com/cockroachdb/cockroach-go"; - fetch = { - type = "git"; - url = "https://github.com/cockroachdb/cockroach-go"; - rev = "31611c0501c8"; - sha256 = "0z38s4jbdlpyak19ck1b4aqa2g26l34zc3wmnywra3fry23cgajx"; - }; - } - { goPackagePath = "github.com/concourse/baggageclaim"; fetch = { type = "git"; url = "https://github.com/concourse/baggageclaim"; - rev = "v1.2.0"; - sha256 = "0szp201m6bv60ycdm98jh70k62sxlaw40rbg79cgqvmqb334mn2h"; + rev = "v1.3.3"; + sha256 = "1wdgdpnh90lz0h4clrsj6vmkc7amm2xk3g8if337jvgp9g7mqqnp"; }; } @@ -415,8 +406,8 @@ fetch = { type = "git"; url = "https://github.com/concourse/dex"; - rev = "f247fc8fa001"; - sha256 = "0s09i6i41qy0jkiq6351y0aw02kspgcz2sjv1dn7kasb0kxly246"; + rev = "024cbea7e753"; + sha256 = "1mvzg2q7rawl598n5ag72xyglblhkcnv8ksld2a75lyjwm7fs9b4"; }; } @@ -435,8 +426,8 @@ fetch = { type = "git"; url = "https://github.com/concourse/go-archive"; - rev = "784931698f4f"; - sha256 = "19cy51yi4sdr3i6agxk0kn0i8lxdcv4hi8wi24wy5nqbpcr5g1mp"; + rev = "v1.0.0"; + sha256 = "14imydlc86sv19jp5v087vz16gpbcvql1g88w40kk299p7rwapp0"; }; } @@ -445,8 +436,8 @@ fetch = { type = "git"; url = "https://github.com/concourse/retryhttp"; - rev = "937335fd9545"; - sha256 = "00pk1p67ivgafa6mapp5l4niqph819qm4bfv4ywlk6xlnn1l15im"; + rev = "7ab5e29e634f"; + sha256 = "173lpnyarh22gw5d18jimf4nk1glaiibp0ra18kby21ml5j6fn5g"; }; } @@ -1011,12 +1002,12 @@ } { - goPackagePath = "github.com/hashicorp/go-msgpack"; + goPackagePath = "github.com/evandigby/go-msgpack"; fetch = { type = "git"; - url = "https://github.com/hashicorp/go-msgpack"; - rev = "fa3f63826f7c"; - sha256 = "1f6rd6bm2dm2rk46x8cqrxh5nks1gpk6dvvsag7s5pdjgdxy951k"; + url = "https://github.com/evandigby/go-msgpack"; + rev = "b3f48f4eda2a"; + sha256 = "08b7vnfihrqi4i2g5h6imyjr6zlmbypaiak2sylpxc040vj51ns0"; }; } @@ -1300,6 +1291,16 @@ }; } + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.1"; + sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + }; + } + { goPackagePath = "github.com/kr/pretty"; fetch = { @@ -1375,8 +1376,8 @@ fetch = { type = "git"; url = "https://github.com/lib/pq"; - rev = "90697d60dd84"; - sha256 = "0hb4bfsk8g5473yzbf3lzrb373xicakjznkf0v085xgimz991i9r"; + rev = "9eb73efc1fcc"; + sha256 = "17wkjdz265iqf92gj3ljslvjcqvkfblw11jdq2scc3kp1hcsfr10"; }; } @@ -1405,8 +1406,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-isatty"; - rev = "v0.0.3"; - sha256 = "06w45aqz2a6yrk25axbly2k5wmsccv8cspb94bfmz4izvw8h927n"; + rev = "v0.0.4"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; }; } @@ -1455,8 +1456,8 @@ fetch = { type = "git"; url = "https://github.com/miekg/dns"; - rev = "v1.0.8"; - sha256 = "1vmgkpmwlqg6pwrpvjbn4h4al6af5fjvwwnacyv18hvlfd3fyfmx"; + rev = "v1.1.1"; + sha256 = "1zz6gm852yr0p9sxa1cqd0b6a6lrvl588jhfmg91hrgndvg7swck"; }; } @@ -1555,8 +1556,8 @@ fetch = { type = "git"; url = "https://github.com/onsi/ginkgo"; - rev = "v1.6.0"; - sha256 = "0x0gc89vgq38xhgmi2h22bhr73cf2gmk42g89nz89k8dgg9hhr25"; + rev = "v1.7.0"; + sha256 = "14wgpdrvpc35rdz3859bz53sc1g4vpr1fysy15wy3ff9gmqs14yg"; }; } @@ -1565,8 +1566,8 @@ fetch = { type = "git"; url = "https://github.com/onsi/gomega"; - rev = "v1.4.2"; - sha256 = "0f1lpgdcfan3bj545xjrlkdkmi7g0l8gn82gsxay1x6rsqv6nl0b"; + rev = "v1.4.3"; + sha256 = "1c8rqg5i2hz3snmq7s41yar1zjnzilb0fyiyhkg83v97afcfx79v"; }; } @@ -1610,26 +1611,6 @@ }; } - { - goPackagePath = "github.com/otiai10/copy"; - fetch = { - type = "git"; - url = "https://github.com/otiai10/copy"; - rev = "7e9a647135a1"; - sha256 = "1fpjyk6zrcdwgw3w93v3sb4xf0gq8w5py6vvlljxgf4gi7k96klj"; - }; - } - - { - goPackagePath = "github.com/otiai10/mint"; - fetch = { - type = "git"; - url = "https://github.com/otiai10/mint"; - rev = "v1.2.1"; - sha256 = "1bb9lxhqcrky2cy70ngl33m9xx2jg8d0y89knfgsaqsm4llq8yxa"; - }; - } - { goPackagePath = "github.com/papertrail/remote_syslog2"; fetch = { @@ -1805,8 +1786,8 @@ fetch = { type = "git"; url = "https://github.com/sirupsen/logrus"; - rev = "v1.0.6"; - sha256 = "029irw2lsbqi944gdrbkwdw0m2794sqni4g21gsnmz142hbzds8c"; + rev = "v1.2.0"; + sha256 = "0r6334x2bls8ddznvzaldx4g88msjjns4mlks95rqrrg7h0ijigg"; }; } @@ -1860,6 +1841,26 @@ }; } + { + goPackagePath = "github.com/square/certstrap"; + fetch = { + type = "git"; + url = "https://github.com/square/certstrap"; + rev = "v1.1.1"; + sha256 = "0j7gi2nzykny7i0gjax9vixw72l9jcm4wnwxgm72hh1pji0ysa8n"; + }; + } + + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + { goPackagePath = "github.com/stretchr/testify"; fetch = { @@ -1945,8 +1946,18 @@ fetch = { type = "git"; url = "https://go.googlesource.com/crypto"; - rev = "7c1a557ab941"; - sha256 = "1f1q9mby8m7ws3gbj90v0prhnf4g2sgf74azmw31kzwd6azlar3m"; + rev = "3d3f9f413869"; + sha256 = "0rbkcq48lkiw043sm8hciprqy2d77s4agpj6rwy2qgbqm8gvv3a6"; + }; + } + + { + goPackagePath = "golang.org/x/lint"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/lint"; + rev = "1baf3a9d7d67"; + sha256 = "0aql4lb9cf2kcb9jx90bvpp9chrmic2y3fwfvdq76hq2qvr4818d"; }; } @@ -1955,8 +1966,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "49bb7cea24b1"; - sha256 = "111q4qm3hcjvzvyv9y5rz8ydnyg48rckcygxqy6gv63q618wz6gn"; + rev = "e147a9138326"; + sha256 = "0x23lz3p7lxhhaixaqir3ksv18xq1c5vb39l5rb38hl625rk8mmj"; }; } @@ -1975,8 +1986,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sync"; - rev = "1d60e4601c6f"; - sha256 = "046jlanz2lkxq1r57x9bl6s4cvfqaic6p2xybsj8mq1120jv4rs6"; + rev = "42b317875d0f"; + sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3"; }; } @@ -1985,8 +1996,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "4497e2df6f9e"; - sha256 = "028qmbfmy84pl7wmjgvrv1x7x7nzv3qr9w7vcnrcparr43k7415s"; + rev = "66b7b1311ac8"; + sha256 = "00ny4r2bbj6rz939iy9g699acqydq7rfi6r6awn25w9i2dld9m13"; }; } @@ -2010,6 +2021,16 @@ }; } + { + goPackagePath = "golang.org/x/tools"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/tools"; + rev = "a2dc47679d30"; + sha256 = "1jsg05bkyr3qs5s05n9qsdp1lb2xzpjjajs7w7pr9wr553hfscw3"; + }; + } + { goPackagePath = "google.golang.org/appengine"; fetch = { @@ -2075,8 +2096,8 @@ fetch = { type = "git"; url = "https://gopkg.in/cheggaaa/pb.v1"; - rev = "v1.0.25"; - sha256 = "0vxqiw6f3xyv0zy3g4lksf8za0z8i0hvfpw92hqimsy84f79j3dp"; + rev = "v1.0.27"; + sha256 = "1f995nsqgi0r4qc16nmxlbdxc536hkfwa5k9xb8ypz8d6jlkihag"; }; } @@ -2115,8 +2136,8 @@ fetch = { type = "git"; url = "https://gopkg.in/ldap.v2"; - rev = "v2.3.0"; - sha256 = "16y6r60qgf2d3dwk21i11qsb8wlg7pkics1gk8jrhx3v978rybkk"; + rev = "v2.5.1"; + sha256 = "1wf81wy04nhkqs0dg5zkivr4sh37r83bxrfwjz9vr4jq6vmljr3h"; }; } @@ -2150,23 +2171,13 @@ }; } - { - goPackagePath = "gopkg.in/vmihailenco/msgpack.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/vmihailenco/msgpack.v2"; - rev = "v2.9.1"; - sha256 = "0ah9j7i97ifyqhiscq8d43gcrhksb3bx83s2p1nyfi1bxw78jwfi"; - }; - } - { goPackagePath = "gopkg.in/yaml.v2"; fetch = { type = "git"; url = "https://gopkg.in/yaml.v2"; - rev = "v2.2.1"; - sha256 = "0dwjrs2lp2gdlscs7bsrmyc5yf6mm4fvgw71bzr9mv2qrd2q73s1"; + rev = "v2.2.2"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; }; } diff --git a/pkgs/development/tools/continuous-integration/concourse/garden-runc/default.nix b/pkgs/development/tools/continuous-integration/concourse/garden-runc/default.nix index 4a8dfae515180..f650dcd74eb9d 100644 --- a/pkgs/development/tools/continuous-integration/concourse/garden-runc/default.nix +++ b/pkgs/development/tools/continuous-integration/concourse/garden-runc/default.nix @@ -13,12 +13,12 @@ }: let - version = "1.16.6"; + version = "1.17.1"; garden_src = fetchgit { rev = "v${version}"; url = "https://github.com/cloudfoundry/garden-runc-release.git"; - sha256 = "1rk0k04r8mwabsj6pd63sc7653ahjbxs4bxmnihzsr5naihaxd4n"; + sha256 = "0rzyqg9c3mdn6cz54716izgqdsdjv8h1xlvsx1sq21dcq9jj5ia0"; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/continuous-integration/concourse/garden-runc/grootfs/default.nix b/pkgs/development/tools/continuous-integration/concourse/garden-runc/grootfs/default.nix index 5e6608b2be3c3..5049e4e15342e 100644 --- a/pkgs/development/tools/continuous-integration/concourse/garden-runc/grootfs/default.nix +++ b/pkgs/development/tools/continuous-integration/concourse/garden-runc/grootfs/default.nix @@ -2,16 +2,16 @@ { stdenv, buildGoPackage, fetchgit, fetchhg, fetchbzr, fetchsvn }: buildGoPackage rec { - name = "grootfs-unstable-${version}"; + name = "grootfs-${version}"; version = "2018-07-10"; - rev = "600df5a80cf64b7f85abd5930e772e602df6be41"; + rev = "v0.30.0"; goPackagePath = "code.cloudfoundry.org/grootfs"; src = fetchgit { inherit rev; url = "https://github.com/cloudfoundry/grootfs"; - sha256 = "1jixzhz85qj7whwa66bx1qm1nzs8shddbqa58ss8hdgkfa53hljk"; + sha256 = "0im3is3rxpxgwfwgd0zy2ppy9kf4xi41wd78drw92djghvipmap3"; }; goDeps = ./deps.nix; diff --git a/pkgs/development/tools/continuous-integration/concourse/garden-runc/grootfs/deps.nix b/pkgs/development/tools/continuous-integration/concourse/garden-runc/grootfs/deps.nix index 3ba1d12a8048b..54c00d1fc475a 100644 --- a/pkgs/development/tools/continuous-integration/concourse/garden-runc/grootfs/deps.nix +++ b/pkgs/development/tools/continuous-integration/concourse/garden-runc/grootfs/deps.nix @@ -1,3 +1,473 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 +# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix) [ + + { + goPackagePath = "code.cloudfoundry.org/commandrunner"; + fetch = { + type = "git"; + url = "https://github.com/cloudfoundry/commandrunner"; + rev = "501fd662150b"; + sha256 = "0wxbpqycbgkpsy9fnllpijxljvs1wy4nsmjnrwhf6mxvy8gcyqfj"; + }; + } + + { + goPackagePath = "code.cloudfoundry.org/lager"; + fetch = { + type = "git"; + url = "https://github.com/cloudfoundry/lager"; + rev = "v2.0.0"; + sha256 = "05ml0z2931ywl1l1a25wz16in8n7a9hyk29rn4mwmlq2z6r7aas3"; + }; + } + + { + goPackagePath = "github.com/BurntSushi/toml"; + fetch = { + type = "git"; + url = "https://github.com/BurntSushi/toml"; + rev = "v0.3.1"; + sha256 = "1fjdwwfzyzllgiwydknf1pwjvy49qxfsczqx5gz3y0izs7as99j6"; + }; + } + + { + goPackagePath = "github.com/beorn7/perks"; + fetch = { + type = "git"; + url = "https://github.com/beorn7/perks"; + rev = "3a771d992973"; + sha256 = "1l2lns4f5jabp61201sh88zf3b0q793w4zdgp9nll7mmfcxxjif3"; + }; + } + + { + goPackagePath = "github.com/boltdb/bolt"; + fetch = { + type = "git"; + url = "https://github.com/boltdb/bolt"; + rev = "v1.3.1"; + sha256 = "0z7j06lijfi4y30ggf2znak2zf2srv2m6c68ar712wd2ys44qb3r"; + }; + } + + { + goPackagePath = "github.com/cloudfoundry/dropsonde"; + fetch = { + type = "git"; + url = "https://github.com/cloudfoundry/dropsonde"; + rev = "v1.0.0"; + sha256 = "16145nvzp745s7mfqy5x9zj54p2gb3ksznqjiz4px290pa0ay8ic"; + }; + } + + { + goPackagePath = "github.com/cloudfoundry/gosteno"; + fetch = { + type = "git"; + url = "https://github.com/cloudfoundry/gosteno"; + rev = "0c8581caea35"; + sha256 = "0x6gs3mq526s712qlalz6wpmqhx9flx6v40ly3zf8ly507g6z8dp"; + }; + } + + { + goPackagePath = "github.com/cloudfoundry/sonde-go"; + fetch = { + type = "git"; + url = "https://github.com/cloudfoundry/sonde-go"; + rev = "b33733203bb4"; + sha256 = "1p1rw3h0pqf408kaknm0mi0xn7wzqi399mfwj419vz8n8wjy7nq1"; + }; + } + + { + goPackagePath = "github.com/containers/image"; + fetch = { + type = "git"; + url = "https://github.com/containers/image"; + rev = "f0cbc16b444d"; + sha256 = "0r984nffrmvblg84qzvry95bbi6jbahsi3qxv6ac6llsys4fzcws"; + }; + } + + { + goPackagePath = "github.com/containers/storage"; + fetch = { + type = "git"; + url = "https://github.com/containers/storage"; + rev = "2e0e1a581257"; + sha256 = "0yqw9zyynl6mq9w4sasz27s2c9knsa26aqj6iz2fphcl0519dlkv"; + }; + } + + { + goPackagePath = "github.com/davecgh/go-spew"; + fetch = { + type = "git"; + url = "https://github.com/davecgh/go-spew"; + rev = "v1.1.1"; + sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y"; + }; + } + + { + goPackagePath = "github.com/docker/distribution"; + fetch = { + type = "git"; + url = "https://github.com/docker/distribution"; + rev = "v2.7.0"; + sha256 = "1wqiqwfdy7idzvwa1i5anlym6s28shbx37cj1536zxvzw7kzqf2m"; + }; + } + + { + goPackagePath = "github.com/docker/docker"; + fetch = { + type = "git"; + url = "https://github.com/docker/docker"; + rev = "v1.13.1"; + sha256 = "0l9kjibnpwcgk844sibxk9ppyqniw9r0np1mzp95f8f461jb0iar"; + }; + } + + { + goPackagePath = "github.com/docker/docker-credential-helpers"; + fetch = { + type = "git"; + url = "https://github.com/docker/docker-credential-helpers"; + rev = "v0.6.1"; + sha256 = "1xcfgg1nwkff7nzpasrhclyk21yhz7p0cr3r44wypvihvjpaij9k"; + }; + } + + { + goPackagePath = "github.com/docker/go-connections"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-connections"; + rev = "v0.4.0"; + sha256 = "0mv6f6b5nljc17dmwmc28hc0y11pqglz7x0d2mjrwdmfxf64hwqq"; + }; + } + + { + goPackagePath = "github.com/docker/go-metrics"; + fetch = { + type = "git"; + url = "https://github.com/docker/go-metrics"; + rev = "b84716841b82"; + sha256 = "1ff5h6959bysrgfclpy7v9jihykrkzqikisjzcsljj1v64sgyg00"; + }; + } + + { + goPackagePath = "github.com/docker/libtrust"; + fetch = { + type = "git"; + url = "https://github.com/docker/libtrust"; + rev = "aabc10ec26b7"; + sha256 = "1lwslbggzc2b0c4wxl5pn6i2nfgz5jz8f7s7vnid9mrlsk59h7s1"; + }; + } + + { + goPackagePath = "github.com/ghodss/yaml"; + fetch = { + type = "git"; + url = "https://github.com/ghodss/yaml"; + rev = "v1.0.0"; + sha256 = "0skwmimpy7hlh7pva2slpcplnm912rp3igs98xnqmn859kwa5v8g"; + }; + } + + { + goPackagePath = "github.com/gogo/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/gogo/protobuf"; + rev = "v1.2.0"; + sha256 = "1c3y5m08mvrgvlw0kb9pldh3kkqcj99pa8gqmk1g3hp8ih3b2dv0"; + }; + } + + { + goPackagePath = "github.com/golang/protobuf"; + fetch = { + type = "git"; + url = "https://github.com/golang/protobuf"; + rev = "v1.2.0"; + sha256 = "0kf4b59rcbb1cchfny2dm9jyznp8ri2hsb14n8iak1q8986xa0ab"; + }; + } + + { + goPackagePath = "github.com/gorilla/mux"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/mux"; + rev = "v1.6.2"; + sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; + }; + } + + { + goPackagePath = "github.com/konsorten/go-windows-terminal-sequences"; + fetch = { + type = "git"; + url = "https://github.com/konsorten/go-windows-terminal-sequences"; + rev = "v1.0.1"; + sha256 = "1lchgf27n276vma6iyxa0v1xds68n2g8lih5lavqnx5x6q5pw2ip"; + }; + } + + { + goPackagePath = "github.com/mailru/easyjson"; + fetch = { + type = "git"; + url = "https://github.com/mailru/easyjson"; + rev = "60711f1a8329"; + sha256 = "0234jp6134wkihdpdwq1hvzqblgl5khc1wp6dyi2h0hgh88bhdk1"; + }; + } + + { + goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; + fetch = { + type = "git"; + url = "https://github.com/matttproud/golang_protobuf_extensions"; + rev = "v1.0.1"; + sha256 = "1d0c1isd2lk9pnfq2nk0aih356j30k3h1gi2w0ixsivi5csl7jya"; + }; + } + + { + goPackagePath = "github.com/nu7hatch/gouuid"; + fetch = { + type = "git"; + url = "https://github.com/nu7hatch/gouuid"; + rev = "179d4d0c4d8d"; + sha256 = "1isyfix5w1wm26y3a15ha3nnpsxqaxz5ngq06hnh6c6y0inl2fwj"; + }; + } + + { + goPackagePath = "github.com/opencontainers/go-digest"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/go-digest"; + rev = "v1.0.0-rc1"; + sha256 = "01gc7fpn8ax429024p2fcx3yb18axwz5bjf2hqxlii1jbsgw4bh9"; + }; + } + + { + goPackagePath = "github.com/opencontainers/image-spec"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/image-spec"; + rev = "v1.0.1"; + sha256 = "03dvbj3dln8c55v9gp79mgmz2yi2ws3r08iyz2fk41y3i22iaw1q"; + }; + } + + { + goPackagePath = "github.com/opencontainers/runc"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/runc"; + rev = "v0.1.1"; + sha256 = "09fm7f1k4lvx8v3crqb0cli1x2brlz8ka7f7qa8d2sb6ln58h7w7"; + }; + } + + { + goPackagePath = "github.com/opencontainers/runtime-spec"; + fetch = { + type = "git"; + url = "https://github.com/opencontainers/runtime-spec"; + rev = "v1.0.1"; + sha256 = "00qb0q7ndxsll12ilp5a8pqfi4i1jqrlqzv0yf7sn52lkrdrw5f4"; + }; + } + + { + goPackagePath = "github.com/pkg/errors"; + fetch = { + type = "git"; + url = "https://github.com/pkg/errors"; + rev = "v0.8.1"; + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; + }; + } + + { + goPackagePath = "github.com/pmezard/go-difflib"; + fetch = { + type = "git"; + url = "https://github.com/pmezard/go-difflib"; + rev = "v1.0.0"; + sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw"; + }; + } + + { + goPackagePath = "github.com/prometheus/client_golang"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_golang"; + rev = "v0.9.2"; + sha256 = "02b4yg6rfag0m3j0i39sillcm5xczwv8h133vn12yr8qw04cnigs"; + }; + } + + { + goPackagePath = "github.com/prometheus/client_model"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/client_model"; + rev = "5c3871d89910"; + sha256 = "04psf81l9fjcwascsys428v03fx4fi894h7fhrj2vvcz723q57k0"; + }; + } + + { + goPackagePath = "github.com/prometheus/common"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/common"; + rev = "4724e9255275"; + sha256 = "0pcx8hlnrxx5nnmpk786cn99rsgqk1jrd3c9f6fsx8qd8y5iwjy6"; + }; + } + + { + goPackagePath = "github.com/prometheus/procfs"; + fetch = { + type = "git"; + url = "https://github.com/prometheus/procfs"; + rev = "1dc9a6cbc91a"; + sha256 = "1zlv1x30xp7z5c3vn5vp870v4bjim0zcidzc3mr2l3xhazc0svab"; + }; + } + + { + goPackagePath = "github.com/sirupsen/logrus"; + fetch = { + type = "git"; + url = "https://github.com/sirupsen/logrus"; + rev = "v1.3.0"; + sha256 = "0ib7k8cwxn53dyxd3af1g81z018n77n6q64pm4miznirf7c2c9gk"; + }; + } + + { + goPackagePath = "github.com/stretchr/objx"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/objx"; + rev = "v0.1.1"; + sha256 = "0iph0qmpyqg4kwv8jsx6a56a7hhqq8swrazv40ycxk9rzr0s8yls"; + }; + } + + { + goPackagePath = "github.com/stretchr/testify"; + fetch = { + type = "git"; + url = "https://github.com/stretchr/testify"; + rev = "v1.2.2"; + sha256 = "0dlszlshlxbmmfxj5hlwgv3r22x0y1af45gn1vd198nvvs3pnvfs"; + }; + } + + { + goPackagePath = "github.com/tscolari/lagregator"; + fetch = { + type = "git"; + url = "https://github.com/tscolari/lagregator"; + rev = "b0fb43b01861"; + sha256 = "0j7x8pby3n59cl7q5d3xg02yahsly1kxbbnmnncdqai39yynb8cq"; + }; + } + + { + goPackagePath = "github.com/urfave/cli"; + fetch = { + type = "git"; + url = "https://github.com/urfave/cli"; + rev = "v1.20.0"; + sha256 = "0y6f4sbzkiiwrxbl15biivj8c7qwxnvm3zl2dd3mw4wzg4x10ygj"; + }; + } + + { + goPackagePath = "github.com/ventu-io/go-shortid"; + fetch = { + type = "git"; + url = "https://github.com/ventu-io/go-shortid"; + rev = "771a37caa5cf"; + sha256 = "09qalccbb113bk58pn3gql34xjzd2r9v4k2xr3gpmsqz7bicq5d9"; + }; + } + + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "0709b304e793"; + sha256 = "0i05s09y5pavmfh71fgih7syxg58x7a4krgd8am6d3mnahnmab5c"; + }; + } + + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "927f97764cc3"; + sha256 = "0np7b766gb92vbm514yhdl7cjmqvn0dxdxskd84aas2ri1fkpgw5"; + }; + } + + { + goPackagePath = "golang.org/x/sync"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sync"; + rev = "42b317875d0f"; + sha256 = "0mrjhk7al7yyh76x9flvxy4jm5jyqh2fxbxagpaazxn1xdgkaif3"; + }; + } + + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "ebe1bf3edb33"; + sha256 = "0rkspxyjxdmc9f4n09hgkwj8jjd8z5p8mc9z8vwqwqcwrqv4sg7c"; + }; + } + + { + goPackagePath = "gopkg.in/check.v1"; + fetch = { + type = "git"; + url = "https://gopkg.in/check.v1"; + rev = "20d25e280405"; + sha256 = "0k1m83ji9l1a7ng8a7v40psbymxasmssbrrhpdv2wl4rhs0nc3np"; + }; + } + + { + goPackagePath = "gopkg.in/yaml.v2"; + fetch = { + type = "git"; + url = "https://gopkg.in/yaml.v2"; + rev = "v2.2.2"; + sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; + }; + } ]