nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-18 03:34:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Bump pass(word-store) to 1.6.1.

Browse Source 
...and also simplify the expression massively.
This commit is contained in:
Moritz Ulrich 2014-04-30 23:36:05 +02:00
parent 81a6fcd847
commit 397682be6b
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/tools/security/pass/default.nix
View File

@ -3,12 +3,12 @@
, makeWrapper }: , makeWrapper }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.4.2"; version = "1.6.1";
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 = "00m3q6dihrhw8cxsrham3bdqg5841an8ch4s3a4k5fynlcb802m1"; sha256 = "108856223w225xnqmcps6r5dn7sgqc4c3kfa1hd6piskdials59w";
}; };
buildInputs = [ makeWrapper ]; buildInputs = [ makeWrapper ];
@ -30,21 +30,16 @@ stdenv.mkDerivation rec {
}; };
installPhase = '' 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/zsh/site-functions"
mkdir -p "$out/share/fish/completions" mkdir -p "$out/share/fish/completions"
# use gnused # Install Emacs Mode. NOTE: We can't install the necessary
sed -i 's/sed -i ""/sed -i /' Makefile # 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 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"
''; '';
postFixup = '' postFixup = ''

4
pkgs/top-level/all-packages.nix
View File

@ -489,7 +489,9 @@ let
otool = callPackage ../os-specific/darwin/otool { }; otool = callPackage ../os-specific/darwin/otool { };
pass = callPackage ../tools/security/pass { }; pass = callPackage ../tools/security/pass {
gnupg = gnupg1compat;
};
setfile = callPackage ../os-specific/darwin/setfile { }; setfile = callPackage ../os-specific/darwin/setfile { };