From b1c83e8928288044d110528642d8af24389ac73b Mon Sep 17 00:00:00 2001 From: Aneesh Agrawal Date: Tue, 6 Sep 2016 10:52:01 -0400 Subject: [PATCH] vagrant: make patches a list (#18364) This has more correct semantics, allows for multiple patches, and makes using overrideDerivation to add/remove patches work as expected. --- pkgs/development/tools/vagrant/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/vagrant/default.nix b/pkgs/development/tools/vagrant/default.nix index 3f3fd88580f..c9987aea832 100644 --- a/pkgs/development/tools/vagrant/default.nix +++ b/pkgs/development/tools/vagrant/default.nix @@ -33,11 +33,13 @@ in stdenv.mkDerivation rec { "-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"; - }); + 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";