diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-28 07:43:04 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-28 07:43:04 +0200 |
| commit | fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00 (patch) | |
| tree | dba7ec5e6a0757a413e8cb9dfb01bb14abc469f4 /pkgs/tools/backup | |
| parent | 15f9bdb6489e7e55a861958a9388bf5ad3b2d2cd (diff) | |
| parent | 217cf982c754f1e8506e180551c73f57c04aed7f (diff) | |
| download | nixpkgs-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar nixpkgs-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.gz nixpkgs-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.bz2 nixpkgs-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.lz nixpkgs-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.xz nixpkgs-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.tar.zst nixpkgs-fda4a08d4a1dd1509bb4c3ab110fb8665f47cc00.zip | |
Merge branch 'staging-next'
There are several security fixes - again, as it consists mainly of the previously reverted staging-next merge.
Diffstat (limited to 'pkgs/tools/backup')
| -rw-r--r-- | pkgs/tools/backup/bareos/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/tools/backup/mydumper/default.nix | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 79ae1e50ca2..949e45de5e1 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, flex , readline ? null, openssl ? null, python2 ? null, ncurses ? null, rocksdb -, sqlite ? null, postgresql ? null, mysql ? null, zlib ? null, lzo ? null +, sqlite ? null, postgresql ? null, libmysqlclient ? null, zlib ? null, lzo ? null , jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null }: -assert sqlite != null || postgresql != null || mysql != null; +assert sqlite != null || postgresql != null || libmysqlclient != null; with stdenv.lib; let @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ nettools gettext readline openssl python2 flex ncurses sqlite postgresql - mysql.connector-c zlib lzo jansson acl glusterfs libceph libcap rocksdb + libmysqlclient zlib lzo jansson acl glusterfs libceph libcap rocksdb ]; postPatch = '' @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { ++ optional (openssl != null) "--with-openssl=${openssl.dev}" ++ optional (sqlite != null) "--with-sqlite3=${sqlite.dev}" ++ optional (postgresql != null) "--with-postgresql=${postgresql}" - ++ optional (mysql != null) "--with-mysql=${mysql.connector-c}" + ++ optional (libmysqlclient != null) "--with-mysql=${libmysqlclient}" ++ optional (zlib != null) "--with-zlib=${zlib.dev}" ++ optional (lzo != null) "--with-lzo=${lzo}" ++ optional (jansson != null) "--with-jansson=${jansson}" diff --git a/pkgs/tools/backup/mydumper/default.nix b/pkgs/tools/backup/mydumper/default.nix index 5538b45c5f1..7160e7f1950 100644 --- a/pkgs/tools/backup/mydumper/default.nix +++ b/pkgs/tools/backup/mydumper/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig -, glib, zlib, pcre, mysql, libressl }: +, glib, zlib, pcre, libmysqlclient, libressl }: stdenv.mkDerivation rec { version = "0.9.5"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ glib zlib pcre mysql.connector-c libressl ]; + buildInputs = [ glib zlib pcre libmysqlclient libressl ]; meta = with stdenv.lib; { description = ''High-perfomance MySQL backup tool''; |