From 5493cda59b4230a0e727bb459396d76fd526d041 Mon Sep 17 00:00:00 2001 From: Silas Davis <silas@monax.io> Date: Wed, 24 Jan 2018 11:52:09 +0000 Subject: [PATCH] Deal with deleted go-clist dependency by updating to use tmlibs version and also depending on a fork of tendermint with updated import Signed-off-by: Silas Davis <silas@monax.io> --- glide.lock | 9 ++++++--- glide.yaml | 8 +++++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/glide.lock b/glide.lock index b6a1515c..e7a14d52 100644 --- a/glide.lock +++ b/glide.lock @@ -144,8 +144,10 @@ imports: version: 84d9671090430e8ec80e35b339907e0579b999eb - name: github.com/tendermint/go-autofile version: 48b17de82914e1ec2f134ce823ba426337d2c518 -- name: github.com/tendermint/go-clist - version: 3baa390bbaf7634251c42ad69a8682e7e3990552 +- name: github.com/tendermint/tmlibs + version: 91b4b534ad78e442192c8175db92a06a51064064 + subpackages: + - clist - name: github.com/tendermint/go-common version: f9e3db037330c8a8d61d3966de8473eaf01154fa subpackages: @@ -191,7 +193,8 @@ imports: - client - testutil - name: github.com/tendermint/tendermint - version: f6e28c497510dcd266353649a45d6f962fd5001c + repo: https://github.com/monax/tendermint.git + version: d4904891187ce4c0a676273500bc4d68073d4c64 subpackages: - blockchain - consensus diff --git a/glide.yaml b/glide.yaml index 53641e17..af629011 100644 --- a/glide.yaml +++ b/glide.yaml @@ -29,5 +29,11 @@ import: version: ^0.11.0 - package: github.com/streadway/simpleuuid - package: github.com/Graylog2/go-gelf +- package: github.com/tendermint/tmlibs + version: e4ef2835f0081c2ece83b9c1f777cf071f956e81 + subpackages: + - clist - package: github.com/tendermint/tendermint - version: ~0.9.2 + repo: https://github.com/monax/tendermint.git + version: go-clist-hotfix-0.9.2 + -- GitLab