diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2017-06-26 03:44:15 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2017-06-26 03:48:41 +0200 |
| commit | 356bac704a07f6b57bd94448e5396ebcf4189ca6 (patch) | |
| tree | 02614fd3c70bec6b381931bc28b0dec332e60a62 /pkgs/tools/backup/burp | |
| parent | 3156263876719c75ef5d98c36d701363eb4565ef (diff) | |
| download | nixpkgs-356bac704a07f6b57bd94448e5396ebcf4189ca6.tar nixpkgs-356bac704a07f6b57bd94448e5396ebcf4189ca6.tar.gz nixpkgs-356bac704a07f6b57bd94448e5396ebcf4189ca6.tar.bz2 nixpkgs-356bac704a07f6b57bd94448e5396ebcf4189ca6.tar.lz nixpkgs-356bac704a07f6b57bd94448e5396ebcf4189ca6.tar.xz nixpkgs-356bac704a07f6b57bd94448e5396ebcf4189ca6.tar.zst nixpkgs-356bac704a07f6b57bd94448e5396ebcf4189ca6.zip | |
burp: 1.4.40 -> 2.0.54
Diffstat (limited to 'pkgs/tools/backup/burp')
| -rw-r--r-- | pkgs/tools/backup/burp/burp_1.4.40.patch | 12 | ||||
| -rw-r--r-- | pkgs/tools/backup/burp/default.nix | 28 |
2 files changed, 14 insertions, 26 deletions
diff --git a/pkgs/tools/backup/burp/burp_1.4.40.patch b/pkgs/tools/backup/burp/burp_1.4.40.patch deleted file mode 100644 index fe57202bc34..00000000000 --- a/pkgs/tools/backup/burp/burp_1.4.40.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Naur burp~/Makefile.in burp/Makefile.in ---- burp~/Makefile.in 2015-11-01 21:14:52.621376413 +0000 -+++ burp/Makefile.in 2015-11-01 22:09:25.098997115 +0000 -@@ -90,8 +90,6 @@ - $(MKDIR) $(DESTDIR)$(sbindir) - $(MKDIR) $(DESTDIR)$(sysconfdir) - $(MKDIR) $(DESTDIR)$(sysconfdir)/CA-client -- $(MKDIR) $(DESTDIR)/var/run -- $(MKDIR) $(DESTDIR)/var/spool/burp - @if [ ! -d $(DESTDIR)$(sysconfdir)/clientconfdir ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/clientconfdir ; cp configs/server/clientconfdir/testclient $(DESTDIR)$(sysconfdir)/clientconfdir/testclient ; fi - @if [ ! -d $(DESTDIR)$(sysconfdir)/clientconfdir/incexc ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/clientconfdir/incexc ; cp configs/server/clientconfdir/incexc $(DESTDIR)$(sysconfdir)/clientconfdir/incexc/example ; fi - @if [ ! -d $(DESTDIR)$(sysconfdir)/autoupgrade/client ] ; then $(MKDIR) $(DESTDIR)$(sysconfdir)/autoupgrade/client ; fi diff --git a/pkgs/tools/backup/burp/default.nix b/pkgs/tools/backup/burp/default.nix index eb4240d33c6..783a0796e91 100644 --- a/pkgs/tools/backup/burp/default.nix +++ b/pkgs/tools/backup/burp/default.nix @@ -1,24 +1,24 @@ -{ stdenv, fetchgit, acl, librsync, ncurses, openssl, zlib }: +{ stdenv, fetchFromGitHub, autoreconfHook +, acl, librsync, ncurses, openssl, zlib, uthash }: stdenv.mkDerivation rec { - name = "burp-1.4.40"; + name = "burp-${version}"; + version = "2.0.54"; - src = fetchgit { - url = "https://github.com/grke/burp.git"; - rev = "1e8eebac420f2b0dc29102602b7e5e437d58d5b7"; - sha256 = "02gpgcyg1x0bjk8349019zp3m002lmdhil6g6n8xv0kzz54v6gaw"; + src = fetchFromGitHub { + owner = "grke"; + repo = "burp"; + rev = version; + sha256 = "1z1w013hqxbfjgri0fan2570qwhgwvm4k4ghajbzqg8kly4fgk5x"; }; - patches = [ ./burp_1.4.40.patch ]; - - buildInputs = [ librsync ncurses openssl zlib ] - # next two lines copied from bacula, as burp needs acl as well - # acl relies on attr, which I can't get to build on darwin + nativeBuildInputs = [ autoreconfHook ]; + buildInputs = [ librsync ncurses openssl zlib uthash ] ++ stdenv.lib.optional (!stdenv.isDarwin) acl; - configureFlags = [ - "--sbindir=$out/bin" - ]; + configureFlags = [ "--localstatedir=/var" ]; + + installFlags = [ "localstatedir=/tmp" ]; meta = with stdenv.lib; { description = "BURP - BackUp and Restore Program"; |