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

Merge pull request #21173 from kamilchm/vagrant

Browse Source 
vagrant: 1.8.7 -> 1.9.1
This commit is contained in:
Graham Christensen 2016-12-17 15:41:40 -05:00 committed by GitHub
commit 4c3e8dff8d
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/tools/vagrant/default.nix
View File

@ -2,7 +2,7 @@
, libxml2, libxslt, makeWrapper, p7zip, xar, gzip, cpio }: , libxml2, libxslt, makeWrapper, p7zip, xar, gzip, cpio }:
let let
version = "1.8.7"; version = "1.9.1";
rake = buildRubyGem { rake = buildRubyGem {
inherit ruby; inherit ruby;
gemName = "rake"; gemName = "rake";
@ -17,9 +17,9 @@ let
else "system ${stdenv.system} not supported"; else "system ${stdenv.system} not supported";
sha256 = { sha256 = {
"x86_64-linux" = "10c77b643b73dd3ad7a45a89d8ab95b58b79dc10e0cf6e760fe24abc436b2fdb"; "x86_64-linux" = "0l1if9c4s4wkbi8k00pl7x00lil21izrd8wb9nv2b5q4gqidc1nh";
"i686-linux" = "9d2a70f34ab65d8d2cb013917f221835432aa63cd4ef781c9fd1404cfcfe7898"; "i686-linux" = "1789wjwcpgw3mljl49c8v5kycisay684gyalkkvd06928423y9zb";
"x86_64-darwin" = "14d68f599a620cf421838ed037f0a1c4467e1b67475deeff62330a21fda4937b"; "x86_64-darwin" = "1xrfq1a0xyifkhhjnpm6wsnms9w8c9q5rd2qqn4sm5npl7viy68p";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); }."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
arch = builtins.replaceStrings ["-linux"] [""] stdenv.system; arch = builtins.replaceStrings ["-linux"] [""] stdenv.system;
@ -122,12 +122,10 @@ in stdenv.mkDerivation rec {
preFixup = '' preFixup = ''
# 'hide' the template file from shebang-patching # 'hide' the template file from shebang-patching
chmod -x "$out/opt/vagrant/embedded/gems/gems/bundler-1.12.5/lib/bundler/templates/Executable"
chmod -x "$out/opt/vagrant/embedded/gems/gems/vagrant-$version/plugins/provisioners/salt/bootstrap-salt.sh" chmod -x "$out/opt/vagrant/embedded/gems/gems/vagrant-$version/plugins/provisioners/salt/bootstrap-salt.sh"
''; '';
postFixup = '' postFixup = ''
chmod +x "$out/opt/vagrant/embedded/gems/gems/bundler-1.12.5/lib/bundler/templates/Executable"
chmod +x "$out/opt/vagrant/embedded/gems/gems/vagrant-$version/plugins/provisioners/salt/bootstrap-salt.sh" chmod +x "$out/opt/vagrant/embedded/gems/gems/vagrant-$version/plugins/provisioners/salt/bootstrap-salt.sh"
'' + '' +
(stdenv.lib.optionalString stdenv.isDarwin '' (stdenv.lib.optionalString stdenv.isDarwin ''