antlr: make 4.8 default

This commit is contained in:
Olli Helenius 2021-06-20 13:23:37 +03:00
parent 57d4300e33
commit b2bf2c6102
No known key found for this signature in database
GPG key ID: 65B7BEC581BD1DD1
7 changed files with 20 additions and 9 deletions

View file

@ -309,6 +309,12 @@
</listitem>
</itemizedlist>
</listitem>
<listitem>
<para>
The <literal>antlr</literal> package now defaults to the 4.x
release instead of the old 2.7.7 version.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-21.11-notable-changes">

View file

@ -85,4 +85,7 @@ In addition to numerous new and upgraded packages, this release has the followin
- GitVersionTree
- NDeskOptions
* The `antlr` package now defaults to the 4.x release instead of the
old 2.7.7 version.
## Other Notable Changes {#sec-release-21.11-notable-changes}

View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python, antlr,
{ lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python, antlr2,
curl
}:
@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
./gcc6.patch
];
nativeBuildInputs = [ cmake antlr ];
nativeBuildInputs = [ cmake antlr2 ];
buildInputs = [ libxml2 libxslt boost libarchive python curl ];
meta = {

View file

@ -1,10 +1,10 @@
{ lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }:
{ lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr2, which, curl, flex, coreutils }:
stdenv.mkDerivation rec {
version = "4.9.8";
pname = "nco";
nativeBuildInputs = [ flex which antlr ];
nativeBuildInputs = [ flex which antlr2 ];
buildInputs = [ netcdf netcdfcxx4 gsl udunits curl coreutils ];
src = fetchzip {

View file

@ -1,4 +1,4 @@
{ lib, fetchurl, buildPythonPackage, antlr, isPy3k }:
{ lib, fetchurl, buildPythonPackage, antlr2, isPy3k }:
buildPythonPackage rec {
pname = "PyStringTemplate";
@ -9,7 +9,7 @@ buildPythonPackage rec {
sha256 = "0lbib0l8c1q7i1j610rwcdagymr1idahrql4dkgnm5rzyg2vk3ml";
};
propagatedBuildInputs = [ antlr ];
propagatedBuildInputs = [ antlr2 ];
disabled = isPy3k;

View file

@ -1,4 +1,4 @@
{ mkDerivation, lib, fetchFromGitHub, cmake, antlr
{ mkDerivation, lib, fetchFromGitHub, cmake
, qtbase, qttools, sqlite }:
mkDerivation rec {
@ -16,7 +16,7 @@ mkDerivation rec {
# but qscintilla is currently in a bit of a mess as some consumers expect a
# -qt4 or -qt5 prefix while others do not.
# We *really* should get that cleaned up.
buildInputs = [ antlr qtbase sqlite ];
buildInputs = [ qtbase sqlite ];
nativeBuildInputs = [ cmake qttools ];

View file

@ -12787,7 +12787,7 @@ in
ansible-lint = with python3.pkgs; toPythonApplication ansible-lint;
antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix {
antlr2 = callPackage ../development/tools/parsing/antlr/2.7.7.nix {
jdk = jdk8; # todo: remove override https://github.com/nixos/nixpkgs/pull/89731
};
@ -12805,6 +12805,8 @@ in
antlr4 = antlr4_8;
antlr = antlr4;
apacheAnt = callPackage ../development/tools/build-managers/apache-ant { };
apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
ant = apacheAnt;