Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

vagrant: add vagrant-aws plugin #144799

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

vagrant: add vagrant-aws plugin #144799

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions pkgs/development/tools/vagrant/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
{ stdenv, lib, fetchurl, buildRubyGem, bundlerEnv, ruby, libarchive
, libguestfs, qemu, writeText, withLibvirt ? stdenv.isLinux
, libguestfs, qemu, writeText, withLibvirt ? stdenv.isLinux, withAws ? false
}:

# dependencies of these two plugins conflict
assert !(withLibvirt && withAws);
Comment on lines +5 to +6
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is still the case in 2024 and what command did you use to generate the gemset ? Also use throwIf instead of assert


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.
Expand All @@ -25,7 +28,8 @@ let
};
inherit version;
};
} // lib.optionalAttrs withLibvirt (import ./gemset_libvirt.nix));
} // (lib.optionalAttrs withLibvirt (import ./gemset_libvirt.nix))
// (lib.optionalAttrs withAws (import ./gemset_aws.nix)));

# This replaces the gem symlinks with directories, resolving this
# error when running vagrant (I have no idea why):
Expand Down Expand Up @@ -88,7 +92,14 @@ in buildRubyGem rec {
cp -av contrib/bash/completion.sh $out/share/bash-completion/completions/vagrant
'' +
lib.optionalString withLibvirt ''
substitute ${./vagrant-libvirt.json.in} $out/vagrant-plugins/plugins.d/vagrant-libvirt.json \
substitute ${./vagrant-plugin.json.in} $out/vagrant-plugins/plugins.d/vagrant-libvirt.json \
--subst-var-by pname libvirt \
--subst-var-by ruby_version ${ruby.version} \
--subst-var-by vagrant_version ${version}
'' +
Comment on lines -91 to +99
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you create a small helper. I consider adding vagrant-sshfs and reuse that code.

lib.optionalString withAws ''
substitute ${./vagrant-plugin.json.in} $out/vagrant-plugins/plugins.d/vagrant-aws.json \
--subst-var-by pname aws \
--subst-var-by ruby_version ${ruby.version} \
--subst-var-by vagrant_version ${version}
'';
Expand Down
Loading
Loading