Merge pull request #127545 from liff/antlr/v4-is-default

antlr: make 4.8 default

authored by

Sandro and committed by
GitHub
0c72a4ff 23c5d04f

+20 -9
+6
nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
··· 309 </listitem> 310 </itemizedlist> 311 </listitem> 312 </itemizedlist> 313 </section> 314 <section xml:id="sec-release-21.11-notable-changes">
··· 309 </listitem> 310 </itemizedlist> 311 </listitem> 312 + <listitem> 313 + <para> 314 + The <literal>antlr</literal> package now defaults to the 4.x 315 + release instead of the old 2.7.7 version. 316 + </para> 317 + </listitem> 318 </itemizedlist> 319 </section> 320 <section xml:id="sec-release-21.11-notable-changes">
+3
nixos/doc/manual/release-notes/rl-2111.section.md
··· 85 - GitVersionTree 86 - NDeskOptions 87 88 ## Other Notable Changes {#sec-release-21.11-notable-changes}
··· 85 - GitVersionTree 86 - NDeskOptions 87 88 + * The `antlr` package now defaults to the 4.x release instead of the 89 + old 2.7.7 version. 90 + 91 ## Other Notable Changes {#sec-release-21.11-notable-changes}
+2 -2
pkgs/applications/version-management/srcml/default.nix
··· 1 - { lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python, antlr, 2 curl 3 }: 4 ··· 22 ./gcc6.patch 23 ]; 24 25 - nativeBuildInputs = [ cmake antlr ]; 26 buildInputs = [ libxml2 libxslt boost libarchive python curl ]; 27 28 meta = {
··· 1 + { lib, stdenv, fetchurl, cmake, libxml2, libxslt, boost, libarchive, python, antlr2, 2 curl 3 }: 4 ··· 22 ./gcc6.patch 23 ]; 24 25 + nativeBuildInputs = [ cmake antlr2 ]; 26 buildInputs = [ libxml2 libxslt boost libarchive python curl ]; 27 28 meta = {
+2 -2
pkgs/development/libraries/nco/default.nix
··· 1 - { lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }: 2 3 stdenv.mkDerivation rec { 4 version = "4.9.8"; 5 pname = "nco"; 6 7 - nativeBuildInputs = [ flex which antlr ]; 8 buildInputs = [ netcdf netcdfcxx4 gsl udunits curl coreutils ]; 9 10 src = fetchzip {
··· 1 + { lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr2, which, curl, flex, coreutils }: 2 3 stdenv.mkDerivation rec { 4 version = "4.9.8"; 5 pname = "nco"; 6 7 + nativeBuildInputs = [ flex which antlr2 ]; 8 buildInputs = [ netcdf netcdfcxx4 gsl udunits curl coreutils ]; 9 10 src = fetchzip {
+2 -2
pkgs/development/python-modules/stringtemplate/default.nix
··· 1 - { lib, fetchurl, buildPythonPackage, antlr, isPy3k }: 2 3 buildPythonPackage rec { 4 pname = "PyStringTemplate"; ··· 9 sha256 = "0lbib0l8c1q7i1j610rwcdagymr1idahrql4dkgnm5rzyg2vk3ml"; 10 }; 11 12 - propagatedBuildInputs = [ antlr ]; 13 14 disabled = isPy3k; 15
··· 1 + { lib, fetchurl, buildPythonPackage, antlr2, isPy3k }: 2 3 buildPythonPackage rec { 4 pname = "PyStringTemplate"; ··· 9 sha256 = "0lbib0l8c1q7i1j610rwcdagymr1idahrql4dkgnm5rzyg2vk3ml"; 10 }; 11 12 + propagatedBuildInputs = [ antlr2 ]; 13 14 disabled = isPy3k; 15
+2 -2
pkgs/development/tools/database/sqlitebrowser/default.nix
··· 1 - { mkDerivation, lib, fetchFromGitHub, cmake, antlr 2 , qtbase, qttools, sqlite }: 3 4 mkDerivation rec { ··· 16 # but qscintilla is currently in a bit of a mess as some consumers expect a 17 # -qt4 or -qt5 prefix while others do not. 18 # We *really* should get that cleaned up. 19 - buildInputs = [ antlr qtbase sqlite ]; 20 21 nativeBuildInputs = [ cmake qttools ]; 22
··· 1 + { mkDerivation, lib, fetchFromGitHub, cmake 2 , qtbase, qttools, sqlite }: 3 4 mkDerivation rec { ··· 16 # but qscintilla is currently in a bit of a mess as some consumers expect a 17 # -qt4 or -qt5 prefix while others do not. 18 # We *really* should get that cleaned up. 19 + buildInputs = [ qtbase sqlite ]; 20 21 nativeBuildInputs = [ cmake qttools ]; 22
+3 -1
pkgs/top-level/all-packages.nix
··· 12798 12799 ansible-lint = with python3.pkgs; toPythonApplication ansible-lint; 12800 12801 - antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { 12802 jdk = jdk8; # todo: remove override https://github.com/nixos/nixpkgs/pull/89731 12803 }; 12804 ··· 12815 }; 12816 12817 antlr4 = antlr4_8; 12818 12819 apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; 12820 apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };
··· 12798 12799 ansible-lint = with python3.pkgs; toPythonApplication ansible-lint; 12800 12801 + antlr2 = callPackage ../development/tools/parsing/antlr/2.7.7.nix { 12802 jdk = jdk8; # todo: remove override https://github.com/nixos/nixpkgs/pull/89731 12803 }; 12804 ··· 12815 }; 12816 12817 antlr4 = antlr4_8; 12818 + 12819 + antlr = antlr4; 12820 12821 apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; 12822 apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { };