mysql-workbench: 8.0.15 → 8.0.19

* 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.

+27 -2
+15 -2
pkgs/applications/misc/mysql-workbench/default.nix
··· 29 29 , libsigcxx 30 30 , libX11 31 31 , openssl 32 + , rapidjson 32 33 , proj 33 34 , cairo 34 35 , libxkbcommon ··· 44 45 inherit (python2.pkgs) paramiko pycairo pyodbc; 45 46 in stdenv.mkDerivation rec { 46 47 pname = "mysql-workbench"; 47 - version = "8.0.15"; 48 + version = "8.0.19"; 48 49 49 50 src = fetchurl { 50 51 url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz"; 51 - sha256 = "0ca93azasya5xiw6j2map8drmxf445qqydpvrb512kjfqdiv67x6"; 52 + sha256 = "unrszSK+tKcARSHxRSAAos+jDtYxdDcSnFENixaDJsw="; 52 53 }; 53 54 54 55 patches = [ ··· 67 68 rmdir = "${coreutils}/bin/rmdir"; 68 69 sudo = "${sudo}/bin/sudo"; 69 70 }) 71 + 72 + # Fix swig not being able to find headers 73 + # https://github.com/NixOS/nixpkgs/pull/82362#issuecomment-597948461 74 + (substituteAll { 75 + src = ./fix-swig-build.patch; 76 + cairoDev = "${cairo.dev}"; 77 + }) 70 78 ]; 71 79 72 80 # have it look for 4.7.2 instead of 4.7.1 ··· 98 106 boost 99 107 libssh 100 108 openssl 109 + rapidjson 101 110 libiodbc 102 111 pcre 103 112 cairo ··· 133 142 "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config" 134 143 "-DIODBC_CONFIG_PATH=${libiodbc}/bin/iodbc-config" 135 144 "-DWITH_ANTLR_JAR=${antlr4_7.jarLocation}" 145 + # mysql-workbench 8.0.19 depends on libmysqlconnectorcpp 1.1.8. 146 + # Newer versions of connector still provide the legacy library when enabled 147 + # but the headers are in a different location. 148 + "-DMySQLCppConn_INCLUDE_DIR=${libmysqlconnectorcpp}/include/jdbc" 136 149 ]; 137 150 138 151 # There is already an executable and a wrapper in bindir
+12
pkgs/applications/misc/mysql-workbench/fix-swig-build.patch
··· 1 + --- a/library/forms/swig/CMakeLists.txt 2 + +++ b/library/forms/swig/CMakeLists.txt 3 + @@ -57,7 +57,7 @@ 4 + 5 + set(CMAKE_SWIG_FLAGS -w312) 6 + set_source_files_properties(cairo.i PROPERTIES CPLUSPLUS ON) 7 + -set_property(SOURCE cairo.i PROPERTY SWIG_FLAGS -DCAIRO_HAS_PNG_FUNCTIONS=1 -fcompact -DSWIG_PYTHON_LEGACY_BOOL -I/usr/include) 8 + +set_property(SOURCE cairo.i PROPERTY SWIG_FLAGS -DCAIRO_HAS_PNG_FUNCTIONS=1 -fcompact -DSWIG_PYTHON_LEGACY_BOOL -I@cairoDev@/include) 9 + if(CMAKE_VERSION VERSION_LESS 3.8) 10 + swig_add_module(cairo python cairo.i) 11 + else() 12 +