BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mysql-workbench: 8.0.15 → 8.0.19

Browse source 
* https://dev.mysql.com/doc/relnotes/workbench/en/news-8-0-16.html
* https://dev.mysql.com/doc/relnotes/workbench/en/news-8-0-17.html
* https://dev.mysql.com/doc/relnotes/workbench/en/news-8-0-18.html
* https://dev.mysql.com/doc/relnotes/workbench/en/news-8-0-19.html

The release notes contain the following:

Important Note: MySQL Workbench 8.0.19 is unable to open a new connection to MySQL Server from the home screen if the server is not started and you cannot start a server by using the Workbench Administration feature. Administrative and SQL editing tasks require an online server for the duration of this issue. Feature tasks that you performed with an offline server in previous releases now return an error message indicating that the server is unreachable.

but it is clearly better than having it broken.
This commit is contained in:
Jan Tojnar 2020-03-12 01:08:10 +01:00
parent 23d69911f3
commit 070b49ed00
No known key found for this signature in database
GPG key ID: 7FAB2A15F7A607A4
2 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/applications/misc/mysql-workbench/default.nix
View file

@ -29,6 +29,7 @@
, libsigcxx
, libX11
, openssl
, rapidjson
, proj
, cairo
, libxkbcommon
@ -44,11 +45,11 @@ let
inherit (python2.pkgs) paramiko pycairo pyodbc;
in stdenv.mkDerivation rec {
pname = "mysql-workbench";
version = "8.0.15";
version = "8.0.19";
src = fetchurl {
url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz";
sha256 = "0ca93azasya5xiw6j2map8drmxf445qqydpvrb512kjfqdiv67x6";
sha256 = "unrszSK+tKcARSHxRSAAos+jDtYxdDcSnFENixaDJsw=";
};
patches = [
@ -67,6 +68,13 @@ in stdenv.mkDerivation rec {
rmdir = "${coreutils}/bin/rmdir";
sudo = "${sudo}/bin/sudo";
})
# Fix swig not being able to find headers
# https://github.com/NixOS/nixpkgs/pull/82362#issuecomment-597948461
(substituteAll {
src = ./fix-swig-build.patch;
cairoDev = "${cairo.dev}";
})
];
# have it look for 4.7.2 instead of 4.7.1
@ -98,6 +106,7 @@ in stdenv.mkDerivation rec {
boost
libssh
openssl
rapidjson
libiodbc
pcre
cairo
@ -133,6 +142,10 @@ in stdenv.mkDerivation rec {
"-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config"
"-DIODBC_CONFIG_PATH=${libiodbc}/bin/iodbc-config"
"-DWITH_ANTLR_JAR=${antlr4_7.jarLocation}"
# mysql-workbench 8.0.19 depends on libmysqlconnectorcpp 1.1.8.
# Newer versions of connector still provide the legacy library when enabled
# but the headers are in a different location.
"-DMySQLCppConn_INCLUDE_DIR=${libmysqlconnectorcpp}/include/jdbc"
];
# There is already an executable and a wrapper in bindir

12
pkgs/applications/misc/mysql-workbench/fix-swig-build.patch Normal file
View file

@ -0,0 +1,12 @@
--- a/library/forms/swig/CMakeLists.txt
+++ b/library/forms/swig/CMakeLists.txt
@@ -57,7 +57,7 @@
set(CMAKE_SWIG_FLAGS -w312)
set_source_files_properties(cairo.i PROPERTIES CPLUSPLUS ON)
-set_property(SOURCE cairo.i PROPERTY SWIG_FLAGS -DCAIRO_HAS_PNG_FUNCTIONS=1 -fcompact -DSWIG_PYTHON_LEGACY_BOOL -I/usr/include)
+set_property(SOURCE cairo.i PROPERTY SWIG_FLAGS -DCAIRO_HAS_PNG_FUNCTIONS=1 -fcompact -DSWIG_PYTHON_LEGACY_BOOL -I@cairoDev@/include)
if(CMAKE_VERSION VERSION_LESS 3.8)
swig_add_module(cairo python cairo.i)
else()