Unverified Commit fa448815 authored by Toma's avatar Toma Committed by GitHub
Browse files

mysql-workbench: 8.0.38 -> 8.0.40 (#369489)

parents c4ee24fe d1cd9058

pkgs/by-name/my/mysql-workbench/dont-search-for-antlr-jar.patch

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ index b7320bb..d7169da 100644 
 check_function_exists (strtoimax HAVE_STRTOIMAX)

 check_function_exists (strtoumax HAVE_STRTOUMAX)

 

-set(ANTLR_JAR_FILENAME "antlr-4.11.1-complete.jar")

-set(ANTLR_JAR_FILENAME "antlr-4.13.2-complete.jar")

-get_filename_component(SOURCE_PARENT_DIR ${CMAKE_SOURCE_DIR} DIRECTORY)

-set(LINUX_RES_BIN_DIR ${SOURCE_PARENT_DIR}/linux-res/bin)

-message("WITH_ANTLR_JAR: ${WITH_ANTLR_JAR}")

pkgs/by-name/my/mysql-workbench/package.nix

+5 −5
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
  libiodbc,

  proj,



  antlr4_12,

  antlr4_13,

  gtkmm3,

  libxml2,

  libmysqlconnectorcpp,
@@ -52,11 +52,11 @@ let 
in

stdenv.mkDerivation (finalAttrs: {

  pname = "mysql-workbench";

  version = "8.0.38";

  version = "8.0.40";



  src = fetchurl {

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

    hash = "sha256-W2RsA2hIRUaNRK0Q5pN1YODbEiw6HE3cfeisPdUcYPY=";

    hash = "sha256-/CrjHgZ3IFFvUB1IxeURme8Z6BoZx0b03MWk8QCe0Sg=";

  };



  patches = [
@@ -101,7 +101,7 @@ stdenv.mkDerivation (finalAttrs: { 
  ];



  buildInputs = [

    antlr4_12.runtime.cpp

    antlr4_13.runtime.cpp

    gtkmm3

    (libxml2.override { enableHttp = true; })

    libmysqlconnectorcpp
@@ -141,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: { 
  cmakeFlags = [

    (lib.cmakeFeature "MySQL_CONFIG_PATH" (lib.getExe' mysql "mysql_config"))

    (lib.cmakeFeature "IODBC_CONFIG_PATH" (lib.getExe' libiodbc "iodbc-config"))

    (lib.cmakeFeature "ANTLR_JAR_PATH" "${antlr4_12.jarLocation}")

    (lib.cmakeFeature "ANTLR_JAR_PATH" "${antlr4_13.jarLocation}")

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