From 6a24650cb5909ef9feae9306baf47fb0ba16e977 Mon Sep 17 00:00:00 2001
From: Moritz Ulrich <moritz@tarn-vedra.de>
Date: Sat, 7 Feb 2015 18:45:56 +0100
Subject: pass: update from 1.6.3 to 1.6.5

---
 pkgs/tools/security/pass/darwin-getopt.patch | 11 -----------
 pkgs/tools/security/pass/default.nix         | 11 +++++------
 2 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/tools/security/pass/darwin-getopt.patch

(limited to 'pkgs/tools/security/pass')

diff --git a/pkgs/tools/security/pass/darwin-getopt.patch b/pkgs/tools/security/pass/darwin-getopt.patch
deleted file mode 100644
index 8cdcd67bc658..000000000000
--- a/pkgs/tools/security/pass/darwin-getopt.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/src/platform/darwin.sh b/src/platform/darwin.sh
-index 1b76c33..fa40104 100644
---- a/src/platform/darwin.sh
-+++ b/src/platform/darwin.sh
-@@ -31,5 +31,5 @@ tmpdir() {
- 	mount -t hfs -o noatime -o nobrowse "$ramdisk_dev" "$SECURE_TMPDIR" || exit 1
- }
- 
--GETOPT="$(brew --prefix gnu-getopt 2>/dev/null || echo /usr/local)/bin/getopt"
-+GETOPT="getopt"
- SHRED="srm -f -z"
diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix
index d635d692582f..74889a05bee4 100644
--- a/pkgs/tools/security/pass/default.nix
+++ b/pkgs/tools/security/pass/default.nix
@@ -1,23 +1,22 @@
 { stdenv, fetchurl
 , coreutils, gnused, getopt, pwgen, git, tree, gnupg
 , makeWrapper
-, withX ? true, xclip ? null, xdotool ? null
+, withX ? true, xclip, xdotool, dmenu
 }:
 
 assert withX -> xclip != null;
 assert withX -> xdotool != null;
+assert withX -> dmenu != null;
 
 stdenv.mkDerivation rec {
-  version = "1.6.3";
+  version = "1.6.5";
   name    = "password-store-${version}";
 
   src = fetchurl {
     url    = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz";
-    sha256 = "1xs00c7ffqd0093i452kryw9sjip6dkp1pclx69zihb5l45d86fl";
+    sha256 = "05bk3lrp5jwg0v338lvylp7glpliydzz4jf5pjr6k3kagrv3jyik";
   };
 
-  patches = [ ./darwin-getopt.patch ];
-
   buildInputs = [ makeWrapper ];
 
   meta = with stdenv.lib; {
@@ -65,7 +64,7 @@ stdenv.mkDerivation rec {
 
     ${if withX then ''
       wrapProgram $out/bin/passmenu \
-        --prefix PATH : "$out/bin:${xdotool}/bin"
+        --prefix PATH : "$out/bin:${xdotool}/bin:${dmenu}/bin"
     '' else ""}
   '';
 }
-- 
cgit 1.4.1