3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

11 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
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
angristan 5521aae4b9 vagrant: 2.2.3 -> 2.2.5 2019-07-31 15:51:32 +02:00
Florian Klink 659ebb6869 vagrant: 2.2.0 -> 2.2.3 2019-02-12 00:23:46 +01:00
Christian Albrecht 9335613995 vagrant: 2.1.2 -> 2.2.0 2018-11-07 17:46:57 +01: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
Aneesh Agrawal cde4ea79f8 vagrant: 2.0.2 -> 2.1.1 2018-05-23 00:22:39 -07: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
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