public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Merge branch 'staging-next'"

Browse Source 
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
This commit is contained in:
Vladimír Čunát
2019-09-21 20:05:09 +02:00
parent 6be720b3a7
commit f8a8fc6c7c
90 changed files with 367 additions and 428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/backup/bareos/default.nix
View File

@@ -1,10 +1,10 @@
{ stdenv, fetchFromGitHub, pkgconfig, nettools, gettext, flex
, readline ? null, openssl ? null, python2 ? null, ncurses ? null, rocksdb
, sqlite ? null, postgresql ? null, libmysqlclient ? null, zlib ? null, lzo ? null
, sqlite ? null, postgresql ? null, mysql ? null, zlib ? null, lzo ? null
, jansson ? null, acl ? null, glusterfs ? null, libceph ? null, libcap ? null
}:
assert sqlite != null || postgresql != null || libmysqlclient != null;
assert sqlite != null || postgresql != null || mysql != null;
with stdenv.lib;
let
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig ];
buildInputs = [
nettools gettext readline openssl python2 flex ncurses sqlite postgresql
libmysqlclient zlib lzo jansson acl glusterfs libceph libcap rocksdb
mysql.connector-c 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 (libmysqlclient != null) "--with-mysql=${libmysqlclient}"
++ optional (mysql != null) "--with-mysql=${mysql.connector-c}"
++ optional (zlib != null) "--with-zlib=${zlib.dev}"
++ optional (lzo != null) "--with-lzo=${lzo}"
++ optional (jansson != null) "--with-jansson=${jansson}"

4
pkgs/tools/backup/mydumper/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchFromGitHub, cmake, pkgconfig
, glib, zlib, pcre, libmysqlclient, libressl }:
, glib, zlib, pcre, mysql, libressl }:
stdenv.mkDerivation rec {
version = "0.9.5";
@@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake pkgconfig ];
buildInputs = [ glib zlib pcre libmysqlclient libressl ];
buildInputs = [ glib zlib pcre mysql.connector-c libressl ];
meta = with stdenv.lib; {
description = ''High-perfomance MySQL backup tool'';