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
42 changed files with 83 additions and 82 deletions

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