JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nixpkgs: tarsnap 1.0.35 -> 1.0.36.1

Browse Source 
This also fixes the same build failure present in `scrypt-1.2.0`,
which is quite trivial.

(partially cherry picked from commit 54c7053b)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2015-08-31 08:01:35 -05:00
parent 8a74451273
commit 03bc71f174
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/tools/backup/tarsnap/default.nix
View File

@ -1,11 +1,6 @@
{ stdenv, fetchurl, openssl, zlib, e2fsprogs }: { stdenv, fetchurl, openssl, zlib, e2fsprogs }:
let let
bashCompletion = fetchurl {
url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.bash";
sha256 = "1cj7m0n3sw9vlaz2dfvf0bgaxkv1pcc0l31zb4h5rmm8z6d33405";
};
zshCompletion = fetchurl { zshCompletion = fetchurl {
url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.zsh"; url = "https://gist.githubusercontent.com/thoughtpolice/daa9431044883d3896f6/raw/282360677007db9739e5bf229873d3b231eb303a/tarsnap.zsh";
sha256 = "0pawqwichzpz29rva7mh8lpx4zznnrh2rqyzzj6h7z98l0dxpair"; sha256 = "0pawqwichzpz29rva7mh8lpx4zznnrh2rqyzzj6h7z98l0dxpair";
@ -13,18 +8,25 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tarsnap-${version}"; name = "tarsnap-${version}";
version = "1.0.35"; version = "1.0.36.1";
src = fetchurl { src = fetchurl {
url = "https://www.tarsnap.com/download/tarsnap-autoconf-1.0.35.tgz"; url = "https://www.tarsnap.com/download/tarsnap-autoconf-${version}.tgz";
sha256 = "16lc14rwrq84fz95j1g10vv0qki0qw73lzighidj5g23pib6g7vc"; sha256 = "1446l8g39bi5xxk4x1ijc1qjrj824729887gcffig0zrw80rx452";
}; };
preConfigure = ''
configureFlags="--with-bash-completion-dir=$out/etc/bash_completion.d"
'';
patchPhase = ''
substituteInPlace Makefile.in \
--replace "command -p mv" "mv"
'';
postInstall = '' postInstall = ''
# Install some handy-dandy shell completions # Install some handy-dandy shell completions
mkdir -p $out/etc/bash_completion.d $out/share/zsh/site-functions install -m 444 -D ${zshCompletion} $out/share/zsh/site-functions/_tarsnap
cp ${bashCompletion} $out/etc/bash_completion.d/tarsnap.bash
cp ${zshCompletion} $out/share/zsh/site-functions/_tarsnap
''; '';
buildInputs = [ openssl zlib e2fsprogs ]; buildInputs = [ openssl zlib e2fsprogs ];