diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-16 11:45:07 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-16 11:45:07 +0100 |
commit | be7125dde7d3521725cf2e2ea70b3c309eebd0e4 (patch) | |
tree | df53225733ad8ae20afffa30f06bfb64d42cf2cd /pkgs/servers | |
parent | 27313767b8ed680d1dcfcfc0cb87c81562bba605 (diff) | |
parent | 1421eee65dddd47f34c68be6374e9646fe4cf175 (diff) | |
download | nixlib-be7125dde7d3521725cf2e2ea70b3c309eebd0e4.tar nixlib-be7125dde7d3521725cf2e2ea70b3c309eebd0e4.tar.gz nixlib-be7125dde7d3521725cf2e2ea70b3c309eebd0e4.tar.bz2 nixlib-be7125dde7d3521725cf2e2ea70b3c309eebd0e4.tar.lz nixlib-be7125dde7d3521725cf2e2ea70b3c309eebd0e4.tar.xz nixlib-be7125dde7d3521725cf2e2ea70b3c309eebd0e4.tar.zst nixlib-be7125dde7d3521725cf2e2ea70b3c309eebd0e4.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/irc/charybdis/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch | 2 | ||||
-rw-r--r-- | pkgs/servers/roundcube/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/sql/mariadb/cmake-libmariadb-includedir.patch | 21 | ||||
-rw-r--r-- | pkgs/servers/sql/mariadb/default.nix | 64 | ||||
-rw-r--r-- | pkgs/servers/sql/mariadb/galera/default.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/zoneminder/default.nix | 6 |
7 files changed, 35 insertions, 66 deletions
diff --git a/pkgs/servers/irc/charybdis/default.nix b/pkgs/servers/irc/charybdis/default.nix index c6b2af3d3876..ecbedcfbec8e 100644 --- a/pkgs/servers/irc/charybdis/default.nix +++ b/pkgs/servers/irc/charybdis/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "IRCv3 server designed to be highly scalable"; - homepage = http://atheme.org/projects/charybdis.html; + homepage = https://github.com/charybdis-ircd/charybdis; license = licenses.gpl2; maintainers = with maintainers; [ lassulus fpletz ]; platforms = platforms.unix; diff --git a/pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch b/pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch index 96710d6162d7..27ebd59a48d9 100644 --- a/pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch +++ b/pkgs/servers/roundcube/0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch @@ -18,7 +18,7 @@ index 08e3bb5..b2ad498 100755 */ -define('INSTALL_PATH', realpath(__DIR__ . '/..') . '/' ); -+define('INSTALL_PATH', __DIR__ . '/../' ); ++define('INSTALL_PATH', dirname(dirname($argv[0])).'/'); require_once INSTALL_PATH . 'program/include/clisetup.php'; diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 93499d87e0b6..5953a28a2832 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.3.10"; + version = "1.4.0"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "1gx8dgrr3p6fksv3pm381a080i9r6snwcmfd1q112mqg19ai3zk9"; + sha256 = "0b7gc342z0smn7q6cnznj9ncal0515ki4kkq1hlmqmyn0nna5lkb"; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; diff --git a/pkgs/servers/sql/mariadb/cmake-libmariadb-includedir.patch b/pkgs/servers/sql/mariadb/cmake-libmariadb-includedir.patch deleted file mode 100644 index dee77d9ab171..000000000000 --- a/pkgs/servers/sql/mariadb/cmake-libmariadb-includedir.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/libmariadb/mariadb_config/mariadb_config.c.in b/libmariadb/mariadb_config/mariadb_config.c.in -index 703c9466..c6d3f1bc 100644 ---- a/libmariadb/mariadb_config/mariadb_config.c.in -+++ b/libmariadb/mariadb_config/mariadb_config.c.in -@@ -5,13 +5,13 @@ - - static char *mariadb_progname; - --#define INCLUDE "-I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX@/@INSTALL_INCLUDEDIR@/mysql" --#define LIBS "-L@CMAKE_INSTALL_PREFIX@/@INSTALL_LIBDIR@/ -lmariadb" -+#define INCLUDE "-I@CMAKE_INSTALL_PREFIX_DEV@/@INSTALL_INCLUDEDIR@ -I@CMAKE_INSTALL_PREFIX_DEV@/@INSTALL_INCLUDEDIR@/mysql" -+#define LIBS "-L@CMAKE_INSTALL_PREFIX_DEV@/@INSTALL_LIBDIR@/ -lmariadb" - #define LIBS_SYS "@extra_dynamic_LDFLAGS@" - #define CFLAGS INCLUDE - #define VERSION "@MARIADB_CLIENT_VERSION@" - #define CC_VERSION "@CPACK_PACKAGE_VERSION@" --#define PLUGIN_DIR "@CMAKE_INSTALL_PREFIX@/@INSTALL_PLUGINDIR@" -+#define PLUGIN_DIR "@CMAKE_INSTALL_PREFIX_DEV@/@INSTALL_PLUGINDIR@" - #define SOCKET "@MARIADB_UNIX_ADDR@" - #define PORT "@MARIADB_PORT@" - #define TLS_LIBRARY_VERSION "@TLS_LIBRARY_VERSION@" diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index bb9818cf9bba..d451c1dab5c9 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,8 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, makeWrapper, ncurses, zlib, xz, lzo, lz4, bzip2, snappy , libiconv, openssl, pcre, boost, judy, bison, libxml2, libkrb5, linux-pam, curl , libaio, libevent, jemalloc, cracklib, systemd, numactl, perl -, fixDarwinDylibNames, cctools, CoreServices -, asio, buildEnv, check, scons, less +, fixDarwinDylibNames, cctools, CoreServices, less , withoutClient ? false }: @@ -35,8 +34,8 @@ common = rec { # attributes common to both builds buildInputs = [ ncurses openssl zlib pcre jemalloc libiconv curl - ] ++ optionals stdenv.isLinux [ libaio systemd libkrb5 ] - ++ optionals stdenv.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]; + ] ++ optionals stdenv.hostPlatform.isLinux [ libaio systemd libkrb5 ] + ++ optionals stdenv.hostPlatform.isDarwin [ perl fixDarwinDylibNames cctools CoreServices ]; prePatch = '' sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt @@ -44,7 +43,6 @@ common = rec { # attributes common to both builds patches = [ ./cmake-includedir.patch - ./cmake-libmariadb-includedir.patch ]; cmakeFlags = [ @@ -75,7 +73,7 @@ common = rec { # attributes common to both builds "-DWITH_SAFEMALLOC=OFF" "-DWITH_UNIT_TESTS=OFF" "-DEMBEDDED_LIBRARY=OFF" - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ # On Darwin without sandbox, CMake will find the system java and attempt to build with java support, but # then it will fail during the actual build. Let's just disable the flag explicitly until someone decides # to pass in java explicitly. @@ -86,10 +84,14 @@ common = rec { # attributes common to both builds ]; postInstall = '' + # Remove Development components. Need to use libmysqlclient. rm "$out"/lib/mysql/plugin/daemon_example.ini - mkdir -p "$dev"/bin && mv "$out"/bin/{mariadb_config,mysql_config} "$dev"/bin - mkdir -p "$dev"/lib/ && mv "$out"/lib/{libmariadbclient.a,libmysqlclient.a,libmysqlclient_r.a,libmysqlservices.a} "$dev"/lib - mkdir -p "$dev"/lib/mysql/plugin && mv "$out"/lib/mysql/plugin/{caching_sha2_password.so,dialog.so,mysql_clear_password.so,sha256_password.so} "$dev"/lib/mysql/plugin + rm "$out"/lib/{libmariadbclient.a,libmysqlclient.a,libmysqlclient_r.a,libmysqlservices.a} + rm "$out"/lib/mysql/plugin/{caching_sha2_password.so,dialog.so,mysql_clear_password.so,sha256_password.so} + rm "$out"/bin/{mariadb_config,mysql_config} + rm -r $out/include + rm -r $out/lib/pkgconfig + rm -r $out/share/{aclocal,pkgconfig} ''; enableParallelBuilding = true; @@ -108,9 +110,7 @@ common = rec { # attributes common to both builds client = stdenv.mkDerivation (common // { pname = "mariadb-client"; - outputs = [ "out" "dev" "man" ]; - - propagatedBuildInputs = [ openssl zlib ]; # required from mariadb.pc + outputs = [ "out" "man" ]; patches = common.patches ++ [ ./cmake-plugin-includedir.patch @@ -123,11 +123,6 @@ client = stdenv.mkDerivation (common // { "-DINSTALL_MYSQLSHAREDIR=share/mysql-client" ]; - preConfigure = '' - cmakeFlags="$cmakeFlags \ - -DCMAKE_INSTALL_PREFIX_DEV=$dev" - ''; - postInstall = common.postInstall + '' rm -r "$out"/share/doc rm "$out"/bin/{mysqltest,mytop,wsrep_sst_rsync_wan} @@ -141,20 +136,20 @@ client = stdenv.mkDerivation (common // { server = stdenv.mkDerivation (common // { pname = "mariadb-server"; - outputs = [ "out" "dev" "man" ]; + outputs = [ "out" "man" ]; - nativeBuildInputs = common.nativeBuildInputs ++ [ bison ] ++ optional (!stdenv.isDarwin) makeWrapper; + nativeBuildInputs = common.nativeBuildInputs ++ [ bison ] ++ optional (!stdenv.hostPlatform.isDarwin) makeWrapper; buildInputs = common.buildInputs ++ [ xz lzo lz4 bzip2 snappy libxml2 boost judy libevent cracklib - ] ++ optional (stdenv.isLinux && !stdenv.isAarch32) numactl - ++ optional stdenv.isLinux linux-pam - ++ optional (!stdenv.isDarwin) mytopEnv; + ] ++ optional (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32) numactl + ++ optional stdenv.hostPlatform.isLinux linux-pam + ++ optional (!stdenv.hostPlatform.isDarwin) mytopEnv; patches = common.patches ++ [ ./cmake-without-client.patch - ] ++ optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ ./cmake-without-plugin-auth-pam.patch ]; @@ -169,44 +164,39 @@ server = stdenv.mkDerivation (common // { "-DWITH_INNODB_DISALLOW_WRITES=ON" "-DWITHOUT_EXAMPLE=1" "-DWITHOUT_FEDERATED=1" - ] ++ stdenv.lib.optionals withoutClient [ + ] ++ optionals withoutClient [ "-DWITHOUT_CLIENT=ON" - ] ++ stdenv.lib.optionals stdenv.isDarwin [ + ] ++ optionals stdenv.hostPlatform.isDarwin [ "-DWITHOUT_OQGRAPH=1" "-DWITHOUT_TOKUDB=1" ]; - preConfigure = '' - cmakeFlags="$cmakeFlags \ - -DCMAKE_INSTALL_PREFIX_DEV=$dev - -DINSTALL_SHAREDIR=$dev/share/mysql - -DINSTALL_SUPPORTFILESDIR=$dev/share/mysql" - '' + optionalString (!stdenv.isDarwin) '' + preConfigure = optionalString (!stdenv.hostPlatform.isDarwin) '' patchShebangs scripts/mytop.sh ''; postInstall = common.postInstall + '' chmod +x "$out"/bin/wsrep_sst_common - rm "$out"/bin/mysql_client_test + rm "$out"/bin/{mysql_client_test,mysqltest} rm -r "$out"/data # Don't need testing data - rm "$out"/lib/{libmysqlclient${libExt},libmysqlclient_r${libExt}} mv "$out"/share/{groonga,groonga-normalizer-mysql} "$out"/share/doc/mysql '' + optionalString withoutClient '' ${ # We don't build with GSSAPI on Darwin - optionalString (!stdenv.isDarwin) '' + optionalString (!stdenv.hostPlatform.isDarwin) '' rm "$out"/lib/mysql/plugin/auth_gssapi_client.so '' } rm "$out"/lib/mysql/plugin/client_ed25519.so - '' + optionalString (!stdenv.isDarwin) '' + rm "$out"/lib/{libmysqlclient${libExt},libmysqlclient_r${libExt}} + '' + optionalString (!stdenv.hostPlatform.isDarwin) '' sed -i 's/-mariadb/-mysql/' "$out"/bin/galera_new_cluster ''; # perlPackages.DBDmysql is broken on darwin - postFixup = optionalString (!stdenv.isDarwin) '' + postFixup = optionalString (!stdenv.hostPlatform.isDarwin) '' wrapProgram $out/bin/mytop --set PATH ${less}/bin/less ''; - CXXFLAGS = optionalString stdenv.isi686 "-fpermissive"; + CXXFLAGS = optionalString stdenv.hostPlatform.isi686 "-fpermissive"; }); in mariadb diff --git a/pkgs/servers/sql/mariadb/galera/default.nix b/pkgs/servers/sql/mariadb/galera/default.nix index 263a21983e26..73d37ba11a22 100644 --- a/pkgs/servers/sql/mariadb/galera/default.nix +++ b/pkgs/servers/sql/mariadb/galera/default.nix @@ -55,7 +55,7 @@ in stdenv.mkDerivation { meta = with stdenv.lib; { description = "Galera 3 wsrep provider library"; - homepage = http://galeracluster.com/; + homepage = https://galeracluster.com/; license = licenses.lgpl2; maintainers = with maintainers; [ izorkin ]; platforms = platforms.all; diff --git a/pkgs/servers/zoneminder/default.nix b/pkgs/servers/zoneminder/default.nix index df6cad8c759b..2dcaf44010e7 100644 --- a/pkgs/servers/zoneminder/default.nix +++ b/pkgs/servers/zoneminder/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchurl, cmake, makeWrapper, pkgconfig -, curl, ffmpeg, glib, libjpeg, libselinux, libsepol, mp4v2, mysql, pcre, perl, perlPackages +, curl, ffmpeg, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mysql, pcre, perl, perlPackages , polkit, utillinuxMinimal, x264, zlib , coreutils, procps, psmisc }: @@ -123,7 +123,7 @@ in stdenv.mkDerivation rec { done substituteInPlace scripts/zmdbbackup.in \ - --replace /usr/bin/mysqldump ${mysql}/bin/mysqldump + --replace /usr/bin/mysqldump ${mysql.client}/bin/mysqldump for f in scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in \ scripts/zmupdate.pl.in \ @@ -140,7 +140,7 @@ in stdenv.mkDerivation rec { ''; buildInputs = [ - curl ffmpeg glib libjpeg libselinux libsepol mp4v2 mysql pcre perl polkit x264 zlib + curl ffmpeg glib libjpeg libselinux libsepol mp4v2 libmysqlclient mysql.client pcre perl polkit x264 zlib utillinuxMinimal # for libmount ] ++ (with perlPackages; [ # build-time dependencies |