vagrant: 2.2.19 -> 2.3.4

2.2.19 doesn't work with VirtualBox version present in nixpkgs

* https://github.com/hashicorp/vagrant/blob/v2.3.4/CHANGELOG.md

+309 -45
+2 -2
pkgs/development/tools/vagrant/default.nix
··· 5 5 let 6 6 # NOTE: bumping the version and updating the hash is insufficient; 7 7 # you must use bundix to generate a new gemset.nix in the Vagrant source. 8 - version = "2.2.19"; 8 + version = "2.3.4"; 9 9 url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; 10 - sha256 = "sha256-Tw5rHUZuJt6taCxNSEPo9koBLrpL6RUGrmxtNNPZyPk="; 10 + sha256 = "sha256-Q+sUYcbc/SOgw4ZXDmwqh24G0jiLvA8fDJyZ45OqLw8="; 11 11 12 12 deps = bundlerEnv rec { 13 13 name = "${pname}-${version}";
+297 -33
pkgs/development/tools/vagrant/gemset.nix
··· 34 34 platforms = []; 35 35 source = { 36 36 remotes = ["https://rubygems.org"]; 37 - sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; 37 + sha256 = "0krcwb6mn0iklajwngwsg850nk8k9b35dhmc2qkbdqvmifdi2y9q"; 38 + type = "gem"; 39 + }; 40 + version = "1.2.2"; 41 + }; 42 + date = { 43 + groups = ["default"]; 44 + platforms = []; 45 + source = { 46 + remotes = ["https://rubygems.org"]; 47 + sha256 = "03skfikihpx37rc27vr3hwrb057gxnmdzxhmzd4bf4jpkl0r55w1"; 38 48 type = "gem"; 39 49 }; 40 - version = "1.1.9"; 50 + version = "3.3.3"; 51 + }; 52 + diff-lcs = { 53 + groups = ["default" "development"]; 54 + platforms = []; 55 + source = { 56 + remotes = ["https://rubygems.org"]; 57 + sha256 = "0rwvjahnp7cpmracd8x732rjgnilqv2sx7d1gfrysslc3h039fa9"; 58 + type = "gem"; 59 + }; 60 + version = "1.5.0"; 41 61 }; 42 62 ed25519 = { 43 63 groups = ["default"]; 44 64 platforms = []; 45 65 source = { 46 66 remotes = ["https://rubygems.org"]; 47 - sha256 = "1f5kr8za7hvla38fc0n9jiv55iq62k5bzclsa5kdb14l3r4w6qnw"; 67 + sha256 = "0zb2dr2ihb1qiknn5iaj1ha1w9p7lj9yq5waasndlfadz225ajji"; 48 68 type = "gem"; 49 69 }; 50 - version = "1.2.4"; 70 + version = "1.3.0"; 51 71 }; 52 72 erubi = { 53 73 groups = ["default"]; 54 74 platforms = []; 55 75 source = { 56 76 remotes = ["https://rubygems.org"]; 57 - sha256 = "09l8lz3j00m898li0yfsnb6ihc63rdvhw3k5xczna5zrjk104f2l"; 77 + sha256 = "08s75vs9cxlc4r1q2bjg4br8g9wc5lc5x5vl0vv4zq5ivxsdpgi7"; 58 78 type = "gem"; 59 79 }; 60 - version = "1.10.0"; 80 + version = "1.12.0"; 61 81 }; 62 82 excon = { 63 83 groups = ["default"]; 64 84 platforms = []; 65 85 source = { 66 86 remotes = ["https://rubygems.org"]; 67 - sha256 = "15yrwawhvkjvfg0dsf8z81876ddj6161q0wh5s7pw4sim8z8pspr"; 87 + sha256 = "0j826kfvzn7nc5pv950n270r0sx1702k988ad11cdlav3dcxxw09"; 88 + type = "gem"; 89 + }; 90 + version = "0.99.0"; 91 + }; 92 + fake_ftp = { 93 + groups = ["development"]; 94 + platforms = []; 95 + source = { 96 + remotes = ["https://rubygems.org"]; 97 + sha256 = "1zl9q9m4x7lz9890g0h1qqj7hcxnwzpjfnfbxadjblps7b5054q4"; 68 98 type = "gem"; 69 99 }; 70 - version = "0.88.0"; 100 + version = "0.3.0"; 71 101 }; 72 102 ffi = { 73 103 groups = ["default"]; 74 104 platforms = []; 75 105 source = { 76 106 remotes = ["https://rubygems.org"]; 77 - sha256 = "0ssxcywmb3flxsjdg13is6k01807zgzasdhj4j48dm7ac59cmksn"; 107 + sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; 108 + type = "gem"; 109 + }; 110 + version = "1.15.5"; 111 + }; 112 + google-protobuf = { 113 + groups = ["default"]; 114 + platforms = []; 115 + source = { 116 + remotes = ["https://rubygems.org"]; 117 + sha256 = "1zqyy07ps6zh0gi9nppmnsngzv5nx1qjv726mzhv83sh90rc25nm"; 118 + type = "gem"; 119 + }; 120 + version = "3.22.2"; 121 + }; 122 + googleapis-common-protos-types = { 123 + dependencies = ["google-protobuf"]; 124 + groups = ["default"]; 125 + platforms = []; 126 + source = { 127 + remotes = ["https://rubygems.org"]; 128 + sha256 = "12w5bwaziz2iqb9dvgnskp2a7ifml6n4lyl9ypvnxj5bfrrwysap"; 129 + type = "gem"; 130 + }; 131 + version = "1.5.0"; 132 + }; 133 + grpc = { 134 + dependencies = ["google-protobuf" "googleapis-common-protos-types"]; 135 + groups = ["default"]; 136 + platforms = []; 137 + source = { 138 + remotes = ["https://rubygems.org"]; 139 + sha256 = "0kj4j1g6l9v92k3byqyfq2kmawy12cj898daxqn1jsw0b458k0dh"; 140 + type = "gem"; 141 + }; 142 + version = "1.53.0"; 143 + }; 144 + grpc-tools = { 145 + groups = ["development"]; 146 + platforms = []; 147 + source = { 148 + remotes = ["https://rubygems.org"]; 149 + sha256 = "0dal0xca2f301jrh049agmrbab21yjqd8npizzz55dhqn9dkwdsl"; 78 150 type = "gem"; 79 151 }; 80 - version = "1.15.4"; 152 + version = "1.53.0"; 81 153 }; 82 154 gssapi = { 83 155 dependencies = ["ffi"]; ··· 91 163 version = "1.3.1"; 92 164 }; 93 165 gyoku = { 94 - dependencies = ["builder"]; 166 + dependencies = ["builder" "rexml"]; 95 167 groups = ["default"]; 96 168 platforms = []; 97 169 source = { 98 170 remotes = ["https://rubygems.org"]; 99 - sha256 = "1wn0sl14396g5lyvp8sjmcb1hw9rbyi89gxng91r7w4df4jwiidh"; 171 + sha256 = "1kd2q59xpm39hpvmmvyi6g3f1fr05xjbnxwkrdqz4xy7hirqi79q"; 100 172 type = "gem"; 101 173 }; 102 - version = "1.3.1"; 174 + version = "1.4.0"; 103 175 }; 104 176 hashicorp-checkpoint = { 105 177 groups = ["default"]; ··· 127 199 platforms = []; 128 200 source = { 129 201 remotes = ["https://rubygems.org"]; 130 - sha256 = "0vdd1kii40qhbr9n8qx71k2gskq6rkl8ygy8hw5hfj8bb5a364xf"; 202 + sha256 = "1vdcchz7jli1p0gnc669a7bj3q1fv09y9ppf0y3k0vb1jwdwrqwi"; 203 + type = "gem"; 204 + }; 205 + version = "1.12.0"; 206 + }; 207 + ipaddr = { 208 + groups = ["default"]; 209 + platforms = []; 210 + source = { 211 + remotes = ["https://rubygems.org"]; 212 + sha256 = "0ypic2hrmvvcgw7al72raphqv5cs1zvq4w284pwrkvfqsrqrqrsf"; 131 213 type = "gem"; 132 214 }; 133 - version = "1.8.11"; 215 + version = "1.2.5"; 134 216 }; 135 217 listen = { 136 218 dependencies = ["rb-fsevent" "rb-inotify"]; ··· 138 220 platforms = []; 139 221 source = { 140 222 remotes = ["https://rubygems.org"]; 141 - sha256 = "0ncfhdkjiwq9l1pm87ax2pa20kz2j0dz56vi74cnr5a6cfk0qb5p"; 223 + sha256 = "13rgkfar8pp31z1aamxf5y7cfq88wv6rxxcwy7cmm177qq508ycn"; 142 224 type = "gem"; 143 225 }; 144 - version = "3.7.0"; 226 + version = "3.8.0"; 145 227 }; 146 228 little-plugger = { 147 229 groups = ["default"]; ··· 169 251 platforms = []; 170 252 source = { 171 253 remotes = ["https://rubygems.org"]; 172 - sha256 = "0pkmhcxi8lp74bq5gz9lxrvaiv5w0745kk7s4bw2b1x07qqri0n9"; 254 + sha256 = "1zflchpx4g8c110gjdcs540bk5a336nq6nmx379rdg56xw0pjd02"; 173 255 type = "gem"; 174 256 }; 175 - version = "2.3.0"; 257 + version = "2.3.1"; 176 258 }; 177 259 mime-types = { 178 260 dependencies = ["mime-types-data"]; ··· 180 262 platforms = []; 181 263 source = { 182 264 remotes = ["https://rubygems.org"]; 183 - sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; 265 + sha256 = "0ipw892jbksbxxcrlx9g5ljq60qx47pm24ywgfbyjskbcl78pkvb"; 184 266 type = "gem"; 185 267 }; 186 - version = "3.3.1"; 268 + version = "3.4.1"; 187 269 }; 188 270 mime-types-data = { 189 271 groups = ["default"]; 190 272 platforms = []; 191 273 source = { 192 274 remotes = ["https://rubygems.org"]; 193 - sha256 = "1z5wvk6qi4ws1kjh7xn1rfirqw5m72bwvqacck1fjpbh33pcrwxv"; 275 + sha256 = "1pky3vzaxlgm9gw5wlqwwi7wsw3jrglrfflrppvvnsrlaiz043z9"; 194 276 type = "gem"; 195 277 }; 196 - version = "3.2021.0901"; 278 + version = "3.2023.0218.1"; 197 279 }; 198 280 multi_json = { 199 281 groups = ["default"]; ··· 205 287 }; 206 288 version = "1.15.0"; 207 289 }; 290 + net-ftp = { 291 + dependencies = ["net-protocol" "time"]; 292 + groups = ["default"]; 293 + platforms = []; 294 + source = { 295 + remotes = ["https://rubygems.org"]; 296 + sha256 = "0bqy9xg5225x102873j1qqq1bvnwfbi8lnf4357mpq6wimnw9pf9"; 297 + type = "gem"; 298 + }; 299 + version = "0.2.0"; 300 + }; 301 + net-protocol = { 302 + dependencies = ["timeout"]; 303 + groups = ["default"]; 304 + platforms = []; 305 + source = { 306 + remotes = ["https://rubygems.org"]; 307 + sha256 = "0dxckrlw4q1lcn3qg4mimmjazmg9bma5gllv72f8js3p36fb3b91"; 308 + type = "gem"; 309 + }; 310 + version = "0.2.1"; 311 + }; 208 312 net-scp = { 209 313 dependencies = ["net-ssh"]; 210 314 groups = ["default"]; 211 315 platforms = []; 212 316 source = { 213 317 remotes = ["https://rubygems.org"]; 214 - sha256 = "0b4h3ip8d1gkrc0znnw54hbxillk73mdnaf5pz330lmrcl1wiilg"; 318 + sha256 = "1si2nq9l6jy5n2zw1q59a5gaji7v9vhy8qx08h4fg368906ysbdk"; 215 319 type = "gem"; 216 320 }; 217 - version = "3.0.0"; 321 + version = "4.0.0"; 218 322 }; 219 323 net-sftp = { 220 324 dependencies = ["net-ssh"]; ··· 222 326 platforms = []; 223 327 source = { 224 328 remotes = ["https://rubygems.org"]; 225 - sha256 = "185vsybznqgqbb4i2qnxvf1gam8lb634nqcrq7r3i2zy1g6xd8mi"; 329 + sha256 = "0r33aa2d61hv1psm0l0mm6ik3ycsnq8symv7h84kpyf2b7493fv5"; 226 330 type = "gem"; 227 331 }; 228 - version = "3.0.0"; 332 + version = "4.0.0"; 229 333 }; 230 334 net-ssh = { 231 335 groups = ["default"]; 232 336 platforms = []; 233 337 source = { 234 338 remotes = ["https://rubygems.org"]; 235 - sha256 = "0jp3jgcn8cij407xx9ldb5h9c6jv13jc4cf6kk2idclz43ww21c9"; 339 + sha256 = "0yx0pb5fmziz92bw8qzbh8vf20lr56nd3s6q8h0gsgr307lki687"; 236 340 type = "gem"; 237 341 }; 238 - version = "6.1.0"; 342 + version = "7.1.0"; 239 343 }; 240 344 nori = { 241 345 groups = ["default"]; ··· 247 351 }; 248 352 version = "2.6.0"; 249 353 }; 354 + pairing_heap = { 355 + groups = ["default"]; 356 + platforms = []; 357 + source = { 358 + remotes = ["https://rubygems.org"]; 359 + sha256 = "15rcn0bd9z25dgbrsnjp9zva1hs22vnr54pzi9wjy62js2nfmx9r"; 360 + type = "gem"; 361 + }; 362 + version = "3.0.0"; 363 + }; 364 + rake = { 365 + groups = ["development"]; 366 + platforms = []; 367 + source = { 368 + remotes = ["https://rubygems.org"]; 369 + sha256 = "15whn7p9nrkxangbs9hh75q585yfn66lv0v2mhj6q6dl6x8bzr2w"; 370 + type = "gem"; 371 + }; 372 + version = "13.0.6"; 373 + }; 250 374 rb-fsevent = { 251 375 groups = ["default"]; 252 376 platforms = []; 253 377 source = { 254 378 remotes = ["https://rubygems.org"]; 255 - sha256 = "1qsx9c4jr11vr3a9s5j83avczx9qn9rjaf32gxpc2v451hvbc0is"; 379 + sha256 = "1zmf31rnpm8553lqwibvv3kkx0v7majm1f341xbxc0bk5sbhp423"; 256 380 type = "gem"; 257 381 }; 258 - version = "0.11.0"; 382 + version = "0.11.2"; 259 383 }; 260 384 rb-inotify = { 261 385 dependencies = ["ffi"]; ··· 274 398 platforms = []; 275 399 source = { 276 400 remotes = ["https://rubygems.org"]; 277 - sha256 = "0wpn2m28qs7s95nqg67dn5vpyh05q7d0w6sm4svhflm41cd0akr4"; 401 + sha256 = "0vpq1dmmlbggfk399s7jq2rrnjp6r8774amfli75bqhjn1sk2bxg"; 278 402 type = "gem"; 279 403 }; 280 - version = "0.2.7"; 404 + version = "0.2.8"; 281 405 }; 282 406 rexml = { 283 407 groups = ["default"]; ··· 289 413 }; 290 414 version = "3.2.5"; 291 415 }; 416 + rgl = { 417 + dependencies = ["pairing_heap" "rexml" "stream"]; 418 + groups = ["default"]; 419 + platforms = []; 420 + source = { 421 + remotes = ["https://rubygems.org"]; 422 + sha256 = "0jjc2v9hg42bzg6w5yg3azrsdr31qmc6ff93xb5adfjqg337vzz3"; 423 + type = "gem"; 424 + }; 425 + version = "0.5.10"; 426 + }; 427 + rspec = { 428 + dependencies = ["rspec-core" "rspec-expectations" "rspec-mocks"]; 429 + groups = ["development"]; 430 + platforms = []; 431 + source = { 432 + remotes = ["https://rubygems.org"]; 433 + sha256 = "171rc90vcgjl8p1bdrqa92ymrj8a87qf6w20x05xq29mljcigi6c"; 434 + type = "gem"; 435 + }; 436 + version = "3.12.0"; 437 + }; 438 + rspec-core = { 439 + dependencies = ["rspec-support"]; 440 + groups = ["default" "development"]; 441 + platforms = []; 442 + source = { 443 + remotes = ["https://rubygems.org"]; 444 + sha256 = "0da45cvllbv39sdbsl65vp5djb2xf5m10mxc9jm7rsqyyxjw4h1f"; 445 + type = "gem"; 446 + }; 447 + version = "3.12.1"; 448 + }; 449 + rspec-expectations = { 450 + dependencies = ["diff-lcs" "rspec-support"]; 451 + groups = ["default" "development"]; 452 + platforms = []; 453 + source = { 454 + remotes = ["https://rubygems.org"]; 455 + sha256 = "03ba3lfdsj9zl00v1yvwgcx87lbadf87livlfa5kgqssn9qdnll6"; 456 + type = "gem"; 457 + }; 458 + version = "3.12.2"; 459 + }; 460 + rspec-its = { 461 + dependencies = ["rspec-core" "rspec-expectations"]; 462 + groups = ["development"]; 463 + platforms = []; 464 + source = { 465 + remotes = ["https://rubygems.org"]; 466 + sha256 = "15zafd70gxly5i0s00nky14sj2n92dnj3xpj83ysl3c2wx0119ad"; 467 + type = "gem"; 468 + }; 469 + version = "1.3.0"; 470 + }; 471 + rspec-mocks = { 472 + dependencies = ["diff-lcs" "rspec-support"]; 473 + groups = ["default" "development"]; 474 + platforms = []; 475 + source = { 476 + remotes = ["https://rubygems.org"]; 477 + sha256 = "1hfm17xakfvwya236graj6c2arr4sb9zasp35q5fykhyz8mhs0w2"; 478 + type = "gem"; 479 + }; 480 + version = "3.12.5"; 481 + }; 482 + rspec-support = { 483 + groups = ["default" "development"]; 484 + platforms = []; 485 + source = { 486 + remotes = ["https://rubygems.org"]; 487 + sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx"; 488 + type = "gem"; 489 + }; 490 + version = "3.12.0"; 491 + }; 292 492 rubyntlm = { 293 493 groups = ["default"]; 294 494 platforms = []; ··· 309 509 }; 310 510 version = "2.3.2"; 311 511 }; 512 + stream = { 513 + groups = ["default"]; 514 + platforms = []; 515 + source = { 516 + remotes = ["https://rubygems.org"]; 517 + sha256 = "016m9v81vpj14d8g5ins91zc4pzl7vf5f1gxl7jhfsfy601k7cv2"; 518 + type = "gem"; 519 + }; 520 + version = "0.5.5"; 521 + }; 522 + thor = { 523 + groups = ["default"]; 524 + platforms = []; 525 + source = { 526 + remotes = ["https://rubygems.org"]; 527 + sha256 = "0d1g37j6sc7fkidf8rqlm3wh9zgyg3g7y8h2x1y34hmil5ywa8c3"; 528 + type = "gem"; 529 + }; 530 + version = "0.18.1"; 531 + }; 532 + time = { 533 + dependencies = ["date"]; 534 + groups = ["default"]; 535 + platforms = []; 536 + source = { 537 + remotes = ["https://rubygems.org"]; 538 + sha256 = "13pzdsgf3v06mymzipcpa7p80shyw328ybn775nzpnhc6n8y9g30"; 539 + type = "gem"; 540 + }; 541 + version = "0.2.2"; 542 + }; 543 + timeout = { 544 + groups = ["default"]; 545 + platforms = []; 546 + source = { 547 + remotes = ["https://rubygems.org"]; 548 + sha256 = "1pfddf51n5fnj4f9ggwj3wbf23ynj0nbxlxqpz12y1gvl9g7d6r6"; 549 + type = "gem"; 550 + }; 551 + version = "0.3.2"; 552 + }; 553 + vagrant-spec = { 554 + dependencies = ["childprocess" "log4r" "rspec" "thor"]; 555 + groups = ["default"]; 556 + platforms = []; 557 + source = { 558 + fetchSubmodules = false; 559 + rev = "708be5c53ea10131b19921c536eae012d1396a96"; 560 + sha256 = "0xnyai6wdx3xi5nhdvn7bpz73dlvnam4dckkwzd03apdssg6pnr6"; 561 + type = "git"; 562 + url = "https://github.com/hashicorp/vagrant-spec.git"; 563 + }; 564 + version = "0.0.1"; 565 + }; 312 566 vagrant_cloud = { 313 567 dependencies = ["excon" "log4r" "rexml"]; 314 568 groups = ["default"]; ··· 329 583 type = "gem"; 330 584 }; 331 585 version = "0.1.1"; 586 + }; 587 + webrick = { 588 + groups = ["development"]; 589 + platforms = []; 590 + source = { 591 + remotes = ["https://rubygems.org"]; 592 + sha256 = "1d4cvgmxhfczxiq5fr534lmizkhigd15bsx5719r5ds7k7ivisc7"; 593 + type = "gem"; 594 + }; 595 + version = "1.7.0"; 332 596 }; 333 597 winrm = { 334 598 dependencies = ["builder" "erubi" "gssapi" "gyoku" "httpclient" "logging" "nori" "rubyntlm"];
+10 -10
pkgs/development/tools/vagrant/unofficial-installation-nowarn.patch
··· 1 1 diff --git a/bin/vagrant b/bin/vagrant 2 - index 0e6abdc..cb36e9c 100755 2 + index 7ca30b391..d3f4ea61a 100755 3 3 --- a/bin/vagrant 4 4 +++ b/bin/vagrant 5 - @@ -155,11 +155,6 @@ begin 5 + @@ -221,11 +221,6 @@ begin 6 + end 6 7 end 7 - end 8 8 9 - - if !Vagrant.in_installer? && !Vagrant.very_quiet? 10 - - # If we're not in the installer, warn. 11 - - env.ui.warn(I18n.t("vagrant.general.not_in_installer") + "\n", prefix: false) 12 - - end 9 + - if !Vagrant.in_installer? && !Vagrant.very_quiet? 10 + - # If we're not in the installer, warn. 11 + - env.ui.warn(I18n.t("vagrant.general.not_in_installer") + "\n", prefix: false) 12 + - end 13 13 - 14 - # Acceptable experimental flag values include: 15 - # 16 - # Unset - Disables experimental features 14 + # Acceptable experimental flag values include: 15 + # 16 + # Unset - Disables experimental features