bareos: 14.2.4 -> 15.2.1

This commit is contained in:
William A. Kennington III 2015-09-18 14:52:43 -07:00
parent 26c3d3f060
commit bbfd7f2d48

View File

@ -1,7 +1,7 @@
{ stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, libtool, flex { stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, libtool, flex
, readline ? null, openssl ? null, python ? null, ncurses ? null , readline ? null, openssl ? null, python ? null, ncurses ? null
, sqlite ? null, postgresql ? null, libmysql ? null, zlib ? null, lzo ? 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; assert sqlite != null || postgresql != null || libmysql != null;
@ -12,19 +12,20 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "bareos-${version}"; name = "bareos-${version}";
version = "14.2.4"; version = "15.2.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bareos"; owner = "bareos";
repo = "bareos"; repo = "bareos";
rev = "Release/${version}"; rev = "Release/${version}";
name = "${name}-src"; name = "${name}-src";
sha256 = "0shb91pawdgrn6rb4np3zyyxv36899nvwf8jaihkg0wvb01viqzr"; sha256 = "01vnqahzjj598jjk4y7qzfnq415jh227v40sgkrdl4qcpn76spxi";
}; };
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ buildInputs = [
pkgconfig nettools gettext readline openssl python flex nettools gettext readline openssl python flex ncurses sqlite postgresql
ncurses sqlite postgresql libmysql zlib lzo acl glusterfs libceph libcap libmysql zlib lzo jansson acl glusterfs libceph libcap
]; ];
postPatch = '' postPatch = ''
@ -57,12 +58,15 @@ stdenv.mkDerivation rec {
++ optional (libmysql != null) "--with-mysql=${libmysql}" ++ optional (libmysql != null) "--with-mysql=${libmysql}"
++ optional (zlib != null) "--with-zlib=${zlib}" ++ optional (zlib != null) "--with-zlib=${zlib}"
++ optional (lzo != null) "--with-lzo=${lzo}" ++ optional (lzo != null) "--with-lzo=${lzo}"
++ optional (jansson != null) "--with-jansson=${jansson}"
++ optional (acl != null) "--enable-acl" ++ optional (acl != null) "--enable-acl"
++ optional (glusterfs != null) "--with-glusterfs=${glusterfs}" ++ optional (glusterfs != null) "--with-glusterfs=${glusterfs}"
++ optional (libceph != null) "--with-cephfs=${libceph}"; ++ optional (libceph != null) "--with-cephfs=${libceph}";
installFlags = [ installFlags = [
"sysconfdir=\${out}/etc" "sysconfdir=\${out}/etc"
"confdir=\${out}/etc/bareos"
"scriptdir=\${out}/etc/bareos"
"working_dir=\${TMPDIR}" "working_dir=\${TMPDIR}"
"log_dir=\${TMPDIR}" "log_dir=\${TMPDIR}"
"sbindir=\${out}/bin" "sbindir=\${out}/bin"