yacc: deprecate alias

and add a new line after the alphabetically sorting to please my inner monk
This commit is contained in:
Sandro Jäckel 2021-03-14 18:50:12 +01:00
parent 8e1db896a3
commit 33a395f195
No known key found for this signature in database
GPG Key ID: 3AF5A43A3EECC2E5
42 changed files with 83 additions and 82 deletions

View File

@ -1,7 +1,7 @@
{ lib, fetchFromGitHub, fetchpatch, mkDerivation
, qtbase, qtsvg, qtserialport, qtwebengine, qtmultimedia, qttools
, qtconnectivity, qtcharts, libusb-compat-0_1
, yacc, flex, zlib, qmake, makeDesktopItem, makeWrapper
, bison, flex, zlib, qmake, makeDesktopItem, makeWrapper
}:
let
@ -29,7 +29,7 @@ in mkDerivation rec {
qtbase qtsvg qtserialport qtwebengine qtmultimedia qttools zlib
qtconnectivity qtcharts libusb-compat-0_1
];
nativeBuildInputs = [ flex makeWrapper qmake yacc ];
nativeBuildInputs = [ flex makeWrapper qmake bison ];
patches = [
# allow building with bison 3.7

View File

@ -4,7 +4,7 @@
, makeWrapper
, pkg-config
, which
, yacc
, bison
, gnuplot
, libxls
, libxml2
@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
makeWrapper
pkg-config
which
yacc
bison
];
buildInputs = [

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, tcl, tk, libX11, glibc, which, yacc, flex, imake, xorgproto, gccmakedep }:
{ lib, stdenv, fetchurl, tcl, tk, libX11, glibc, which, bison, flex, imake, xorgproto, gccmakedep }:
let
libiconvInc = lib.optionalString stdenv.isLinux "${glibc.dev}/include";
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
sha256 = "1pqywkidfpdbj18i03h97f4cimld4fb3mqfy8jjsxs12kihm18fs";
};
nativeBuildInputs = [ which yacc flex imake gccmakedep ];
nativeBuildInputs = [ which bison flex imake gccmakedep ];
buildInputs = [ tcl tk libX11 xorgproto ];
dontUseImakeConfigure = true;

View File

@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, ocamlPackages, gnome2, pkg-config, makeWrapper, glib
, libtool, libpng, yacc, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw
, libtool, libpng, bison, expat, fontconfig, gd, pango, libjpeg, libwebp, xlibsWrapper, libXaw
}:
# We need an old version of Graphviz for format compatibility reasons.
# This version is vulnerable, but monotone-viz will never feed it bad input.
let graphviz_2_0 = import ./graphviz-2.0.nix {
inherit lib stdenv fetchurl pkg-config xlibsWrapper libpng libjpeg expat libXaw
yacc libtool fontconfig pango gd libwebp;
bison libtool fontconfig pango gd libwebp;
}; in
let inherit (gnome2) libgnomecanvas; in
let inherit (ocamlPackages) ocaml lablgtk camlp4; in

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, pkg-config, xlibsWrapper, libpng, libjpeg, expat, libXaw
, yacc, libtool, fontconfig, pango, gd, libwebp
, bison, libtool, fontconfig, pango, gd, libwebp
}:
stdenv.mkDerivation rec {
@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkg-config ];
buildInputs = [
xlibsWrapper libpng libjpeg expat libXaw yacc
xlibsWrapper libpng libjpeg expat libXaw bison
libtool fontconfig pango gd libwebp
];

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, libX11, libXinerama, libXrandr, libXft, yacc, pkg-config }:
{ lib, stdenv, fetchFromGitHub, libX11, libXinerama, libXrandr, libXft, bison, pkg-config }:
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config ];
buildInputs = [ libX11 libXinerama libXrandr libXft yacc ];
buildInputs = [ libX11 libXinerama libXrandr libXft bison ];
prePatch = ''sed -i "s@/usr/local@$out@" Makefile'';

View File

@ -3,7 +3,7 @@
, fetchFromGitHub
, autoreconfHook
, flex
, yacc
, bison
, xmlto
, docbook_xsl
, docbook_xml_dtd_44
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [
autoreconfHook
flex
yacc
bison
swig
xmlto
docbook_xml_dtd_44

View File

@ -13,7 +13,7 @@
, xmlto
, appstream-glib
, substituteAll
, yacc
, bison
, xdg-dbus-proxy
, p11-kit
, bubblewrap
@ -114,7 +114,7 @@ stdenv.mkDerivation rec {
pkg-config
xmlto
appstream-glib
yacc
bison
wrapGAppsNoGuiHook
];

View File

@ -2,7 +2,7 @@
, perl, gmp, autogen, libidn, p11-kit, unbound, libiconv
, guileBindings ? config.gnutls.guile or false, guile
, tpmSupport ? true, trousers, nettools, gperftools, gperf, gettext, automake
, yacc, texinfo
, bison, texinfo
# Version dependent args
, version, src, patches ? [], postPatch ? "", nativeBuildInputs ? []
@ -55,7 +55,7 @@ stdenv.mkDerivation {
enableParallelBuilding = false;
buildInputs = [ lzo lzip nettle libtasn1 libidn p11-kit zlib gmp
autogen gperftools gperf gettext automake yacc texinfo ]
autogen gperftools gperf gettext automake bison texinfo ]
++ lib.optional doCheck nettools
++ lib.optional (stdenv.isFreeBSD || stdenv.isDarwin) libiconv
++ lib.optional (tpmSupport && stdenv.isLinux) trousers

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3, perl, yacc, flex
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, python3, perl, bison, flex
, texinfo, perlPackages
, openldap, libcap_ng, sqlite, openssl, db, libedit, pam
, CoreFoundation, Security, SystemConfiguration
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
patches = [ ./heimdal-make-missing-headers.patch ];
nativeBuildInputs = [ autoreconfHook pkg-config python3 perl yacc flex texinfo ]
nativeBuildInputs = [ autoreconfHook pkg-config python3 perl bison flex texinfo ]
++ (with perlPackages; [ JSON ]);
buildInputs = optionals (stdenv.isLinux) [ libcap_ng ]
++ [ db sqlite openssl libedit openldap pam]

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, perl, yacc, bootstrap_cmds
{ lib, stdenv, fetchurl, pkg-config, perl, bison, bootstrap_cmds
, openssl, openldap, libedit, keyutils
# Extra Arguments
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
];
nativeBuildInputs = [ pkg-config perl ]
++ optional (!libOnly) yacc
++ optional (!libOnly) bison
# Provides the mig command used by the build scripts
++ optional stdenv.isDarwin bootstrap_cmds;

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, libgcrypt, libgpgerror, yacc, flex }:
{ lib, stdenv, fetchurl, libgcrypt, libgpgerror, bison, flex }:
# library that allows libbluray to play AACS protected bluray disks
# libaacs does not infringe DRM's right or copyright. See the legal page of the website for more info.
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libgcrypt libgpgerror ];
nativeBuildInputs = [ yacc flex ];
nativeBuildInputs = [ bison flex ];
meta = with lib; {
homepage = "https://www.videolan.org/developers/libaacs.html";

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, meson, ninja, pkg-config, yacc, doxygen
{ lib, stdenv, fetchurl, meson, ninja, pkg-config, bison, doxygen
, xkeyboard_config, libxcb, libxml2
, python3
, libX11
@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "doc" ];
nativeBuildInputs = [ meson ninja pkg-config yacc doxygen ]
nativeBuildInputs = [ meson ninja pkg-config bison doxygen ]
++ lib.optional withWaylandSupport wayland;
buildInputs = [ xkeyboard_config libxcb libxml2 ]
++ lib.optionals withWaylandSupport [ wayland wayland-protocols ];

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, pkg-config, yacc, flex, xkeyboard_config, libxcb, libX11 }:
{ lib, stdenv, fetchurl, pkg-config, bison, flex, xkeyboard_config, libxcb, libX11 }:
stdenv.mkDerivation rec {
name = "libxkbcommon-0.7.2";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
nativeBuildInputs = [ pkg-config ];
buildInputs = [ yacc flex xkeyboard_config libxcb ];
buildInputs = [ bison flex xkeyboard_config libxcb ];
configureFlags = [
"--with-xkb-config-root=${xkeyboard_config}/etc/X11/xkb"

View File

@ -1,4 +1,4 @@
{ stdenv, lib, fetchurl, makeWrapper, yacc, gcc
{ stdenv, lib, fetchurl, makeWrapper, bison, gcc
, withISpin ? true, tk, swarm, graphviz }:
let
@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
};
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ yacc ];
buildInputs = [ bison ];
sourceRoot = "Spin/Src${version}";

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, yacc }:
{ lib, stdenv, fetchurl, bison }:
stdenv.mkDerivation rec {
name = "jam-2.6.1";
@ -8,7 +8,7 @@ stdenv.mkDerivation rec {
sha256 = "19xkvkpycxfsncxvin6yqrql3x3z9ypc1j8kzls5k659q4kv5rmc";
};
nativeBuildInputs = [ yacc ];
nativeBuildInputs = [ bison ];
preConfigure = ''
unset AR

View File

@ -1,4 +1,4 @@
{lib, stdenv, fetchurl, yacc, flex, readline, ncurses, gnused}:
{lib, stdenv, fetchurl, bison, flex, readline, ncurses, gnused}:
stdenv.mkDerivation {
name = "cdecl-2.5";
@ -14,7 +14,7 @@ stdenv.mkDerivation {
makeFlags="$makeFlags PREFIX=$out BINDIR=$out/bin MANDIR=$out/man1 CATDIR=$out/cat1 CC=$CC";
mkdir -p $out/bin;
'';
buildInputs = [yacc flex readline ncurses];
buildInputs = [bison flex readline ncurses];
meta = {
description = "Translator English -- C/C++ declarations";

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, yacc, flex, libusb-compat-0_1, libelf, libftdi1, readline
{ lib, stdenv, fetchurl, bison, flex, libusb-compat-0_1, libelf, libftdi1, readline
# docSupport is a big dependency, disabled by default
, docSupport ? false, texLive ? null, texinfo ? null, texi2html ? null
}:
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
configureFlags = lib.optionals docSupport "--enable-doc";
buildInputs = [ yacc flex libusb-compat-0_1 libelf libftdi1 readline ]
buildInputs = [ bison flex libusb-compat-0_1 libelf libftdi1 readline ]
++ lib.optionals docSupport [ texLive texinfo texi2html ];
meta = with lib; {

View File

@ -44,8 +44,8 @@ runCommand "Toolchains" {} (''
fi
done
ln -s ${buildPackages.yacc}/bin/yacc $toolchain/bin/yacc
ln -s ${buildPackages.yacc}/bin/bison $toolchain/bin/bison
ln -s ${buildPackages.bison}/bin/yacc $toolchain/bin/yacc
ln -s ${buildPackages.bison}/bin/bison $toolchain/bin/bison
ln -s ${buildPackages.flex}/bin/flex $toolchain/bin/flex
ln -s ${buildPackages.flex}/bin/flex++ $toolchain/bin/flex++
ln -s $toolchain/bin/flex $toolchain/bin/lex

View File

@ -1,4 +1,4 @@
{ stdenv, stdenvNoCC, fetchcvs, lib, groff, mandoc, zlib, yacc, flex
{ stdenv, stdenvNoCC, fetchcvs, lib, groff, mandoc, zlib, bison, flex
, writeText, buildPackages, splicePackages, symlinkJoin }:
let
@ -563,7 +563,7 @@ let
sha256 = "0630lbvz6v4ic13bfg8ccwfhqkgcv76bfdw9f36rfsnwfgpxqsmq";
meta.platforms = lib.platforms.netbsd;
nativeBuildInputs = [ makeMinimal install mandoc groff flex
yacc genassym gencat lorder tsort stat ];
bison genassym gencat lorder tsort stat ];
extraPaths = [ sys.src ld_elf_so.src ];
};
@ -587,7 +587,7 @@ let
librpcsvc.src libutil.src librt.src libcrypt.src ];
buildInputs = [ buildPackages.netbsd.headers csu ];
nativeBuildInputs = [ makeMinimal install mandoc groff flex
yacc genassym gencat lorder tsort stat ];
bison genassym gencat lorder tsort stat ];
NIX_CFLAGS_COMPILE = "-B${csu}/lib";
meta.platforms = lib.platforms.netbsd;
SHLIBINSTALLDIR = "$(out)/lib";

View File

@ -1,4 +1,4 @@
{ lib, appleDerivation, fetchzip, bsdmake, perl, flex, yacc
{ lib, appleDerivation, fetchzip, bsdmake, perl, flex, bison
}:
# this derivation sucks
@ -16,7 +16,7 @@ let recentAdvCmds = fetchzip {
};
in appleDerivation {
nativeBuildInputs = [ bsdmake perl yacc flex ];
nativeBuildInputs = [ bsdmake perl bison flex ];
buildInputs = [ flex ];
patchPhase = ''

View File

@ -1,7 +1,7 @@
{ lib, stdenv, appleDerivation, yacc, flex }:
{ lib, stdenv, appleDerivation, bison, flex }:
appleDerivation {
nativeBuildInputs = [ yacc flex ];
nativeBuildInputs = [ bison flex ];
buildPhase = ''
cd migcom.tproj

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, pam, yacc, flex }:
{ lib, stdenv, fetchurl, fetchpatch, pam, bison, flex }:
stdenv.mkDerivation rec {
pname = "libcgroup";
@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "0lgvyq37gq84sk30sg18admxaj0j0p5dq3bl6g74a1ppgvf8pqz4";
};
buildInputs = [ pam yacc flex ];
buildInputs = [ pam bison flex ];
patches = [
(fetchpatch {

View File

@ -1,5 +1,5 @@
{ config, lib, stdenv, fetchurl
, yacc, flex
, bison, flex
, sysfsutils, kmod, udev
, firmware ? config.pcmciaUtils.firmware or [] # Special pcmcia cards.
, configOpts ? config.pcmciaUtils.config or null # Special hardware (map memory & port & irq)
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
sha256 = "0sfm3w2n73kl5w7gb1m6q8gy5k4rgwvzz79n6yhs9w3sag3ix8sk";
};
buildInputs = [udev yacc sysfsutils kmod flex];
buildInputs = [udev bison sysfsutils kmod flex];
patchPhase = ''
sed -i "

View File

@ -1,4 +1,4 @@
{ lib, stdenv, kernel, fetchFromGitHub, autoreconfHook, yacc, flex, p7zip, rsync }:
{ lib, stdenv, kernel, fetchFromGitHub, autoreconfHook, bison, flex, p7zip, rsync }:
assert kernel != null -> lib.versionAtLeast kernel.version "4.0";
@ -7,7 +7,7 @@ let
in stdenv.mkDerivation {
pname = "ply";
inherit version;
nativeBuildInputs = [ autoreconfHook flex yacc p7zip rsync ];
nativeBuildInputs = [ autoreconfHook flex bison p7zip rsync ];
src = fetchFromGitHub {
owner = "iovisor";

View File

@ -1,5 +1,5 @@
{ lib, stdenv, buildPackages, fetchurl, which, autoconf, automake, flex
, yacc , glibc, perl, libkrb5, libxslt, docbook_xsl, file
, bison , glibc, perl, libkrb5, libxslt, docbook_xsl, file
, docbook_xml_dtd_43, libtool_2
, withDevdoc ? false, doxygen, dblatex # Extra developer documentation
, ncurses # Extra ncurses utilities. Needed for debugging and monitoring.
@ -16,7 +16,7 @@ in stdenv.mkDerivation {
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ autoconf automake flex libxslt libtool_2 perl
which yacc ] ++ optionals withDevdoc [ doxygen dblatex ];
which bison ] ++ optionals withDevdoc [ doxygen dblatex ];
buildInputs = [ libkrb5 ncurses ];

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, which, autoconf, automake, flex, yacc
{ lib, stdenv, fetchurl, which, autoconf, automake, flex, bison
, kernel, glibc, perl, libtool_2, libkrb5, fetchpatch }:
with (import ./srcs.nix {
@ -13,7 +13,7 @@ in stdenv.mkDerivation {
name = "openafs-${version}-${kernel.modDirVersion}";
inherit version src;
nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ]
nativeBuildInputs = [ autoconf automake flex libtool_2 perl which bison ]
++ kernel.moduleBuildDependencies;
buildInputs = [ libkrb5 ];

View File

@ -1,5 +1,5 @@
{ lib, stdenv, buildPackages, fetchurl, which, autoconf, automake, flex
, yacc , glibc, perl, libkrb5, libxslt, docbook_xsl, file
, bison , glibc, perl, libkrb5, libxslt, docbook_xsl, file
, docbook_xml_dtd_43, libtool_2
, withDevdoc ? false, doxygen, dblatex # Extra developer documentation
, ncurses # Extra ncurses utilities. Needed for debugging and monitoring.
@ -16,7 +16,7 @@ in stdenv.mkDerivation {
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ autoconf automake flex libxslt libtool_2 perl
which yacc ] ++ optionals withDevdoc [ doxygen dblatex ];
which bison ] ++ optionals withDevdoc [ doxygen dblatex ];
buildInputs = [ libkrb5 ncurses ];

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, which, autoconf, automake, flex, yacc
{ lib, stdenv, fetchurl, which, autoconf, automake, flex, bison
, kernel, glibc, perl, libtool_2, libkrb5, fetchpatch }:
with (import ./srcs.nix {
@ -13,7 +13,7 @@ in stdenv.mkDerivation {
name = "openafs-${version}-${kernel.modDirVersion}";
inherit version src;
nativeBuildInputs = [ autoconf automake flex libtool_2 perl which yacc ]
nativeBuildInputs = [ autoconf automake flex libtool_2 perl which bison ]
++ kernel.moduleBuildDependencies;
buildInputs = [ libkrb5 ];

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, m4, yacc }:
{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, m4, bison }:
let
openbsd_version =
@ -21,7 +21,7 @@ in stdenv.mkDerivation rec {
sha256 = "sha256-TKs6tt/SCWes6kYAGIrSShZgOLf7xKh26xG3Zk7wCCw=";
};
nativeBuildInputs = [ autoconf automake libtool m4 yacc ];
nativeBuildInputs = [ autoconf automake libtool m4 bison ];
preConfigure = ''
mkdir ./openbsd

View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, lib, autoreconfHook, yacc, flex }:
{ stdenv, fetchFromGitHub, lib, autoreconfHook, bison, flex }:
stdenv.mkDerivation rec {
pname = "pim6sd";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
sha256 = "0x7dyark2mp9xqz9cnmmgaf0z143vxn2835clllpji4ylg77zdjw";
};
nativeBuildInputs = [ autoreconfHook yacc flex ];
nativeBuildInputs = [ autoreconfHook bison flex ];
meta = with lib; {
description = "PIM for IPv6 sparse mode daemon";

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, readline, yacc }:
{ lib, stdenv, fetchurl, readline, bison }:
let
version = "0.9.1";
@ -20,7 +20,7 @@ stdenv.mkDerivation {
sourceRoot=.
'';
buildInputs = [ readline yacc ];
buildInputs = [ readline bison ];
configureFlags = [ "--with-readline" ];

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, fetchurl, fetchpatch
, autoreconfHook, bison, glm, yacc, flex
, autoreconfHook, bison, glm, flex
, freeglut, ghostscriptX, imagemagick, fftw
, boehmgc, libGLU, libGL, mesa, ncurses, readline, gsl, libsigsegv
, python3Packages
@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
autoreconfHook
bison
flex
yacc
bison
texinfo
];

View File

@ -2,7 +2,7 @@
{ lib, stdenv, fetchFromGitLab, autoreconfHook, pkg-config, cairo, expat, flex
, fontconfig, gd, gettext, gts, libdevil, libjpeg, libpng, libtool, pango
, yacc, fetchpatch, xorg ? null, ApplicationServices }:
, bison, fetchpatch, xorg ? null, ApplicationServices }:
let
inherit (lib) optional optionals optionalString;
@ -37,7 +37,7 @@ stdenv.mkDerivation {
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [
libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex pango
libpng libjpeg expat bison libtool fontconfig gd gts libdevil flex pango
gettext
] ++ optionals (xorg != null) (with xorg; [ libXrender libXaw libXpm ])
++ optionals (stdenv.isDarwin) [ ApplicationServices ];

View File

@ -25,7 +25,7 @@
, libarchive
, libcap
, bzip2
, yacc
, bison
, libxslt
, docbook-xsl-nons
, docbook_xml_dtd_42
@ -74,7 +74,7 @@ in stdenv.mkDerivation rec {
gobject-introspection
which
makeWrapper
yacc
bison
libxslt
docbook-xsl-nons
docbook_xml_dtd_42

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, yacc, lzo, db4 }:
{ lib, stdenv, fetchurl, bison, lzo, db4 }:
stdenv.mkDerivation rec {
name = "netboot-0.10.2";
@ -7,7 +7,7 @@ stdenv.mkDerivation rec {
sha256 = "09w09bvwgb0xzn8hjz5rhi3aibysdadbg693ahn8rylnqfq4hwg0";
};
buildInputs = [ yacc lzo db4 ];
buildInputs = [ bison lzo db4 ];
hardeningDisable = [ "format" ];

View File

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub
, autoconf, automake, libtool, pkg-config
, bzip2, libpcap, flex, yacc }:
, bzip2, libpcap, flex, bison }:
let version = "1.6.22"; in
@ -15,7 +15,7 @@ stdenv.mkDerivation {
sha256 = "14x2k85ard1kp99hhd90zsmvyw24g03m84rn13gb4grm9gjggzrj";
};
nativeBuildInputs = [ autoconf automake flex libtool pkg-config yacc ];
nativeBuildInputs = [ autoconf automake flex libtool pkg-config bison ];
buildInputs = [ bzip2 libpcap ];
preConfigure = ''

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchpatch, openssl, lzo, zlib, yacc, flex }:
{ lib, stdenv, fetchurl, fetchpatch, openssl, lzo, zlib, bison, flex }:
stdenv.mkDerivation rec {
name = "vtun-3.0.4";
@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
sed -i -e 's/-m 755//' -e 's/-o root -g 0//' Makefile.in
sed -i '/strip/d' Makefile.in
'';
buildInputs = [ lzo openssl zlib yacc flex ];
buildInputs = [ lzo openssl zlib bison flex ];
configureFlags = [
"--with-lzo-headers=${lzo}/include/lzo"

View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, autoreconfHook, yacc, flex}:
{ lib, stdenv, fetchurl, autoreconfHook, bison, flex}:
stdenv.mkDerivation rec {
version = "2.4.1";
@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
doCheck = true;
nativeBuildInputs = [ autoreconfHook yacc flex ];
nativeBuildInputs = [ autoreconfHook bison flex ];
configureFlags = [ "--sysconfdir=/etc" ];

View File

@ -1,5 +1,5 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, pkg-config, glib, syslogng
, eventlog, perl, python, yacc, protobufc, libivykis, libcap, czmq
, eventlog, perl, python, bison, protobufc, libivykis, libcap, czmq
}:
stdenv.mkDerivation rec {
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
sha256 = "17y85cqcyfbp882gaii731cvz5bg1s8rgda271jh6kgnrz5rbd4s";
};
nativeBuildInputs = [ pkg-config autoreconfHook yacc ];
nativeBuildInputs = [ pkg-config autoreconfHook bison ];
buildInputs = [
glib syslogng eventlog perl python protobufc libivykis libcap czmq

View File

@ -829,12 +829,14 @@ mapAliases ({
xlibs = xorg; # added 2015-09
xpraGtk3 = xpra; # added 2018-09-13
xv = xxv; # added 2020-02-22
yacc = bison; # moved from top-level 2021-03-14
youtubeDL = youtube-dl; # added 2014-10-26
ytop = throw "ytop has been abandoned by upstream. Consider switching to bottom instead";
yubikey-neo-manager = throw "yubikey-neo-manager has been removed because it was broken. Use yubikey-manager-qt instead."; # added 2021-03-08
yuzu = yuzu-mainline; # added 2021-01-25
zimreader = throw "zimreader has been removed from nixpkgs as it has been replaced by kiwix-serve and stopped working with modern zimlib versions."; # added 2021-03-28
zdfmediathk = mediathekview; # added 2019-01-19
gnome_user_docs = gnome-user-docs; # added 2019-11-20
# spidermonkey is not ABI upwards-ompatible, so only allow this for nix-shell
spidermonkey = spidermonkey_78; # added 2020-10-09

View File

@ -12256,7 +12256,6 @@ in
});
bison = callPackage ../development/tools/parsing/bison { };
yacc = bison; # TODO: move to aliases.nix
# Ruby fails to build with current bison
bison_3_5 = pkgs.bison.overrideAttrs (oldAttrs: rec {