pass: update from 1.6.3 to 1.6.5
This commit is contained in:
parent
1bbf15eca1
commit
6a24650cb5
@ -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"
|
|
@ -1,23 +1,22 @@
|
|||||||
{ stdenv, fetchurl
|
{ stdenv, fetchurl
|
||||||
, coreutils, gnused, getopt, pwgen, git, tree, gnupg
|
, coreutils, gnused, getopt, pwgen, git, tree, gnupg
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, withX ? true, xclip ? null, xdotool ? null
|
, withX ? true, xclip, xdotool, dmenu
|
||||||
}:
|
}:
|
||||||
|
|
||||||
assert withX -> xclip != null;
|
assert withX -> xclip != null;
|
||||||
assert withX -> xdotool != null;
|
assert withX -> xdotool != null;
|
||||||
|
assert withX -> dmenu != null;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "1.6.3";
|
version = "1.6.5";
|
||||||
name = "password-store-${version}";
|
name = "password-store-${version}";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz";
|
url = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz";
|
||||||
sha256 = "1xs00c7ffqd0093i452kryw9sjip6dkp1pclx69zihb5l45d86fl";
|
sha256 = "05bk3lrp5jwg0v338lvylp7glpliydzz4jf5pjr6k3kagrv3jyik";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [ ./darwin-getopt.patch ];
|
|
||||||
|
|
||||||
buildInputs = [ makeWrapper ];
|
buildInputs = [ makeWrapper ];
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
@ -65,7 +64,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
${if withX then ''
|
${if withX then ''
|
||||||
wrapProgram $out/bin/passmenu \
|
wrapProgram $out/bin/passmenu \
|
||||||
--prefix PATH : "$out/bin:${xdotool}/bin"
|
--prefix PATH : "$out/bin:${xdotool}/bin:${dmenu}/bin"
|
||||||
'' else ""}
|
'' else ""}
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user