ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 22:03:54 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11879 from aneeshusa/update-vagrant-to-1.8.0

Browse Source 
vagrant: 1.7.4 -> 1.8.0
This commit is contained in:
Arseniy Seroka 2015-12-22 17:51:35 +03:00
commit 87d2532f82
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,11 +4,11 @@
assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
let let
version = "1.7.4"; version = "1.8.0";
rake = buildRubyGem { rake = buildRubyGem {
inherit ruby; inherit ruby;
name = "rake-10.3.2"; name = "rake-10.4.2";
sha256 = "0nvpkjrpsk8xxnij2wd1cdn6arja9q11sxx4aq4fz18bc6fss15m"; sha256 = "1rn03rqlf1iv6n87a78hkda2yqparhhaivfjpizblmxvlw2hk5r8";
}; };
in in
@ -18,13 +18,13 @@ stdenv.mkDerivation rec {
src = src =
if stdenv.system == "x86_64-linux" then if stdenv.system == "x86_64-linux" then
fetchurl { fetchurl {
url = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_x86_64.deb"; url = "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_x86_64.deb";
sha256 = "0dl3cskpz7d8mmv0ah86426vlx0lj1wkjdlb5gc868dfsysw5lnw"; sha256 = "0hvi6db5lphgzsykm1wn76jj4wwmm6lshvvd0qz7ipyyyhnd7sjp";
} }
else else
fetchurl { fetchurl {
url = "https://dl.bintray.com/mitchellh/vagrant/vagrant_${version}_i686.deb"; url = "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_i686.deb";
sha256 = "0sns9q48c6b2sabp6bwkppx8ffp774jhv69jrv225qrnifx12105"; sha256 = "1jvscbxqbhavw4q81y5718qbyj74b9lwfw3gb4c1f4jmgm08wxxk";
}; };
meta = with stdenv.lib; { meta = with stdenv.lib; {
@ -48,9 +48,10 @@ stdenv.mkDerivation rec {
# overwrite embedded binaries # overwrite embedded binaries
# curl: curl # curl: curl, curl-config
rm opt/vagrant/embedded/bin/curl rm opt/vagrant/embedded/bin/{curl,curl-config}
ln -s ${curl}/bin/curl opt/vagrant/embedded/bin ln -s ${curl}/bin/curl opt/vagrant/embedded/bin
ln -s ${curl}/bin/curl-config opt/vagrant/embedded/bin
# libarchive: bsdtar, bsdcpio # libarchive: bsdtar, bsdcpio
rm opt/vagrant/embedded/bin/{bsdtar,bsdcpio} rm opt/vagrant/embedded/bin/{bsdtar,bsdcpio}
@ -62,8 +63,8 @@ stdenv.mkDerivation rec {
ln -s ${openssl}/bin/c_rehash opt/vagrant/embedded/bin ln -s ${openssl}/bin/c_rehash opt/vagrant/embedded/bin
ln -s ${openssl}/bin/openssl opt/vagrant/embedded/bin ln -s ${openssl}/bin/openssl opt/vagrant/embedded/bin
# ruby: erb, gem, irb, rake, rdoc, ri, ruby, testrb # ruby: erb, gem, irb, rake, rdoc, ri, ruby
rm opt/vagrant/embedded/bin/{erb,gem,irb,rake,rdoc,ri,ruby,testrb} rm opt/vagrant/embedded/bin/{erb,gem,irb,rake,rdoc,ri,ruby}
ln -s ${ruby}/bin/erb opt/vagrant/embedded/bin ln -s ${ruby}/bin/erb opt/vagrant/embedded/bin
ln -s ${ruby}/bin/gem opt/vagrant/embedded/bin ln -s ${ruby}/bin/gem opt/vagrant/embedded/bin
ln -s ${ruby}/bin/irb opt/vagrant/embedded/bin ln -s ${ruby}/bin/irb opt/vagrant/embedded/bin
@ -71,7 +72,6 @@ stdenv.mkDerivation rec {
ln -s ${ruby}/bin/rdoc opt/vagrant/embedded/bin ln -s ${ruby}/bin/rdoc opt/vagrant/embedded/bin
ln -s ${ruby}/bin/ri opt/vagrant/embedded/bin ln -s ${ruby}/bin/ri opt/vagrant/embedded/bin
ln -s ${ruby}/bin/ruby opt/vagrant/embedded/bin ln -s ${ruby}/bin/ruby opt/vagrant/embedded/bin
ln -s ${ruby}/bin/testrb opt/vagrant/embedded/bin
# libiconv: iconv # libiconv: iconv
rm opt/vagrant/embedded/bin/iconv rm opt/vagrant/embedded/bin/iconv
@ -96,12 +96,12 @@ 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.10.5/lib/bundler/templates/Executable chmod -x $out/opt/vagrant/embedded/gems/gems/bundler-1.10.6/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.10.5/lib/bundler/templates/Executable chmod +x $out/opt/vagrant/embedded/gems/gems/bundler-1.10.6/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
''; '';
} }

2
pkgs/top-level/all-packages.nix
View File

@ -6005,7 +6005,7 @@ let
uncrustify = callPackage ../development/tools/misc/uncrustify { }; uncrustify = callPackage ../development/tools/misc/uncrustify { };
vagrant = callPackage ../development/tools/vagrant { vagrant = callPackage ../development/tools/vagrant {
ruby = ruby_2_0_0; ruby = ruby_2_2_2;
}; };
gdb = callPackage ../development/tools/misc/gdb { gdb = callPackage ../development/tools/misc/gdb {