diff options
| author | Moritz Ulrich <moritz@tarn-vedra.de> | 2015-02-07 18:45:56 +0100 |
|---|---|---|
| committer | Moritz Ulrich <moritz@tarn-vedra.de> | 2015-02-07 18:49:49 +0100 |
| commit | 6a24650cb5909ef9feae9306baf47fb0ba16e977 (patch) | |
| tree | b58fc176ae9b01ca05e860764404d54e51777a5e /pkgs/tools/security/pass | |
| parent | 1bbf15eca17d3ad1a0652a0cbd8b9f26179a86b2 (diff) | |
| download | nixpkgs-6a24650cb5909ef9feae9306baf47fb0ba16e977.tar nixpkgs-6a24650cb5909ef9feae9306baf47fb0ba16e977.tar.gz nixpkgs-6a24650cb5909ef9feae9306baf47fb0ba16e977.tar.bz2 nixpkgs-6a24650cb5909ef9feae9306baf47fb0ba16e977.tar.lz nixpkgs-6a24650cb5909ef9feae9306baf47fb0ba16e977.tar.xz nixpkgs-6a24650cb5909ef9feae9306baf47fb0ba16e977.tar.zst nixpkgs-6a24650cb5909ef9feae9306baf47fb0ba16e977.zip | |
pass: update from 1.6.3 to 1.6.5
Diffstat (limited to 'pkgs/tools/security/pass')
| -rw-r--r-- | pkgs/tools/security/pass/darwin-getopt.patch | 11 | ||||
| -rw-r--r-- | pkgs/tools/security/pass/default.nix | 11 |
2 files changed, 5 insertions, 17 deletions
diff --git a/pkgs/tools/security/pass/darwin-getopt.patch b/pkgs/tools/security/pass/darwin-getopt.patch deleted file mode 100644 index 8cdcd67bc65..00000000000 --- 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 d635d692582..74889a05bee 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 ""} ''; } |