colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

antlr: 4.7 -> 4.8

Browse Source
This commit is contained in:
Guillaume Bouchard 2020-11-04 19:58:32 +01:00 committed by Jonathan Ringer
parent 2a5b50f67d
commit 2de3de4631
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/applications/misc/mysql-workbench/default.nix
View File

@ -9,7 +9,7 @@
, gtkmm3 , gtkmm3
, pcre , pcre
, swig , swig
, antlr4_7 , antlr4_8
, sudo , sudo
, mysql , mysql
, libxml2 , libxml2
@ -80,7 +80,7 @@ in stdenv.mkDerivation rec {
# have it look for 4.7.2 instead of 4.7.1 # have it look for 4.7.2 instead of 4.7.1
preConfigure = '' preConfigure = ''
substituteInPlace CMakeLists.txt \ substituteInPlace CMakeLists.txt \
--replace "antlr-4.7.1-complete.jar" "antlr-4.7.2-complete.jar" --replace "antlr-4.7.1-complete.jar" "antlr-4.8-complete.jar"
''; '';
nativeBuildInputs = [ nativeBuildInputs = [
@ -96,7 +96,7 @@ in stdenv.mkDerivation rec {
gtk3 gtk3
gtkmm3 gtkmm3
libX11 libX11
antlr4_7.runtime.cpp antlr4_8.runtime.cpp
python2 python2
mysql mysql
libxml2 libxml2
@ -141,7 +141,7 @@ in stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config" "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config"
"-DIODBC_CONFIG_PATH=${libiodbc}/bin/iodbc-config" "-DIODBC_CONFIG_PATH=${libiodbc}/bin/iodbc-config"
"-DWITH_ANTLR_JAR=${antlr4_7.jarLocation}" "-DWITH_ANTLR_JAR=${antlr4_8.jarLocation}"
# mysql-workbench 8.0.21 depends on libmysqlconnectorcpp 1.1.8. # mysql-workbench 8.0.21 depends on libmysqlconnectorcpp 1.1.8.
# Newer versions of connector still provide the legacy library when enabled # Newer versions of connector still provide the legacy library when enabled
# but the headers are in a different location. # but the headers are in a different location.

6
pkgs/development/tools/parsing/antlr/4.7.nix → pkgs/development/tools/parsing/antlr/4.8.nix
View File

@ -2,12 +2,12 @@
, fetchFromGitHub, cmake, ninja, pkgconfig, libuuid, darwin }: , fetchFromGitHub, cmake, ninja, pkgconfig, libuuid, darwin }:
let let
version = "4.7.2"; version = "4.8";
source = fetchFromGitHub { source = fetchFromGitHub {
owner = "antlr"; owner = "antlr";
repo = "antlr4"; repo = "antlr4";
rev = version; rev = version;
sha256 = "1pl0zs6c6wx9nmq30s7ccpc3dl72az55i8vfp574fw9sywmvxmlj"; sha256 = "1qal3add26qxskm85nk7r758arladn5rcyjinmhlhznmpbbv9j8m";
}; };
runtime = { runtime = {
@ -41,7 +41,7 @@ let
src = fetchurl { src = fetchurl {
url ="https://www.antlr.org/download/antlr-${version}-complete.jar"; url ="https://www.antlr.org/download/antlr-${version}-complete.jar";
sha256 = "1d40nfkq3ws8g4ksx4gj6l6m2l9j4b605q6sf68z5vvmg5nkhlk8"; sha256 = "0nms976cnqyr1ndng3haxkmknpdq6xli4cpf4x4al0yr21l9v93k";
}; };
dontUnpack = true; dontUnpack = true;

5
pkgs/top-level/all-packages.nix
View File

@ -10682,10 +10682,11 @@ in
}; };
antlr3 = antlr3_5; antlr3 = antlr3_5;
antlr4_7 = callPackage ../development/tools/parsing/antlr/4.7.nix { antlr4_8 = callPackage ../development/tools/parsing/antlr/4.8.nix {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
}; };
antlr4 = antlr4_7;
antlr4 = antlr4_8;
apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; apacheAnt = callPackage ../development/tools/build-managers/apache-ant { };
apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };