vagrant: 2.2.9 -> 2.2.10

ChangeLog: https://github.com/hashicorp/vagrant/blob/v2.2.10/CHANGELOG.md#2210-august-24-2020

Apart from the usual `gemset`-update the following patches were altered:

* Deprecation fix on ruby 2.6.5: was removed since the underlying issue
  was fixed upstream.
* 0004-Support-system-installed-plugins.patch: re-downloaded the rebased
  version from `salsa.debian.org`[1] where we originally obtained the patch
  from.
* use-system-bundler-version: re-applied on top of Vagrant 2.2.10.

[1] https://salsa.debian.org/ruby-team/vagrant/-/blob/9d86f222/debian/patches/0004-Support-system-installed-plugins.patch
This commit is contained in:
Maximilian Bosch
2020-08-25 22:11:35 +02:00
parent fffabfaefd
commit a26ffb006b
4 changed files with 37 additions and 38 deletions
+2 -9
View File
@@ -5,9 +5,9 @@
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.2.9";
version = "2.2.10";
url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";
sha256 = "0fbickjjliaw3cpkh3pl9bp56b2gcqn87c5ag67amc450ah43rdq";
sha256 = "07wlj4m79m9li3za1jkk4imdhqwpca86qz3c0h706s0w8cmv4bbj";
deps = bundlerEnv rec {
name = "${pname}-${version}";
@@ -54,13 +54,6 @@ in buildRubyGem rec {
./unofficial-installation-nowarn.patch
./use-system-bundler-version.patch
./0004-Support-system-installed-plugins.patch
# fix deprecation warning on ruby 2.6.5.
# See also https://github.com/hashicorp/vagrant/pull/11307
(fetchpatch {
url = "https://github.com/hashicorp/vagrant/commit/d18ed567aaa5da23c9e91ab87f360e7bf6760f13.patch";
sha256 = "0f61qj41rc3fdggmnha4jrqg4pzmfiriwpsz4fcgf7c0bx6qha7q";
})
];
postPatch = ''