From 50c82704a8b0c412adc633c95672f863b6c05281 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 29 May 2018 12:00:05 +0000 Subject: [PATCH 1/4] qt5.qtlocation: enable parallel building It was fixed in [1] which is part of 5.9.2, 5.10.0. [1] https://github.com/qt/qtlocation/commit/3ac051c4549575634cecc706175b019f4ed4c3bf#diff-b820e0828543b1da522ff0ab3dac6c75 --- pkgs/development/libraries/qt-5/modules/qtlocation.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtlocation.nix b/pkgs/development/libraries/qt-5/modules/qtlocation.nix index e8952e29cba..0eee684a53f 100644 --- a/pkgs/development/libraries/qt-5/modules/qtlocation.nix +++ b/pkgs/development/libraries/qt-5/modules/qtlocation.nix @@ -4,8 +4,6 @@ qtModule { name = "qtlocation"; qtInputs = [ qtbase qtmultimedia ]; outputs = [ "bin" "out" "dev" ]; - # Linking with -lclipper fails with parallel build enabled - enableParallelBuilding = false; qmakeFlags = stdenv.lib.optional stdenv.isDarwin [ # boost uses std::auto_ptr which has been disabled in clang with libcxx # This flag re-enables this feature From 5ac2382487f2611df8b7c7d2b92111962b417527 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 29 May 2018 08:35:04 +0000 Subject: [PATCH 2/4] mirrors: remove obsolete mysql mirror It does not contain any of the versions currently in Nixpkgs. --- pkgs/build-support/fetchurl/mirrors.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index b0d3f373a46..cc015f9d604 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -368,7 +368,6 @@ rec { # MySQL mirrors mysql = [ - http://mysql.mirrors.pair.com/Downloads/ http://cdn.mysql.com/Downloads/ ]; From 4b975f0fb941066ce1a8ab7ec7489e8924149a5f Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 29 May 2018 08:36:21 +0000 Subject: [PATCH 3/4] mysql55: 5.5.58 -> 5.5.60 mysql-test-run.pl.1 no longer exists. Do not install and immediately delete mysql-test and sql-bench. --- pkgs/servers/sql/mysql/5.5.x.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 29d25b77afc..15f82a90208 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -6,11 +6,11 @@ let self = stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.5.58"; + version = "5.5.60"; src = fetchurl { url = "mirror://mysql/MySQL-5.5/${name}.tar.gz"; - sha256 = "1f890376ld1qapl038sjh2ialdizys3sj96vfn4mqmb1ybx14scv"; + sha256 = "071xaamqkbscybqzm79gf2w3bkr9lqlzwafis3gzc8w8fkhi4hd3"; }; patches = if stdenv.isCygwin then [ @@ -47,6 +47,8 @@ self = stdenv.mkDerivation rec { "-DINSTALL_MYSQLSHAREDIR=share/mysql" "-DINSTALL_DOCDIR=share/mysql/docs" "-DINSTALL_SHAREDIR=share/mysql" + "-DINSTALL_MYSQLTESTDIR=" + "-DINSTALL_SQLBENCHDIR=" ]; NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; # since gcc-7 @@ -57,8 +59,7 @@ self = stdenv.mkDerivation rec { ''; postInstall = '' sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db - rm -r $out/mysql-test $out/sql-bench $out/data "$out"/lib/*.a - rm $out/share/man/man1/mysql-test-run.pl.1 + rm -r $out/data "$out"/lib/*.a ''; passthru = { From 303a17a939e7c00b6fc69993afed1e971e8a07e0 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Tue, 29 May 2018 09:40:45 +0000 Subject: [PATCH 4/4] mysql57: 5.7.20 -> 5.7.22 Do not SKIP_BUILD_RPATH to let libmysql_api_test run during the build. There is no WITH_UNITTEST, but there is WITH_UNIT_TESTS. Do not install and immediately delete mysql-test. There is no "basedir=" in mysql_install_db. --- pkgs/servers/sql/mysql/5.7.x.nix | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 15e8569fd09..4017f5946a4 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -6,11 +6,11 @@ let self = stdenv.mkDerivation rec { name = "mysql-${version}"; - version = "5.7.20"; + version = "5.7.22"; src = fetchurl { url = "mirror://mysql/MySQL-5.7/${name}.tar.gz"; - sha256 = "11v4g3igigv3zvknv67qml8in6fjrbs2vnr3q6bg6f62nydm95sk"; + sha256 = "1wng15j5caz6fsv28avlcxjgq3c5n90ifk79xa0h7jws19dl1f2f"; }; preConfigure = stdenv.lib.optional stdenv.isDarwin '' @@ -26,14 +26,14 @@ self = stdenv.mkDerivation rec { outputs = [ "out" "static" ]; cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=OFF" # To run libmysql/libmysql_api_test during build. "-DWITH_SSL=yes" "-DWITH_EMBEDDED_SERVER=yes" - "-DWITH_UNITTEST=no" + "-DWITH_UNIT_TESTS=no" "-DWITH_ZLIB=yes" "-DWITH_ARCHIVE_STORAGE_ENGINE=yes" "-DWITH_BLACKHOLE_STORAGE_ENGINE=yes" "-DWITH_FEDERATED_STORAGE_ENGINE=yes" - "-DCMAKE_VERBOSE_MAKEFILE=yes" "-DHAVE_IPV6=yes" "-DMYSQL_UNIX_ADDR=/run/mysqld/mysqld.sock" "-DMYSQL_DATADIR=/var/lib/mysql" @@ -45,6 +45,7 @@ self = stdenv.mkDerivation rec { "-DINSTALL_DOCREADMEDIR=share/mysql" "-DINSTALL_SUPPORTFILESDIR=share/mysql" "-DINSTALL_MYSQLSHAREDIR=share/mysql" + "-DINSTALL_MYSQLTESTDIR=" "-DINSTALL_DOCDIR=share/mysql/docs" "-DINSTALL_SHAREDIR=share/mysql" ]; @@ -53,13 +54,10 @@ self = stdenv.mkDerivation rec { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; prePatch = '' - sed -i -e "s|/usr/bin/libtool|libtool|" cmake/libutils.cmake + sed -i -e "s|/usr/bin/libtool|libtool|" cmake/merge_archives.cmake.in ''; postInstall = '' - sed -i -e "s|basedir=\"\"|basedir=\"$out\"|" $out/bin/mysql_install_db - install -vD $out/lib/*.a -t $static/lib - rm -r $out/mysql-test - rm $out/share/man/man1/mysql-test-run.pl.1 $out/lib/*.a + moveToOutput "lib/*.a" $static ln -s libmysqlclient${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libmysqlclient_r${stdenv.hostPlatform.extensions.sharedLibrary} '';