Commit graph

84 commits

Author SHA1 Message Date
Frederik Rietdijk 419bc0a4cd Revert "Revert "Merge master into staging-next""
In 87a19e9048 I merged staging-next into master using the GitHub gui as intended.
In ac241fb7a5 I merged master into staging-next for the next staging cycle, however, I accidentally pushed it to master.
Thinking this may cause trouble, I reverted it in 0be87c7979. This was however wrong, as it "removed" master.

This reverts commit 0be87c7979.
2020-02-05 19:41:25 +01:00
Frederik Rietdijk 0be87c7979 Revert "Merge master into staging-next"
I merged master into staging-next but accidentally pushed it to master.
This should get us back to 87a19e9048.

This reverts commit ac241fb7a5, reversing
changes made to 76a439239e.
2020-02-05 19:18:35 +01:00
Maximilian Bosch ccc64216dd
vagrant: 2.2.6 -> 2.2.7
https://github.com/hashicorp/vagrant/releases/tag/v2.2.7
2020-02-05 18:24:49 +01:00
Mike Sperber 1bea1a30b5 vagrant: Unbreak replacing symlinks on macOS
On a local installation on macOS, "cp -a" creates a write-protected
directory, which can't be renamed.  Do a "chmod +w" to unbreak.

Fixes #77671.
2020-01-14 13:15:17 +01:00
Anders Kaseorg 2c70867d77 vagrant: Improve installCheckPhase to verify an actual operation
Just running `vagrant --version` was insufficient to catch #76629, but
this would have.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2019-12-31 20:21:17 -08:00
Anders Kaseorg 5ddafad13e vagrant: Resolve crash by replacing gem symlinks with directories
This workaround was discovered by painstakingly resolving the
differences between a working installation and a non-working
installation until a minimal change was found.  I have no idea why it
works.

Fixes #76629.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
2019-12-31 20:21:16 -08:00
Maximilian Bosch 728f7a7d4b
vagrant: 2.2.5 -> 2.2.6
https://github.com/hashicorp/vagrant/releases/tag/v2.2.6

Generated the `gemset.nix` by converting the `vagrant.gemspec` file to a
different `Gemfile` as described in the previous update PR[1].

[1] https://github.com/NixOS/nixpkgs/pull/64302#issuecomment-516837953
2019-11-06 22:42:26 +01:00
volth 7b8fb5c06c treewide: remove redundant quotes 2019-09-08 23:38:31 +00:00
Maximilian Bosch a3eab9e90a
Merge pull request #64302 from angristan/vagrant/update/2.2.5
vagrant: 2.2.3 -> 2.2.5
2019-08-02 12:39:37 +02:00
angristan 5521aae4b9 vagrant: 2.2.3 -> 2.2.5 2019-07-31 15:51:32 +02:00
Meghea Iulian 41881902e8 vagrant: add bash completions 2019-07-27 14:58:00 +03:00
Samuel Dionne-Riel 15879c318e vagrant: Don't patch salt provisioner's shebang
The script is intended to run on remote systems, not on the local
system. The shebang **has** to work where nix and the current store does
not exist.
2019-06-19 13:07:22 -04:00
William Kral 0b76b2d2af vagrant: re-add nowarn patch (#56863) 2019-03-05 06:44:40 -08:00
Matthew Bauer 55fc5b54ee vagrant: only use libvirt on linux
Fixes #55751
2019-02-25 16:50:54 -05:00
Florian Klink 659ebb6869 vagrant: 2.2.0 -> 2.2.3 2019-02-12 00:23:46 +01:00
Ryan Fitzsimon b66b0c58ca vagrant: Add vagrant-libvirt utility dependencies
When using vagrant-libvirt as provider, the 'vagrant package'
command requires 'qemu-img' and 'virt-sysprep'.
2019-01-02 17:17:14 +10:00
Matthew Harm Bekkema c660f3d419 vagrant: Remove unnecessary buildInputs
libvirt and pkgconfig are now buildInputs to ruby-libvirt instead.
2018-12-17 21:53:23 +11:00
Matthew Harm Bekkema 245ba973d9 vagrant: Install vagrant-libvirt as system plugin 2018-12-17 21:53:23 +11:00
Matthew Harm Bekkema 08488bcf94 vagrant: Support system-installed plugins
Patch taken from Debian
2018-12-17 21:53:23 +11:00
Matthew Harm Bekkema 1183ee645d vagrant: Add vagrant-libvirt to the gemset
With this, you can "install" the plugin just by adding the following to
~/vagrant.d/plugins.json:

  {
    "version":"1",
    "installed": {
      "vagrant-libvirt": {
        "ruby_version":"2.5.3",
        "vagrant_version":"2.2.0",
        "gem_version":"",
        "require":"",
        "sources":[]
      }
    }
  }
2018-12-17 10:23:27 +11:00
Christian Albrecht c5e8ae3f0b vagrant: do withLibvitr by default #49220 2018-11-07 17:46:57 +01:00
Christian Albrecht 7ed92b1497 vagrant-libvirt: init at 2.2.0
Adds a flag and a new package to build vagrant with libvirt support,
to be able to install and use the vagrant-libvirt plugin.
2018-11-07 17:46:57 +01:00
Christian Albrecht 9335613995 vagrant: 2.1.2 -> 2.2.0 2018-11-07 17:46:57 +01:00
Aneesh Agrawal 16a8e49ae9 vagrant: remove unused vendored Gemfile{,.lock} 2018-10-01 21:06:34 -07:00
Aneesh Agrawal fae4aa9f36 vagrant: Clean up Gemfile 2018-09-25 00:18:39 -07:00
Aneesh Agrawal 2ed25d3768 vagrant: mark bundler as system plugin
This will cause Vagrant to use the rubygems version of bundler
without complaint.
2018-08-27 22:57:19 -07:00
Aneesh Agrawal 982f9d8616 vagrant: update deps for 2.1.2
The version was bumped but the dependencies were not updated.
Do so and add some instructions for future package updates.
2018-07-16 10:11:36 -07:00
Alyssa Ross 165b6391fc vagrant: 2.1.1 -> 2.1.2 (#43416) 2018-07-14 00:41:37 +02:00
John Ericson 18742471af Merge remote-tracking branch 'upstream/master' into staging
Use newer vagrant from master
2018-05-23 09:40:37 -04:00
Aneesh Agrawal cde4ea79f8 vagrant: 2.0.2 -> 2.1.1 2018-05-23 00:22:39 -07:00
Jörg Thalheim 0a973b9985 vagrant: 2.0.2 -> 2.0.4 2018-04-29 19:08:42 +01:00
Aneesh Agrawal 89d0307a39 vagrant: Fix dependencies for version 2.0.2
The version was bumped in #36081,
but the dependencies were not updated,
causing Vagrant to fail at runtime.

Fix the dependencies (via bundix),
and add an `installCheckPhase` to the derviation
to catch this in the future.
2018-03-03 23:31:00 -08:00
Ryan Mulligan 52611447d1 vagrant: 2.0.1 -> 2.0.2
Semi-automatic update. These checks were performed:

- built on NixOS
- found 2.0.2 with grep in /nix/store/32zly5yhz0hcqgk6w5y0ish2rssfc6y9-vagrant-2.0.2

cc "@aneeshusa"
2018-02-28 11:36:44 +01:00
Aneesh Agrawal 9c33aa8465 vagrant: Make bsdtar available to extract boxes 2018-01-27 15:48:19 -08:00
Aneesh Agrawal 8c3553b88d vagrant: Build from source
This is not quite as elegant as using `bundlerApp`,
which I could not get working.
However, this still uses most of the Ruby infrastructure,
including stock bundix, and should be fairly reasonable to maintain.

This means no more hacks to work around wrong embedded binaries,
and no need for an old version of Ruby.

Note that `vagrant share` is no longer included,
as that functionality is closed-source
and not present in the upstream source code.

The Vagrant maintainers publish official Vagrant installers,
which they prefer people use as most platforms don't
have great support for pinning known-good dependencies.
When run outside one of the offical installers,
Vagrant normally prints a warning to that effect.
However, Vagrant does run outside the installer environment
(nominally to support Vagrant development),
and this has the effect of functioning better by respecting
OS certs and shared libraries,
as opposed to trying to use bundled versions.
To keep these postive side effects without having to see the warning
on every Vagrant invocation, patch out the call to print the warning.

Note that I have reset the maintainers since the implementation is
totally redone; I'm happy to re-add any of the current maintainers.
2018-01-04 08:00:51 -08:00
Andreas Rammhold e427e8415c
vagrant: removed custom rake gem 2017-11-17 11:43:31 +01:00
Andreas Rammhold 3f4eb16799
vagrant: 2.0.0 -> 2.0.1
Due to the virtualbox bump to version 5.2 vagrant was no longer able to
interface with virtualbox. Version 2.0.1 supports virtualbox 5.2.
2017-11-17 11:43:30 +01:00
Samuel Dionne-Riel bd87a3be2d vagrant: Adds bash-completion to the proper folder. (#30482) 2017-10-17 02:35:04 +01:00
Diego Zamboni 97d9f0b5bb vagrant: fix Ruby and libffi libraries on Darwin
On Darwin, keep the Ruby and libffi libraries and binaries bundled
with Vagrant instead of linking to the Nix ones, to avoid errors about
libraries not found.
2017-10-04 22:06:39 +02:00
Diego Zamboni 9bcd1de373 vagrant: 1.9.5 -> 2.0.0
Upgrade to latest version of Vagrant.

After installation, the following messages appear whenever vagrant runs.
These were already present in previous versions, I'm not sure if/what
to do about them:

Ignoring ffi-1.9.18 because its extensions are not built.  Try: gem pristine ffi --version 1.9.18
Ignoring unf_ext-0.0.7.4 because its extensions are not built.  Try: gem pristine unf_ext --version 0.0.7.4
Ignoring wdm-0.1.1 because its extensions are not built.  Try: gem pristine wdm --version 0.1.1
2017-10-02 10:06:03 +02:00
Tim Jäger 0576bda744 vagrant: against libffi (#26440)
* Link vagrant against libffi

Vagrant requires libffi to run
with (vagrant-fsnotify)[https://github.com/adrienkohlbecker/vagrant-fsnotify].

* vagrant: nitpick
2017-06-08 07:20:10 +01:00
Aaron Bull Schaefer 728ddbd95f vagrant: 1.9.1 -> 1.9.5 2017-05-30 08:23:04 -07:00
Kamil Chmielewski 29ac5d5209 vagrant: FIX #21365 add libxml2 and libxslt paths 2017-01-23 20:34:04 +01:00
Kamil Chmielewski 9aa6c95d5a vagrant: 1.8.7 -> 1.9.1 2016-12-15 12:29:52 +01:00
Michaël Faille 3a3706c07f vagrant: 1.8.6 -> 1.8.7
I upgrade vagrant mainly for this bug :
https://github.com/mitchellh/vagrant/issues/7844
2016-11-14 00:15:57 -05:00
Ryan Artecona 224a6b85fa vagrant: add darwin support
Vagrant on macOS is distributed as a .dmg installer. Luckily, the
internal contents of that archive resemble that of the .deb we use for
linux. In fact, the similarity is enough that if we move its `embedded`
directory to `opt/vagrant/embedded` and its `bin` to `usr/bin` (and back
again after installation), the derivation's installPhase (which replaces
embedded libs & binaries with those from the package's inputs) can
remain exactly the same between macOS and linux.
2016-10-09 15:25:41 -04:00
Kamil Chmielewski 4f6870bb4b vagrant: 1.8.5 -> 1.8.6 2016-10-07 11:15:11 +02:00
Aneesh Agrawal b1c83e8928 vagrant: make patches a list (#18364)
This has more correct semantics, allows for multiple patches, and makes
using overrideDerivation to add/remove patches work as expected.
2016-09-06 16:52:01 +02:00
Peter Hoeg a359d330dc vagrant: 1.8.4 -> 1.8.5 (#18283)
Includes https://github.com/mitchellh/vagrant/pull/7611 to fix issue with permissions on ~/.ssh/authorized_keys.
2016-09-05 14:44:34 +02:00
Kamil Chmielewski 532b222296 vagrant: cleanup FIX plugin install from #17614 (#17663) 2016-08-12 09:33:37 +00:00