burp: 1.4.40 -> 2.0.54

+14 -26
-12
pkgs/tools/backup/burp/burp_1.4.40.patch
··· 1 - diff -Naur burp~/Makefile.in burp/Makefile.in 2 - --- burp~/Makefile.in 2015-11-01 21:14:52.621376413 +0000 3 - +++ burp/Makefile.in 2015-11-01 22:09:25.098997115 +0000 4 - @@ -90,8 +90,6 @@ 5 - $(MKDIR) $(DESTDIR)$(sbindir) 6 - $(MKDIR) $(DESTDIR)$(sysconfdir) 7 - $(MKDIR) $(DESTDIR)$(sysconfdir)/CA-client 8 - - $(MKDIR) $(DESTDIR)/var/run 9 - - $(MKDIR) $(DESTDIR)/var/spool/burp 10 - @if [ ! -d $(DESTDIR)$(sysconfdir)/clientconfdir ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/clientconfdir ; cp configs/server/clientconfdir/testclient $(DESTDIR)$(sysconfdir)/clientconfdir/testclient ; fi 11 - @if [ ! -d $(DESTDIR)$(sysconfdir)/clientconfdir/incexc ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/clientconfdir/incexc ; cp configs/server/clientconfdir/incexc $(DESTDIR)$(sysconfdir)/clientconfdir/incexc/example ; fi 12 - @if [ ! -d $(DESTDIR)$(sysconfdir)/autoupgrade/client ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/autoupgrade/client ; fi
+14 -14
pkgs/tools/backup/burp/default.nix
··· 1 - { stdenv, fetchgit, acl, librsync, ncurses, openssl, zlib }: 1 + { stdenv, fetchFromGitHub, autoreconfHook 2 + , acl, librsync, ncurses, openssl, zlib, uthash }: 2 3 3 4 stdenv.mkDerivation rec { 4 - name = "burp-1.4.40"; 5 + name = "burp-${version}"; 6 + version = "2.0.54"; 5 7 6 - src = fetchgit { 7 - url = "https://github.com/grke/burp.git"; 8 - rev = "1e8eebac420f2b0dc29102602b7e5e437d58d5b7"; 9 - sha256 = "02gpgcyg1x0bjk8349019zp3m002lmdhil6g6n8xv0kzz54v6gaw"; 8 + src = fetchFromGitHub { 9 + owner = "grke"; 10 + repo = "burp"; 11 + rev = version; 12 + sha256 = "1z1w013hqxbfjgri0fan2570qwhgwvm4k4ghajbzqg8kly4fgk5x"; 10 13 }; 11 14 12 - patches = [ ./burp_1.4.40.patch ]; 13 - 14 - buildInputs = [ librsync ncurses openssl zlib ] 15 - # next two lines copied from bacula, as burp needs acl as well 16 - # acl relies on attr, which I can't get to build on darwin 15 + nativeBuildInputs = [ autoreconfHook ]; 16 + buildInputs = [ librsync ncurses openssl zlib uthash ] 17 17 ++ stdenv.lib.optional (!stdenv.isDarwin) acl; 18 18 19 - configureFlags = [ 20 - "--sbindir=$out/bin" 21 - ]; 19 + configureFlags = [ "--localstatedir=/var" ]; 20 + 21 + installFlags = [ "localstatedir=/tmp" ]; 22 22 23 23 meta = with stdenv.lib; { 24 24 description = "BURP - BackUp and Restore Program";