vagrant: Fix dependencies for version 2.0.2
The version was bumped in #36081, but the dependencies were not updated, causing Vagrant to fail at runtime. Fix the dependencies (via bundix), and add an `installCheckPhase` to the derviation to catch this in the future.
This commit is contained in:
Aneesh Agrawal
parent
fced35fa44
commit
89d0307a39
@ -11,16 +11,16 @@ GIT
|
||||
PATH
|
||||
remote: .
|
||||
specs:
|
||||
vagrant (2.0.1)
|
||||
vagrant (2.0.2)
|
||||
childprocess (~> 0.6.0)
|
||||
erubis (~> 2.7.0)
|
||||
hashicorp-checkpoint (~> 0.1.1)
|
||||
hashicorp-checkpoint (~> 0.1.5)
|
||||
i18n (>= 0.6.0, <= 0.8.0)
|
||||
listen (~> 3.1.5)
|
||||
log4r (~> 1.1.9, < 1.1.11)
|
||||
net-scp (~> 1.2.0)
|
||||
net-sftp (~> 2.1)
|
||||
net-ssh (~> 4.1.0)
|
||||
net-ssh (~> 4.2.0)
|
||||
rb-kqueue (~> 0.2.0)
|
||||
rest-client (>= 1.6.0, < 3.0)
|
||||
ruby_dep (<= 1.3.1)
|
||||
@ -50,7 +50,7 @@ GEM
|
||||
gyoku (1.3.1)
|
||||
builder (>= 2.1.2)
|
||||
hashdiff (0.3.7)
|
||||
hashicorp-checkpoint (0.1.4)
|
||||
hashicorp-checkpoint (0.1.5)
|
||||
http-cookie (1.0.3)
|
||||
domain_name (~> 0.5)
|
||||
httpclient (2.8.3)
|
||||
@ -67,17 +67,17 @@ GEM
|
||||
mime-types (3.1)
|
||||
mime-types-data (~> 3.2015)
|
||||
mime-types-data (3.2016.0521)
|
||||
multi_json (1.12.2)
|
||||
multi_json (1.13.1)
|
||||
net-scp (1.2.1)
|
||||
net-ssh (>= 2.6.5)
|
||||
net-sftp (2.1.2)
|
||||
net-ssh (>= 2.6.5)
|
||||
net-ssh (4.1.0)
|
||||
net-ssh (4.2.0)
|
||||
netrc (0.11.0)
|
||||
nori (2.6.0)
|
||||
public_suffix (3.0.1)
|
||||
rake (12.0.0)
|
||||
rb-fsevent (0.10.2)
|
||||
rb-fsevent (0.10.3)
|
||||
rb-inotify (0.9.10)
|
||||
ffi (>= 0.5.0, < 2)
|
||||
rb-kqueue (0.2.5)
|
||||
@ -109,7 +109,7 @@ GEM
|
||||
thor (0.18.1)
|
||||
unf (0.1.4)
|
||||
unf_ext
|
||||
unf_ext (0.0.7.4)
|
||||
unf_ext (0.0.7.5)
|
||||
wdm (0.1.1)
|
||||
webmock (2.3.2)
|
||||
addressable (>= 2.3.6)
|
||||
@ -127,7 +127,7 @@ GEM
|
||||
winrm-elevated (1.1.0)
|
||||
winrm (~> 2.0)
|
||||
winrm-fs (~> 1.0)
|
||||
winrm-fs (1.1.1)
|
||||
winrm-fs (1.2.0)
|
||||
erubis (~> 2.7)
|
||||
logging (>= 1.6.1, < 3.0)
|
||||
rubyzip (~> 1.1)
|
||||
|
||||
@ -28,7 +28,7 @@ in buildRubyGem rec {
|
||||
gemName = "vagrant";
|
||||
inherit version;
|
||||
|
||||
doCheck = true;
|
||||
doInstallCheck = true;
|
||||
dontBuild = false;
|
||||
src = fetchurl { inherit url sha256; };
|
||||
|
||||
@ -44,6 +44,15 @@ in buildRubyGem rec {
|
||||
--prefix PATH ':' "${lib.getBin libarchive}/bin"
|
||||
'';
|
||||
|
||||
installCheckPhase = ''
|
||||
if [[ "$("$out/bin/vagrant" --version)" == "Vagrant ${version}" ]]; then
|
||||
echo 'Vagrant smoke check passed'
|
||||
else
|
||||
echo 'Vagrant smoke check failed'
|
||||
return 1
|
||||
fi
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
inherit ruby deps;
|
||||
};
|
||||
|
||||
@ -104,10 +104,10 @@
|
||||
hashicorp-checkpoint = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "15shgckjnxqpz1n9z6y4ax1dcnn5vdqcva29gdg2l7ny0g1w7c7m";
|
||||
sha256 = "1z6mwzvd7p2wqhmk07dwrhvm0ncgqm7pxn0pr2k025rwsspp9bsd";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.1.4";
|
||||
version = "0.1.5";
|
||||
};
|
||||
http-cookie = {
|
||||
dependencies = ["domain_name"];
|
||||
@ -188,10 +188,10 @@
|
||||
multi_json = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1raim9ddjh672m32psaa9niw67ywzjbxbdb8iijx3wv9k5b0pk2x";
|
||||
sha256 = "1rl0qy4inf1mp8mybfk56dfga0mvx97zwpmq5xmiwl5r770171nv";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.12.2";
|
||||
version = "1.13.1";
|
||||
};
|
||||
net-scp = {
|
||||
dependencies = ["net-ssh"];
|
||||
@ -214,10 +214,10 @@
|
||||
net-ssh = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "013p5jb4wy0cq7x7036piw2a3s1i9p752ki1srx2m289mpz4ml3q";
|
||||
sha256 = "07c4v97zl1daabmri9zlbzs6yvkl56z1q14bw74d53jdj0c17nhx";
|
||||
type = "gem";
|
||||
};
|
||||
version = "4.1.0";
|
||||
version = "4.2.0";
|
||||
};
|
||||
netrc = {
|
||||
source = {
|
||||
@ -254,10 +254,10 @@
|
||||
rb-fsevent = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1fbpmjypwxkb8r7y1kmhmyp6gawa4byw0yb3jc3dn9ly4ld9lizf";
|
||||
sha256 = "1lm1k7wpz69jx7jrc92w3ggczkjyjbfziq5mg62vjnxmzs383xx8";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.10.2";
|
||||
version = "0.10.3";
|
||||
};
|
||||
rb-inotify = {
|
||||
dependencies = ["ffi"];
|
||||
@ -391,10 +391,10 @@
|
||||
unf_ext = {
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "14hr2dzqh33kqc0xchs8l05pf3kjcayvad4z1ip5rdjxrkfk8glb";
|
||||
sha256 = "06p1i6qhy34bpb8q8ms88y6f2kz86azwm098yvcc0nyqk9y729j1";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.0.7.4";
|
||||
version = "0.0.7.5";
|
||||
};
|
||||
vagrant = {
|
||||
dependencies = ["childprocess" "erubis" "hashicorp-checkpoint" "i18n" "listen" "log4r" "net-scp" "net-sftp" "net-ssh" "rb-kqueue" "rest-client" "ruby_dep" "wdm" "winrm" "winrm-elevated" "winrm-fs"];
|
||||
@ -404,7 +404,7 @@
|
||||
source = {
|
||||
fetchSubmodules = false;
|
||||
rev = "7ac8b4191de578e345b29acaf62ecc72c8e73be1";
|
||||
sha256 = "03bpxlliyiny062p8a8vxyb1hymxpgfwliky4vlqn7lbm6z7n6kr";
|
||||
sha256 = "0qybgxdnndx7xfmhyjcj46b2mv78d98yk30d68ppmfnmm3jx590h";
|
||||
type = "git";
|
||||
url = "https://github.com/mitchellh/vagrant-spec.git";
|
||||
};
|
||||
@ -449,9 +449,9 @@
|
||||
dependencies = ["erubis" "logging" "rubyzip" "winrm"];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0vax34qbr3n6jifxyzr4nngaz8vrmzw6ydw21cnnrhidfkqgh7ja";
|
||||
sha256 = "1i3w2j2rmhjqj8lynca2m1dm1m5fv1x35xwhk3vyr15dn260z56g";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.1";
|
||||
version = "1.2.0";
|
||||
};
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user