diff options
Diffstat (limited to 'pkgs/development/tools/vagrant/default.nix')
| -rw-r--r-- | pkgs/development/tools/vagrant/default.nix | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index ee8100128620e..ea3382f3e706a 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,13 +1,12 @@ { stdenv, lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive -, libguestfs, qemu, writeText, withLibvirt ? stdenv.isLinux, fetchpatch -}: +, libguestfs, qemu, writeText, withLibvirt ? stdenv.isLinux }: 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.7"; + version = "2.2.6"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - sha256 = "1z31y1nqiyj6rml9lz8gcbr29myhs5wcap8jsvgm3pb7p9p9y8m9"; + sha256 = "0nssq2i4riif0q72h5qp7dlxd4shqcyvm1bx9adppcacb77gpnhv"; deps = bundlerEnv rec { name = "${pname}-${version}"; @@ -54,13 +53,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 = '' @@ -118,7 +110,7 @@ in buildRubyGem rec { description = "A tool for building complete development environments"; homepage = https://www.vagrantup.com/; license = licenses.mit; - maintainers = with maintainers; [ aneeshusa ma27 ]; + maintainers = with maintainers; [ aneeshusa ]; platforms = with platforms; linux ++ darwin; }; } |