diff options
| author | Graham Christensen <graham@grahamc.com> | 2016-10-07 06:50:57 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-07 06:50:57 -0400 |
| commit | 0f281dec9856a0862e2c45c5256b402875811bf8 (patch) | |
| tree | 7310a774ef5f7b2e58ea995caa64e78c80b1e49d /pkgs/development | |
| parent | 7425ce511d51d6107500e7a5f56fb3df5c1c57c3 (diff) | |
| parent | 4f6870bb4b2e95f1f9488ce0f0a2a3e959bd4c99 (diff) | |
| download | nixlib-0f281dec9856a0862e2c45c5256b402875811bf8.tar nixlib-0f281dec9856a0862e2c45c5256b402875811bf8.tar.gz nixlib-0f281dec9856a0862e2c45c5256b402875811bf8.tar.bz2 nixlib-0f281dec9856a0862e2c45c5256b402875811bf8.tar.lz nixlib-0f281dec9856a0862e2c45c5256b402875811bf8.tar.xz nixlib-0f281dec9856a0862e2c45c5256b402875811bf8.tar.zst nixlib-0f281dec9856a0862e2c45c5256b402875811bf8.zip | |
Merge pull request #19320 from kamilchm/vagrant
vagrant: 1.8.5 -> 1.8.6
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/tools/vagrant/default.nix | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index c9987aea8325..cf4f34cbdfee 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -4,7 +4,7 @@ assert stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"; let - version = "1.8.5"; + version = "1.8.6"; rake = buildRubyGem { inherit ruby; gemName = "rake"; @@ -13,8 +13,8 @@ let }; sha256 = { - "x86_64-linux" = "1na5hxm3ilx268hk68dpgkks1jjh9q7p3ksjx8ssiijq6df47vih"; - "i686-linux" = "16psr5s0azpzavizh74085z7wygkfs4ribsfalvbd96phkrkp2wp"; + "x86_64-linux" = "1nkhf160hcl02yvafj6hq53j204qqxyvxjngnmf4f5md8dmkpn76"; + "i686-linux" = "0mr4pn7nggjdsqyxh1z2mflvvmpzhbxh5gax501d2hi8xr0y68df"; }."${stdenv.system}" or (throw "system ${stdenv.system} not supported"); arch = builtins.replaceStrings ["-linux"] [""] stdenv.system; @@ -28,24 +28,11 @@ in stdenv.mkDerivation rec { inherit sha256; }; - # 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; { description = "A tool for building complete development environments"; homepage = http://vagrantup.com; license = licenses.mit; - maintainers = with maintainers; [ lovek323 globin jgeerds ]; + maintainers = with maintainers; [ lovek323 globin jgeerds kamilchm ]; platforms = platforms.linux; }; |