forked from mirrors/nixpkgs
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
parent
fffabfaefd
commit
a26ffb006b
|
|
@ -1,7 +1,7 @@
|
|||
From: Antonio Terceiro <terceiro@debian.org>
|
||||
Date: Wed, 27 May 2015 09:36:17 -0300
|
||||
Subject: Support system-installed plugins
|
||||
Source: https://salsa.debian.org/ruby-team/vagrant/blob/cb672c6dc0c63f6552c5ec4d6d7d22929d353503/debian/patches/0004-Support-system-installed-plugins.patch
|
||||
Source: https://salsa.debian.org/ruby-team/vagrant/-/blob/9d86f222/debian/patches/0004-Support-system-installed-plugins.patch
|
||||
|
||||
Plugins must be installed as regular Ruby libraries, and they must
|
||||
contain /usr/share/vagrant-plugins/plugins.d/$PLUGINNAME.json with the
|
||||
|
|
@ -22,7 +22,7 @@ following content:
|
|||
2 files changed, 23 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/lib/vagrant/plugin/manager.rb b/lib/vagrant/plugin/manager.rb
|
||||
index 567347d..d9d76a0 100644
|
||||
index 9058e68..2772131 100644
|
||||
--- a/lib/vagrant/plugin/manager.rb
|
||||
+++ b/lib/vagrant/plugin/manager.rb
|
||||
@@ -18,7 +18,7 @@ module Vagrant
|
||||
|
|
@ -80,17 +80,13 @@ index c6872d4..935d431 100644
|
|||
end
|
||||
|
||||
# Add a plugin that is installed to the state file.
|
||||
@@ -107,6 +123,14 @@ module Vagrant
|
||||
@@ -107,6 +123,10 @@ module Vagrant
|
||||
f.close
|
||||
FileUtils.mv(f.path, @path)
|
||||
end
|
||||
+ rescue Errno::EACCES
|
||||
+ # Ignore permission denied against system-installed plugins; regular
|
||||
+ # users are not supposed to write there.
|
||||
+ raise unless @system
|
||||
+ rescue Errno::EROFS
|
||||
+ # Ignore read-only filesystem against system-installed plugins; regular
|
||||
+ # users are not supposed to write there.
|
||||
+ raise unless @system
|
||||
end
|
||||
|
||||
|
|
|
|||
|
|
@ -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 = ''
|
||||
|
|
|
|||
|
|
@ -24,20 +24,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "1ic028k8xgm2dds9mqnvwwx3ibaz32j8455zxr9f4bcnviyahya5";
|
||||
sha256 = "08hd3d2lfi19cns4d6wkq51scasn17l83fgbzbjjk3dqccz4rg3j";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.0.0";
|
||||
version = "4.0.0";
|
||||
};
|
||||
concurrent-ruby = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "094387x4yasb797mv07cs3g6f08y56virc2rjcpb1k79rzaj3nhl";
|
||||
sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.1.6";
|
||||
version = "1.1.7";
|
||||
};
|
||||
domain_name = {
|
||||
dependencies = ["unf"];
|
||||
|
|
@ -149,21 +149,21 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "10nq1xjqvkhngiygji831qx9bryjwws95r4vrnlq9142bzkg670s";
|
||||
sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.8.3";
|
||||
version = "1.8.5";
|
||||
};
|
||||
listen = {
|
||||
dependencies = ["rb-fsevent" "rb-inotify" "ruby_dep"];
|
||||
dependencies = ["rb-fsevent" "rb-inotify"];
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "01v5mrnfqm6sgm8xn2v5swxsn1wlmq7rzh2i48d4jzjsc7qvb6mx";
|
||||
sha256 = "1w923wmdi3gyiky0asqdw5dnh3gcjs2xyn82ajvjfjwh6sn0clgi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "3.1.5";
|
||||
version = "3.2.1";
|
||||
};
|
||||
little-plugger = {
|
||||
groups = ["default"];
|
||||
|
|
@ -191,10 +191,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "06j6iaj89h9jhkx1x3hlswqrfnqds8br05xb1qra69dpvbdmjcwn";
|
||||
sha256 = "0pkmhcxi8lp74bq5gz9lxrvaiv5w0745kk7s4bw2b1x07qqri0n9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.2.2";
|
||||
version = "2.3.0";
|
||||
};
|
||||
mime = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0nskys7brz2bylhxiknl0z9i19w3wb1knf0h93in6mjq70jdw5cr";
|
||||
type = "gem";
|
||||
};
|
||||
version = "0.4.4";
|
||||
};
|
||||
mime-types = {
|
||||
dependencies = ["mime-types-data"];
|
||||
|
|
@ -222,10 +232,10 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "0xy54mjf7xg41l8qrg1bqri75agdqmxap9z466fjismc1rn2jwfr";
|
||||
sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
|
||||
type = "gem";
|
||||
};
|
||||
version = "1.14.1";
|
||||
version = "1.15.0";
|
||||
};
|
||||
net-scp = {
|
||||
dependencies = ["net-ssh"];
|
||||
|
|
@ -244,20 +254,20 @@
|
|||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "04674g4n6mryjajlcd82af8g8k95la4b1bj712dh71hw1c9vhw1y";
|
||||
sha256 = "185vsybznqgqbb4i2qnxvf1gam8lb634nqcrq7r3i2zy1g6xd8mi";
|
||||
type = "gem";
|
||||
};
|
||||
version = "2.1.2";
|
||||
version = "3.0.0";
|
||||
};
|
||||
net-ssh = {
|
||||
groups = ["default"];
|
||||
platforms = [];
|
||||
source = {
|
||||
remotes = ["https://rubygems.org"];
|
||||
sha256 = "101wd2px9lady54aqmkibvy4j62zk32w0rjz4vnigyg974fsga40";
|
||||
sha256 = "0jp3jgcn8cij407xx9ldb5h9c6jv13jc4cf6kk2idclz43ww21c9";
|
||||
type = "gem";
|
||||
};
|
||||
version = "5.2.0";
|
||||
version = "6.1.0";
|
||||
};
|
||||
netrc = {
|
||||
groups = ["default"];
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
diff --git i/lib/vagrant/bundler.rb w/lib/vagrant/bundler.rb
|
||||
index 301e40e37..e361ab510 100644
|
||||
--- i/lib/vagrant/bundler.rb
|
||||
+++ w/lib/vagrant/bundler.rb
|
||||
@@ -217,7 +217,7 @@ module Vagrant
|
||||
diff --git a/lib/vagrant/bundler.rb b/lib/vagrant/bundler.rb
|
||||
index 336ac1e05..1bfd84c0d 100644
|
||||
--- a/lib/vagrant/bundler.rb
|
||||
+++ b/lib/vagrant/bundler.rb
|
||||
@@ -470,7 +470,7 @@ module Vagrant
|
||||
source_list = {}
|
||||
system_plugins = plugins.map do |plugin_name, plugin_info|
|
||||
plugin_name if plugin_info["system"]
|
||||
|
|
|
|||
Loading…
Reference in a new issue