From 3f4eb16799e54f32396af174bf29d728ea11cd37 Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 17 Nov 2017 11:35:57 +0100 Subject: [PATCH 1/2] vagrant: 2.0.0 -> 2.0.1 Due to the virtualbox bump to version 5.2 vagrant was no longer able to interface with virtualbox. Version 2.0.1 supports virtualbox 5.2. --- pkgs/development/tools/vagrant/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index d37873aaaf3..ba84a0da1fb 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -2,7 +2,7 @@ , libxml2, libxslt, libffi, makeWrapper, p7zip, xar, gzip, cpio }: let - version = "2.0.0"; + version = "2.0.1"; rake = buildRubyGem { inherit ruby; gemName = "rake"; @@ -17,9 +17,9 @@ let else "system ${stdenv.system} not supported"; sha256 = { - "x86_64-linux" = "184amybyxqlxqr8fk6lyx2znmci1fazsiby90q7d1xx2ihz3hm5x"; - "i686-linux" = "19r1m5jila40x69m1qz2hslz7v1hdg8wwdhcq8d5qjnzwfmlw2qz"; - "x86_64-darwin" = "154400iqs01235bclr8ic7g9jv01lfs766bmv7p8784r3xsblvsr"; + "x86_64-linux" = "0kyqchjsy747vbvhqiynz81kik8g0xqpkv70rz7hyr9x7fl9i51g"; + "i686-linux" = "0p3xhxy6shkd0393wjyj8qycdn3zqv60vnyz1b6zclz0kfah07zs"; + "x86_64-darwin" = "01hr5j9k31hsdlcwv3srzk0lphd8w0n9z95jvfkschdyjm9clpwm"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = builtins.replaceStrings ["-linux" "-darwin"] ["" ""] stdenv.system; From e427e8415cdbc39f4c8608168e564902a4e81a6a Mon Sep 17 00:00:00 2001 From: Andreas Rammhold Date: Fri, 17 Nov 2017 11:37:43 +0100 Subject: [PATCH 2/2] vagrant: removed custom rake gem --- pkgs/development/tools/vagrant/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index ba84a0da1fb..e72520d61b3 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -1,14 +1,8 @@ -{ stdenv, fetchurl, fetchpatch, dpkg, curl, libarchive, openssl, ruby, buildRubyGem, libiconv +{ stdenv, fetchurl, fetchpatch, dpkg, curl, libarchive, openssl, rake, ruby, buildRubyGem, libiconv , libxml2, libxslt, libffi, makeWrapper, p7zip, xar, gzip, cpio }: let version = "2.0.1"; - rake = buildRubyGem { - inherit ruby; - gemName = "rake"; - version = "10.4.2"; - sha256 = "1rn03rqlf1iv6n87a78hkda2yqparhhaivfjpizblmxvlw2hk5r8"; - }; url = if stdenv.isLinux then "https://releases.hashicorp.com/vagrant/${version}/vagrant_${version}_${arch}.deb"