cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #292672 from tylerjl/vagrant-2-4

Browse source 
vagrant: 2.3.7 -> 2.4.1; adopt orphaned package
This commit is contained in:
Weijia Wang 2024-03-08 20:58:13 +01:00 committed by GitHub
commit 6f70845914
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 102 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pkgs/development/tools/vagrant/0001-Revert-Merge-pull-request-12225-from-chrisroberts-re.patch
View file

@ -78,18 +78,18 @@ index c019f30ff..ba7e40076 100755
at_exit(&Vagrant::Bundler.instance.method(:deinit))
diff --git a/lib/vagrant.rb b/lib/vagrant.rb
index f3dcba0bc..d696bdff8 100644
index f790039d3..97e67e3b8 100644
--- a/lib/vagrant.rb
+++ b/lib/vagrant.rb
@@ -81,7 +81,7 @@ if ENV["VAGRANT_LOG"] && ENV["VAGRANT_LOG"] != ""
# See https://github.com/rest-client/rest-client/issues/34#issuecomment-290858
# for more information
class VagrantLogger < Log4r::Logger
- def << msg
+ def << (msg)
debug(msg.strip)
end
end
@@ -59,7 +59,7 @@ require "vagrant/plugin/manager"
# See https://github.com/rest-client/rest-client/issues/34#issuecomment-290858
# for more information
class VagrantLogger < Log4r::Logger
- def << msg
+ def << (msg)
debug(msg.strip)
end
end
diff --git a/lib/vagrant/bundler.rb b/lib/vagrant/bundler.rb
index eb2caabb0..d75f54362 100644
--- a/lib/vagrant/bundler.rb

14
pkgs/development/tools/vagrant/default.nix
View file

@ -1,13 +1,14 @@
{ stdenv, lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive
, libguestfs, qemu, writeText, withLibvirt ? stdenv.isLinux
, openssl
}:
let
# NOTE: bumping the version and updating the hash is insufficient;
# you must use bundix to generate a new gemset.nix in the Vagrant source.
version = "2.3.7";
version = "2.4.1";
url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";
hash = "sha256-+oqWMZqnuf9fSpkbd8vzf1SVSdhHN2JLzr76jyAEv0U=";
hash = "sha256-Gc+jBuP/rl3b8wUE9hoaMSSqmodyGxMKFAmNTqH+v4k=";
deps = bundlerEnv rec {
name = "${pname}-${version}";
@ -50,6 +51,11 @@ in buildRubyGem rec {
dontBuild = false;
src = fetchurl { inherit url hash; };
# Some reports indicate that some connection types, particularly
# WinRM, suffer from "Digest initialization failed" errors. Adding
# openssl as a build input resolves this runtime error.
buildInputs = [ openssl ];
patches = [
./unofficial-installation-nowarn.patch
./use-system-bundler-version.patch
@ -105,8 +111,8 @@ in buildRubyGem rec {
meta = with lib; {
description = "A tool for building complete development environments";
homepage = "https://www.vagrantup.com/";
license = licenses.mit;
maintainers = with maintainers; [ ];
license = licenses.bsl11;
maintainers = with maintainers; [ tylerjl ];
platforms = with platforms; linux ++ darwin;
};
}

142
pkgs/development/tools/vagrant/gemset.nix
View file

@ -9,6 +9,16 @@
};
version = "1.1.0";
};
bigdecimal = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "00db5v09k1z3539g1zrk7vkjrln9967k08adh6qx33ng97a2gg5w";
type = "gem";
};
version = "3.1.6";
};
builder = {
groups = ["default"];
platforms = [];
@ -34,30 +44,30 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q";
sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2";
type = "gem";
};
version = "1.2.2";
version = "1.2.3";
};
date = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1";
sha256 = "149jknsq999gnhy865n33fkk22s0r447k76x9pmcnnwldfv2q7wp";
type = "gem";
};
version = "3.3.3";
version = "3.3.4";
};
diff-lcs = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9";
sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7";
type = "gem";
};
version = "1.5.0";
version = "1.5.1";
};
ed25519 = {
groups = ["default"];
@ -84,10 +94,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0j826kfvzn7nc5pv950n270r0sx1702k988ad11cdlav3dcxxw09";
sha256 = "1kmmwgjzlrnc3nnrdnw1z67c95nbw0hv54a73yj8jw6pcvl9585x";
type = "gem";
};
version = "0.99.0";
version = "0.109.0";
};
fake_ftp = {
groups = ["development"];
@ -104,20 +114,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg";
sha256 = "1yvii03hcgqj30maavddqamqy50h7y6xcn2wcyq72wn823zl4ckd";
type = "gem";
};
version = "1.15.5";
version = "1.16.3";
};
google-protobuf = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1zqyy07ps6zh0gi9nppmnsngzv5nx1qjv726mzhv83sh90rc25nm";
sha256 = "1mnxzcq8kmyfb9bkzqnp019d1hx1vprip3yzdkkha6b3qz5rgg9r";
type = "gem";
};
version = "3.22.2";
version = "3.25.3";
};
googleapis-common-protos-types = {
dependencies = ["google-protobuf"];
@ -125,10 +135,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12w5bwaziz2iqb9dvgnskp2a7ifml6n4lyl9ypvnxj5bfrrwysap";
sha256 = "1zrxnv9s2q39f2nh32x7nbfi8lpwzmmn3ji4adglg8dlfr1xrz16";
type = "gem";
};
version = "1.5.0";
version = "1.13.0";
};
grpc = {
dependencies = ["google-protobuf" "googleapis-common-protos-types"];
@ -136,20 +146,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0kj4j1g6l9v92k3byqyfq2kmawy12cj898daxqn1jsw0b458k0dh";
sha256 = "1ndyis4hyq5wyypvy5j2pxaax73k9xd9cdsc5hyvpk3vbnn26rdb";
type = "gem";
};
version = "1.53.0";
version = "1.56.2";
};
grpc-tools = {
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dal0xca2f301jrh049agmrbab21yjqd8npizzz55dhqn9dkwdsl";
sha256 = "0pwwsmw402y8f8l3s3v433lx1f3cahzh2bj3i6jhkg1z87z83pqm";
type = "gem";
};
version = "1.53.0";
version = "1.62.0";
};
gssapi = {
dependencies = ["ffi"];
@ -199,20 +209,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi";
sha256 = "0qaamqsh5f3szhcakkak8ikxlzxqnv49n2p7504hcz2l0f4nj0wx";
type = "gem";
};
version = "1.12.0";
version = "1.14.1";
};
ipaddr = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ypic2hrmvvcgw7al72raphqv5cs1zvq4w284pwrkvfqsrqrqrsf";
sha256 = "0p98v9b6rn5ma04qwvzs0nrg0hmnwpm70s9jshzdsrkqapcw4sh2";
type = "gem";
};
version = "1.2.5";
version = "1.2.6";
};
listen = {
dependencies = ["rb-fsevent" "rb-inotify"];
@ -220,10 +230,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13rgkfar8pp31z1aamxf5y7cfq88wv6rxxcwy7cmm177qq508ycn";
sha256 = "0rwwsmvq79qwzl6324yc53py02kbrcww35si720490z5w0j497nv";
type = "gem";
};
version = "3.8.0";
version = "3.9.0";
};
little-plugger = {
groups = ["default"];
@ -262,20 +272,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb";
sha256 = "1r64z0m5zrn4k37wabfnv43wa6yivgdfk6cf2rpmmirlz889yaf1";
type = "gem";
};
version = "3.4.1";
version = "3.5.2";
};
mime-types-data = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pky3vzaxlgm9gw5wlqwwi7wsw3jrglrfflrppvvnsrlaiz043z9";
sha256 = "0zpn5brxdf5akh7ij511bkrd30fxd7697shmxxszahqj9m62zvn5";
type = "gem";
};
version = "3.2023.0218.1";
version = "3.2024.0206";
};
multi_json = {
groups = ["default"];
@ -293,10 +303,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0bqy9xg5225x102873j1qqq1bvnwfbi8lnf4357mpq6wimnw9pf9";
sha256 = "1pi67ywf8yvv18vr8kvyb1igdv8nsjafyy9c86fny5wvi10qcwqv";
type = "gem";
};
version = "0.2.0";
version = "0.3.4";
};
net-protocol = {
dependencies = ["timeout"];
@ -304,10 +314,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91";
sha256 = "1a32l4x73hz200cm587bc29q8q9az278syw3x6fkc9d1lv5y0wxa";
type = "gem";
};
version = "0.2.1";
version = "0.2.2";
};
net-scp = {
dependencies = ["net-ssh"];
@ -336,40 +346,52 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0yx0pb5fmziz92bw8qzbh8vf20lr56nd3s6q8h0gsgr307lki687";
sha256 = "1i01340c4i144vvn3x54lc2rb77ch829qipl1rh6rqwm3yxzml9w";
type = "gem";
};
version = "7.1.0";
version = "7.2.1";
};
nori = {
dependencies = ["bigdecimal"];
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "066wc774a2zp4vrq3k7k8p0fhv30ymqmxma1jj7yg5735zls8agn";
sha256 = "12wfv36jzc0978ij5c56nnfh5k8ax574njawigs98ysmp1x5s2ql";
type = "gem";
};
version = "2.6.0";
version = "2.7.0";
};
pairing_heap = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15rcn0bd9z25dgbrsnjp9zva1hs22vnr54pzi9wjy62js2nfmx9r";
sha256 = "059kqpw53cancnp0bp7y1s74y1955riw33w3lqfbnms4b4mdh5zj";
type = "gem";
};
version = "3.0.0";
version = "3.1.0";
};
rake = {
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w";
sha256 = "1ilr853hawi09626axx0mps4rkkmxcs54mapz9jnqvpnlwd3wsmy";
type = "gem";
};
version = "13.0.6";
version = "13.1.0";
};
rake-compiler = {
dependencies = ["rake"];
groups = ["development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1vhdkwblhzp4wp1jh95qiibly2zsnmg3659r6d5xp1mzgd9ghxji";
type = "gem";
};
version = "1.2.7";
};
rb-fsevent = {
groups = ["default"];
@ -408,10 +430,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0";
type = "gem";
};
version = "3.2.5";
version = "3.2.6";
};
rgl = {
dependencies = ["pairing_heap" "rexml" "stream"];
@ -430,10 +452,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c";
sha256 = "14xrp8vq6i9zx37vh0yp4h9m0anx9paw200l1r5ad9fmq559346l";
type = "gem";
};
version = "3.12.0";
version = "3.13.0";
};
rspec-core = {
dependencies = ["rspec-support"];
@ -441,10 +463,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0da45cvllbv39sdbsl65vp5djb2xf5m10mxc9jm7rsqyyxjw4h1f";
sha256 = "0k252n7s80bvjvpskgfm285a3djjjqyjcarlh3aq7a4dx2s94xsm";
type = "gem";
};
version = "3.12.1";
version = "3.13.0";
};
rspec-expectations = {
dependencies = ["diff-lcs" "rspec-support"];
@ -452,10 +474,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6";
sha256 = "0bhhjzwdk96vf3gq3rs7mln80q27fhq82hda3r15byb24b34h7b2";
type = "gem";
};
version = "3.12.2";
version = "3.13.0";
};
rspec-its = {
dependencies = ["rspec-core" "rspec-expectations"];
@ -474,20 +496,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1hfm17xakfvwya236graj6c2arr4sb9zasp35q5fykhyz8mhs0w2";
sha256 = "0rkzkcfk2x0qjr5fxw6ib4wpjy0hqbziywplnp6pg3bm2l98jnkk";
type = "gem";
};
version = "3.12.5";
version = "3.13.0";
};
rspec-support = {
groups = ["default" "development"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx";
sha256 = "03z7gpqz5xkw9rf53835pa8a9vgj4lic54rnix9vfwmp2m7pv1s8";
type = "gem";
};
version = "3.12.0";
version = "3.13.1";
};
rubyntlm = {
groups = ["default"];
@ -535,20 +557,20 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "13pzdsgf3v06mymzipcpa7p80shyw328ybn775nzpnhc6n8y9g30";
sha256 = "0c15v19hyxjcfzaviqlwhgajgyrrlb0pjilza6mkv49bhspy6av6";
type = "gem";
};
version = "0.2.2";
version = "0.3.0";
};
timeout = {
groups = ["default"];
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6";
sha256 = "16mvvsmx90023wrhf8dxc1lpqh0m8alk65shb7xcya6a9gflw7vg";
type = "gem";
};
version = "0.3.2";
version = "0.4.1";
};
vagrant-spec = {
dependencies = ["childprocess" "log4r" "rspec" "thor"];
@ -556,8 +578,8 @@
platforms = [];
source = {
fetchSubmodules = false;
rev = "708be5c53ea10131b19921c536eae012d1396a96";
sha256 = "0xnyai6wdx3xi5nhdvn7bpz73dlvnam4dckkwzd03apdssg6pnr6";
rev = "2a5afa7512753288b4ec1e26ec13bc6479b2fabb";
sha256 = "08l0qc7566126pqwn3cr91j5wgd2zqij8sacngr5yfsk2anl8fw0";
type = "git";
url = "https://github.com/hashicorp/vagrant-spec.git";
};
@ -569,10 +591,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
sha256 = "0np0d8rjca130si5iaxasbqmfbbx4l3kd9mxdsa3p5mqiia7za3b";
sha256 = "0jhwciki5i8hjbgv2f1p544bi92s9wdsfrjympzslysdzk95djpg";
type = "gem";
};
version = "3.0.5";
version = "3.1.1";
};
wdm = {
groups = ["default"];