diff options
author | Moritz Ulrich <moritz@tarn-vedra.de> | 2014-04-30 23:36:05 +0200 |
---|---|---|
committer | Moritz Ulrich <moritz@tarn-vedra.de> | 2014-04-30 23:52:55 +0200 |
commit | 397682be6b7ebc062645ad8682d99886da8b6172 (patch) | |
tree | 805b68d7b61e89eb9ce0e321e13f5709bfc7fd3c /pkgs/tools/security | |
parent | 81a6fcd84770cc638d6260dbd7647363c34f409c (diff) | |
download | nixlib-397682be6b7ebc062645ad8682d99886da8b6172.tar nixlib-397682be6b7ebc062645ad8682d99886da8b6172.tar.gz nixlib-397682be6b7ebc062645ad8682d99886da8b6172.tar.bz2 nixlib-397682be6b7ebc062645ad8682d99886da8b6172.tar.lz nixlib-397682be6b7ebc062645ad8682d99886da8b6172.tar.xz nixlib-397682be6b7ebc062645ad8682d99886da8b6172.tar.zst nixlib-397682be6b7ebc062645ad8682d99886da8b6172.zip |
Bump pass(word-store) to 1.6.1.
...and also simplify the expression massively.
Diffstat (limited to 'pkgs/tools/security')
-rw-r--r-- | pkgs/tools/security/pass/default.nix | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index e78002837c72..eac9de2a306b 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -3,12 +3,12 @@ , makeWrapper }: stdenv.mkDerivation rec { - version = "1.4.2"; + version = "1.6.1"; name = "password-store-${version}"; src = fetchurl { url = "http://git.zx2c4.com/password-store/snapshot/${name}.tar.xz"; - sha256 = "00m3q6dihrhw8cxsrham3bdqg5841an8ch4s3a4k5fynlcb802m1"; + sha256 = "108856223w225xnqmcps6r5dn7sgqc4c3kfa1hd6piskdials59w"; }; buildInputs = [ makeWrapper ]; @@ -30,21 +30,16 @@ stdenv.mkDerivation rec { }; installPhase = '' - # link zsh and fish completions - sed -ie '22s/^#//' Makefile - sed -ie '25s/^#//' Makefile - sed -i 's/find /find -L /' contrib/pass.zsh-completion mkdir -p "$out/share/zsh/site-functions" mkdir -p "$out/share/fish/completions" - # use gnused - sed -i 's/sed -i ""/sed -i /' Makefile + # Install Emacs Mode. NOTE: We can't install the necessary + # dependencies (s.el and f.el) here. The user has to do this + # himself. + mkdir -p "$out/share/emacs/site-lisp" + cp "contrib/emacs/password-store.el" "$out/share/emacs/site-lisp/" - SYSCONFDIR="$out/etc" PREFIX="$out" make install - '' + stdenv.lib.optionalString stdenv.isDarwin '' - # use nix-supplied getopt - sed -ie '34c GETOPT="${getopt}/bin/getopt"' \ - "$out/lib/password-store.platform.sh" + PREFIX="$out" make install ''; postFixup = '' |