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

vagrant: 1.8.4 -> 1.8.5 (#18283)

Browse Source 
Includes https://github.com/mitchellh/vagrant/pull/7611 to fix issue with permissions on ~/.ssh/authorized_keys.
This commit is contained in:
Peter Hoeg 2016-09-05 20:44:34 +08:00 committed by Franz Pletz
parent 03e70ebcc6
commit a359d330dc
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,10 @@
{ stdenv, fetchurl, dpkg, curl, libarchive, openssl, ruby, buildRubyGem, libiconv { stdenv, fetchurl, fetchpatch, dpkg, curl, libarchive, openssl, ruby, buildRubyGem, libiconv
, libxml2, libxslt, makeWrapper }: , libxml2, libxslt, makeWrapper }:
assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux";
let let
version = "1.8.4"; version = "1.8.5";
rake = buildRubyGem { rake = buildRubyGem {
inherit ruby; inherit ruby;
gemName = "rake"; gemName = "rake";
@ -12,23 +12,33 @@ let
sha256 = "1rn03rqlf1iv6n87a78hkda2yqparhhaivfjpizblmxvlw2hk5r8"; sha256 = "1rn03rqlf1iv6n87a78hkda2yqparhhaivfjpizblmxvlw2hk5r8";
}; };
in sha256 = {
stdenv.mkDerivation rec { "x86_64-linux" = "1na5hxm3ilx268hk68dpgkks1jjh9q7p3ksjx8ssiijq6df47vih";
"i686-linux" = "16psr5s0azpzavizh74085z7wygkfs4ribsfalvbd96phkrkp2wp";
}."${stdenv.system}" or (throw "system ${stdenv.system} not supported");
arch = builtins.replaceStrings ["-linux"] [""] stdenv.system;
in stdenv.mkDerivation rec {
name = "vagrant-${version}"; name = "vagrant-${version}";
inherit version; inherit version;
src = src = fetchurl {
if stdenv.system == "x86_64-linux" then url = "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_${arch}.deb";
fetchurl { inherit sha256;
url = "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_x86_64.deb";
sha256 = "fd38d8e00e494a617201facb42fc2cac627e5021db15e91c2a041eac6a2d8208";
}
else
fetchurl {
url = "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_i686.deb";
sha256 = "555351717cacaa8660821df8988cc40a39923b06b698fca6bb90621008aab06f";
}; };
# Remove the patchFlags/patches when 1.8.6 is released
patchFlags = [
"-p1"
"-d ./opt/vagrant/embedded/gems/gems/vagrant-${version}"
];
patches = (fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/mitchellh/vagrant/pull/7611.diff";
name = "fix_incorrect_ssh_keys_permissions.patch";
sha256 = "0lqa9xpg79ggp9fc8gzb5lv675ydj2p8l55bx4hs1hf8zz2c1hjf";
});
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A tool for building complete development environments"; description = "A tool for building complete development environments";
homepage = http://vagrantup.com; homepage = http://vagrantup.com;