Commit 3c2a276f authored by Maxim Ianoglo's avatar Maxim Ianoglo
Browse files

mysql-workbench: 8.0.32 -> 8.0.33 

  * Bump antlr dependency version: 4.11.x -> 4.12.0
  * Bump Java dependency version: jre8 -> openjdk19
  * Remove gdal patch as it is not needed anymore
parent 17b00c9e

pkgs/applications/misc/mysql-workbench/default.nix

+8 −10
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
, gtkmm3

, pcre

, swig

, antlr4_9

, antlr4_12

, sudo

, mysql

, libxml2
@@ -46,16 +46,14 @@ let 
  inherit (python3.pkgs) paramiko pycairo pyodbc;

in stdenv.mkDerivation rec {

  pname = "mysql-workbench";

  version = "8.0.32";

  version = "8.0.33";



  src = fetchurl {

    url = "http://dev.mysql.com/get/Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz";

    sha256 = "sha256-ruGdYTG0KPhRnUdlfaZjt1r/tAhA1XeAtjDgu/K9okI=";

    url = "https://cdn.mysql.com//Downloads/MySQLGUITools/mysql-workbench-community-${version}-src.tar.gz";

    sha256 = "a6c9b05ee6f8accd45203d8234a43415da65ddc8118d427dd1a2ef2a209261bc";

  };



  patches = [

    ./fix-gdal-includes.patch



    (substituteAll {

      src = ./hardcode-paths.patch;

      catchsegv = "${glibc.bin}/bin/catchsegv";
@@ -79,11 +77,11 @@ in stdenv.mkDerivation rec { 
    })

  ];



  # 1. have it look for 4.9.3 instead of 4.9.1

  # 1. have it look for 4.12.0 instead of 4.11.1

  # 2. for some reason CMakeCache.txt is part of source code

  preConfigure = ''

    substituteInPlace CMakeLists.txt \

      --replace "antlr-4.9.1-complete.jar" "antlr-4.9.3-complete.jar"

      --replace "antlr-4.11.1-complete.jar" "antlr-4.12.0-complete.jar"

    rm -f build/CMakeCache.txt

  '';
@@ -100,7 +98,7 @@ in stdenv.mkDerivation rec { 
    gtk3

    gtkmm3

    libX11

    antlr4_9.runtime.cpp

    antlr4_12.runtime.cpp

    python3

    mysql

    libxml2
@@ -157,7 +155,7 @@ in stdenv.mkDerivation rec { 
    # mysql-workbench 8.0.21 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.

    "-DWITH_ANTLR_JAR=${antlr4_9.jarLocation}"

    "-DWITH_ANTLR_JAR=${antlr4_12.jarLocation}"

    "-DMySQLCppConn_INCLUDE_DIR=${libmysqlconnectorcpp}/include/jdbc"

  ];

pkgs/applications/misc/mysql-workbench/fix-gdal-includes.patch

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
--- a/backend/wbpublic/grt/spatial_handler.h

+++ b/backend/wbpublic/grt/spatial_handler.h

@@ -24,12 +24,12 @@

 #ifndef SPATIAL_HANDLER_H_

 #define SPATIAL_HANDLER_H_

 

-#include <gdal/ogrsf_frmts.h>

-#include <gdal/ogr_api.h>

-#include <gdal/gdal_pam.h>

-#include <gdal/memdataset.h>

-#include <gdal/gdal_alg.h>

-#include <gdal/gdal.h>

+#include <ogrsf_frmts.h>

+#include <ogr_api.h>

+#include <gdal_pam.h>

+#include <memdataset.h>

+#include <gdal_alg.h>

+#include <gdal.h>

 #include <deque>

 #include "base/geometry.h"

 #include "wbpublic_public_interface.h"

--- a/backend/wbpublic/grtui/geom_draw_box.h

+++ b/backend/wbpublic/grtui/geom_draw_box.h

@@ -25,7 +25,7 @@

 #define _GEOM_DRAW_BOX_H_

 

 #include <mforms/drawbox.h>

-#include <gdal/ogr_geometry.h>

+#include <ogr_geometry.h>

 #include "wbpublic_public_interface.h"

 

 class WBPUBLICBACKEND_PUBLIC_FUNC GeomDrawBox : public mforms::DrawBox {

--- a/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp

+++ b/backend/wbpublic/objimpl/db.query/db_query_Resultset.cpp

@@ -21,9 +21,9 @@

  * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA 

  */

 

-#include <gdal/ogrsf_frmts.h>

-#include <gdal/ogr_api.h>

-#include <gdal/gdal.h>

+#include <ogrsf_frmts.h>

+#include <ogr_api.h>

+#include <gdal.h>

 

 #include <grts/structs.db.query.h>

 #include <grtpp_util.h>

pkgs/top-level/all-packages.nix

+1 −1
Original line number Diff line number Diff line
@@ -39015,7 +39015,7 @@ with pkgs; 
    };

    mysql = mysql;

    pcre = pcre-cpp;

    jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731

    jre = openjdk19; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731

  });















  r128gain = callPackage ../applications/audio/r128gain { };