colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vagrant: 2.3.4 -> 2.3.7

Browse Source 
File in post fixup phase got deleted by upstream, no longer needed.
7db87b9da3

Patch needed some changes to work with newest version of vagrant.
3422582d68

https://github.com/hashicorp/vagrant/releases/tag/v2.3.5
https://github.com/hashicorp/vagrant/releases/tag/v2.3.6
https://github.com/hashicorp/vagrant/releases/tag/v2.3.7
This commit is contained in:
teutat3s 2023-07-02 02:05:55 +02:00
parent 061d56cea8
commit 0ddd921ebd
No known key found for this signature in database
GPG Key ID: 18DAE600A6BBE705
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -214,7 +214,7 @@ index edae9b477..782904f49 100644
cloud init command '%{cmd}' failed on guest '%{guest_name}'.
command_deprecated: |-
The command 'vagrant %{name}' has been deprecated and is no longer functional
@@ -1238,23 +1238,6 @@ en:
@@ -1245,30 +1245,6 @@ en:
following command:
vagrant plugin install --local
@ -225,12 +225,19 @@ index edae9b477..782904f49 100644
- again.
- plugin_missing_library: |-
- Vagrant failed to install the requested plugin because it depends
- on a library which is not currently installed on this system. The
- following library is required by the '%{name}' plugin:
- on development files for a library which is not currently installed
- on this system. The following library is required by the '%{name}'
- plugin:
-
- %{library}
-
- Please install the library and then run the command again.
- If a package manager is used on this system, please install the development
- package for the library. The name of the package will be similar to:
-
- %{library}-dev or %{library}-devel
-
- After the library and development files have been installed, please
- run the command again.
- plugin_missing_ruby_dev: |-
- Vagrant failed to install the requested plugin because the Ruby header
- files could not be found. Install the ruby development package for your

15
pkgs/development/tools/vagrant/default.nix
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.3.4";
version = "2.3.7";
url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz";
sha256 = "sha256-Q+sUYcbc/SOgw4ZXDmwqh24G0jiLvA8fDJyZ45OqLw8=";
hash = "sha256-+oqWMZqnuf9fSpkbd8vzf1SVSdhHN2JLzr76jyAEv0U=";
deps = bundlerEnv rec {
name = "${pname}-${version}";
@ -21,7 +21,7 @@ let
vagrant = {
source = {
type = "url";
inherit url sha256;
inherit url hash;
};
inherit version;
};
@ -48,7 +48,7 @@ in buildRubyGem rec {
doInstallCheck = true;
dontBuild = false;
src = fetchurl { inherit url sha256; };
src = fetchurl { inherit url hash; };
patches = [
./unofficial-installation-nowarn.patch
@ -98,13 +98,6 @@ in buildRubyGem rec {
HOME="$(mktemp -d)" $out/bin/vagrant init --output - > /dev/null
'';
# `patchShebangsAuto` patches this one script which is intended to run
# on foreign systems.
postFixup = ''
sed -i -e '1c#!/bin/sh -' \
$out/lib/ruby/gems/*/gems/vagrant-*/plugins/provisioners/salt/bootstrap-salt.sh
'';
passthru = {
inherit ruby deps;
};