diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-09-18 14:52:43 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-09-18 14:52:52 -0700 |
| commit | bbfd7f2d48141122d04173b3d4d827ead169379c (patch) | |
| tree | 351afce0a73c9e064cfbed0b1cc9fc7a2b75f244 /pkgs/tools/backup/bareos | |
| parent | 26c3d3f06062259bc8ce39f7b022cc8a254d56ff (diff) | |
| download | nixpkgs-bbfd7f2d48141122d04173b3d4d827ead169379c.tar nixpkgs-bbfd7f2d48141122d04173b3d4d827ead169379c.tar.gz nixpkgs-bbfd7f2d48141122d04173b3d4d827ead169379c.tar.bz2 nixpkgs-bbfd7f2d48141122d04173b3d4d827ead169379c.tar.lz nixpkgs-bbfd7f2d48141122d04173b3d4d827ead169379c.tar.xz nixpkgs-bbfd7f2d48141122d04173b3d4d827ead169379c.tar.zst nixpkgs-bbfd7f2d48141122d04173b3d4d827ead169379c.zip | |
bareos: 14.2.4 -> 15.2.1
Diffstat (limited to 'pkgs/tools/backup/bareos')
| -rw-r--r-- | pkgs/tools/backup/bareos/default.nix | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 32702a4e16d..b34c6251405 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, libtool, flex , readline ? null, openssl ? null, python ? null, ncurses ? null , sqlite ? null, postgresql ? null, libmysql ? null, zlib ? null, lzo ? null -, acl ? null, glusterfs ? null, libceph ? null, libcap ? null +, jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null }: assert sqlite != null || postgresql != null || libmysql != null; @@ -12,19 +12,20 @@ let in stdenv.mkDerivation rec { name = "bareos-${version}"; - version = "14.2.4"; + version = "15.2.1"; src = fetchFromGitHub { owner = "bareos"; repo = "bareos"; rev = "Release/${version}"; name = "${name}-src"; - sha256 = "0shb91pawdgrn6rb4np3zyyxv36899nvwf8jaihkg0wvb01viqzr"; + sha256 = "01vnqahzjj598jjk4y7qzfnq415jh227v40sgkrdl4qcpn76spxi"; }; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - pkgconfig nettools gettext readline openssl python flex - ncurses sqlite postgresql libmysql zlib lzo acl glusterfs libceph libcap + nettools gettext readline openssl python flex ncurses sqlite postgresql + libmysql zlib lzo jansson acl glusterfs libceph libcap ]; postPatch = '' @@ -57,12 +58,15 @@ stdenv.mkDerivation rec { ++ optional (libmysql != null) "--with-mysql=${libmysql}" ++ optional (zlib != null) "--with-zlib=${zlib}" ++ optional (lzo != null) "--with-lzo=${lzo}" + ++ optional (jansson != null) "--with-jansson=${jansson}" ++ optional (acl != null) "--enable-acl" ++ optional (glusterfs != null) "--with-glusterfs=${glusterfs}" ++ optional (libceph != null) "--with-cephfs=${libceph}"; installFlags = [ "sysconfdir=\${out}/etc" + "confdir=\${out}/etc/bareos" + "scriptdir=\${out}/etc/bareos" "working_dir=\${TMPDIR}" "log_dir=\${TMPDIR}" "sbindir=\${out}/bin" |