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

bison: use version 2.3 by default (the latest)

Browse Source 
svn path=/nixpkgs/trunk/; revision=12703
This commit is contained in:
Peter Simons 2008-08-25 13:25:07 +00:00
parent 0ee3317bc5
commit 2d7a15266f
1 changed files with 28 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -530,7 +530,7 @@ let pkgs = rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
convertlit = import ../tools/text/convertlit { convertlit = import ../tools/text/convertlit {
inherit fetchurl stdenv unzip libtommath; inherit fetchurl stdenv unzip libtommath;
}; };
@ -794,9 +794,8 @@ let pkgs = rec {
/* /*
hyppocampusFun = lib.sumArgs ( selectVersion ../tools/misc/hyppocampus "0.3rc1") { hyppocampusFun = lib.sumArgs ( selectVersion ../tools/misc/hyppocampus "0.3rc1") {
inherit builderDefs stdenv fetchurl libdbi libdbiDrivers fuse inherit builderDefs stdenv fetchurl libdbi libdbiDrivers fuse
pkgconfig perl gettext dbus dbus_glib pcre libscd; pkgconfig perl gettext dbus dbus_glib pcre libscd bison;
inherit (gtkLibs) glib; inherit (gtkLibs) glib;
bison = bison23;
flex = flex2533; flex = flex2533;
}; };
*/ */
@ -885,9 +884,8 @@ let pkgs = rec {
}; };
mdbtools = builderDefsPackage (selectVersion ../tools/misc/mdbtools "0.6-pre1") { mdbtools = builderDefsPackage (selectVersion ../tools/misc/mdbtools "0.6-pre1") {
inherit readline pkgconfig; inherit readline pkgconfig bison;
inherit (gtkLibs) glib; inherit (gtkLibs) glib;
bison = bison23;
flex = flex2535; flex = flex2535;
}; };
@ -1167,8 +1165,7 @@ let pkgs = rec {
}; };
ttmkfdir = import ../tools/misc/ttmkfdir { ttmkfdir = import ../tools/misc/ttmkfdir {
inherit debPackage freetype fontconfig libunwind libtool; inherit debPackage freetype fontconfig libunwind libtool bison;
bison = bison23;
flex = flex2534; flex = flex2534;
}; };
@ -1263,13 +1260,11 @@ let pkgs = rec {
bash = lowPrio (useFromStdenv "bash" bash = lowPrio (useFromStdenv "bash"
(import ../shells/bash { (import ../shells/bash {
inherit fetchurl stdenv; inherit fetchurl stdenv bison;
bison = bison23;
})); }));
bashInteractive = appendToName "interactive" (import ../shells/bash/new.nix { bashInteractive = appendToName "interactive" (import ../shells/bash/new.nix {
inherit fetchurl stdenv ncurses texinfo; inherit fetchurl stdenv ncurses texinfo bison;
bison = bison23;
interactive = true; interactive = true;
}); });
@ -1716,8 +1711,7 @@ let pkgs = rec {
llvmGCC = builderDefsPackage (import ../development/compilers/llvm/llvm-gcc.nix) { llvmGCC = builderDefsPackage (import ../development/compilers/llvm/llvm-gcc.nix) {
flex=flex2535; flex=flex2535;
bison=bison23; inherit llvm perl libtool bison;
inherit llvm perl libtool;
}; };
mono = import ../development/compilers/mono { mono = import ../development/compilers/mono {
@ -1889,7 +1883,7 @@ let pkgs = rec {
clisp = import ../development/interpreters/clisp { clisp = import ../development/interpreters/clisp {
inherit fetchurl stdenv libsigsegv gettext inherit fetchurl stdenv libsigsegv gettext
readline ncurses coreutils pcre zlib; readline ncurses coreutils pcre zlib;
inherit (xlibs) libX11 libXau libXt xproto inherit (xlibs) libX11 libXau libXt xproto
libXpm libXext xextproto; libXpm libXext xextproto;
}; };
@ -2121,7 +2115,7 @@ let pkgs = rec {
inherit fetchurl stdenv noSysDirs; inherit fetchurl stdenv noSysDirs;
}); });
bison = bison1875; bison = bison23;
bison1875 = import ../development/tools/parsing/bison/bison-1.875.nix { bison1875 = import ../development/tools/parsing/bison/bison-1.875.nix {
inherit fetchurl stdenv m4; inherit fetchurl stdenv m4;
@ -2418,11 +2412,10 @@ let pkgs = rec {
}; };
xxdiff = builderDefsPackage (selectVersion ../development/tools/misc/xxdiff "3.2") { xxdiff = builderDefsPackage (selectVersion ../development/tools/misc/xxdiff "3.2") {
bison = bison23;
flex = flex2535; flex = flex2535;
qt = qt3; qt = qt3;
python = python25; python = python25;
inherit pkgconfig makeWrapper; inherit pkgconfig makeWrapper bison;
inherit (xlibs) libXext libX11; inherit (xlibs) libXext libX11;
}; };
@ -2560,7 +2553,7 @@ let pkgs = rec {
clppcre = builderDefsPackage (import ../development/libraries/cl-ppcre) { clppcre = builderDefsPackage (import ../development/libraries/cl-ppcre) {
}; };
cluceneCore = (import ../development/libraries/clucene-core) { cluceneCore = (import ../development/libraries/clucene-core) {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
@ -3005,8 +2998,8 @@ let pkgs = rec {
inherit stdenv fetchurl builderDefs; inherit stdenv fetchurl builderDefs;
}; };
libdbiDriversBase = composedArgsAndFun libdbiDriversBase = composedArgsAndFun
(selectVersion ../development/libraries/libdbi-drivers "0.8.2-1") (selectVersion ../development/libraries/libdbi-drivers "0.8.2-1")
{ {
inherit stdenv fetchurl builderDefs libdbi; inherit stdenv fetchurl builderDefs libdbi;
}; };
@ -3144,7 +3137,7 @@ let pkgs = rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
liboil = composedArgsAndFun liboil = composedArgsAndFun
(selectVersion ../development/libraries/liboil "0.3.13") { (selectVersion ../development/libraries/liboil "0.3.13") {
inherit fetchurl stdenv pkgconfig; inherit fetchurl stdenv pkgconfig;
inherit (gtkLibs) glib; inherit (gtkLibs) glib;
@ -3556,9 +3549,8 @@ let pkgs = rec {
inherit freetype fontconfig gettext gperf curl inherit freetype fontconfig gettext gperf curl
libjpeg libtiff libpng libxml2 libxslt sqlite libjpeg libtiff libpng libxml2 libxslt sqlite
icu cairo perl intltool automake libtool icu cairo perl intltool automake libtool
pkgconfig autoconf; pkgconfig autoconf bison;
flex = flex2535; flex = flex2535;
bison = bison23;
}; };
wxGTK = wxGTK26; wxGTK = wxGTK26;
@ -4548,9 +4540,8 @@ let pkgs = rec {
}; };
dict = composedArgsAndFun (selectVersion ../servers/dict "1.9.15") { dict = composedArgsAndFun (selectVersion ../servers/dict "1.9.15") {
inherit builderDefs which; inherit builderDefs which bison;
flex=flex2534; flex=flex2534;
bison=bison23;
}; };
dictdDBs = recurseIntoAttrs (import ../servers/dict/dictd-db.nix { dictdDBs = recurseIntoAttrs (import ../servers/dict/dictd-db.nix {
@ -4794,8 +4785,7 @@ let pkgs = rec {
}; };
gpm = builderDefsPackage (selectVersion ../servers/gpm "1.20.3pre6") { gpm = builderDefsPackage (selectVersion ../servers/gpm "1.20.3pre6") {
inherit lzma ncurses; inherit lzma ncurses bison;
bison = bison23;
flex = flex2535; flex = flex2535;
}; };
@ -5219,13 +5209,12 @@ let pkgs = rec {
# State Nix # State Nix
snix = import ../tools/package-management/snix { snix = import ../tools/package-management/snix {
inherit fetchurl stdenv perl curl bzip2 openssl; inherit fetchurl stdenv perl curl bzip2 openssl bison;
inherit libtool automake autoconf docbook5 docbook5_xsl libxslt docbook_xml_dtd_43 w3m; inherit libtool automake autoconf docbook5 docbook5_xsl libxslt docbook_xml_dtd_43 w3m;
aterm = aterm242fixes; aterm = aterm242fixes;
db4 = db45; db4 = db45;
bison = bison23;
flex = flex2533; flex = flex2533;
inherit ext3cowtools e3cfsprogs rsync; inherit ext3cowtools e3cfsprogs rsync;
@ -6483,10 +6472,9 @@ let pkgs = rec {
expat pkgconfig freetype fontconfig libwpd libxml2 expat pkgconfig freetype fontconfig libwpd libxml2
db4 sablotron curl libsndfile flex zip unzip libmspack db4 sablotron curl libsndfile flex zip unzip libmspack
getopt file neon cairo which icu boost jdk ant hsqldb getopt file neon cairo which icu boost jdk ant hsqldb
cups openssl; cups openssl bison;
inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama; inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
bison = bison23;
}; };
opera = import ../applications/networking/browsers/opera { opera = import ../applications/networking/browsers/opera {
@ -6558,7 +6546,7 @@ let pkgs = rec {
stdenv = overrideGCC stdenv gcc34; stdenv = overrideGCC stdenv gcc34;
}; };
qemuImage = composedArgsAndFun qemuImage = composedArgsAndFun
(selectVersion ../applications/virtualization/qemu/linux-img "0.2") { (selectVersion ../applications/virtualization/qemu/linux-img "0.2") {
inherit builderDefs fetchurl stdenv; inherit builderDefs fetchurl stdenv;
}; };
@ -6981,7 +6969,7 @@ let pkgs = rec {
xnee = builderDefsPackage (import ../tools/X11/xnee) { xnee = builderDefsPackage (import ../tools/X11/xnee) {
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
inherit (xlibs) libX11 libXtst xextproto libXext inherit (xlibs) libX11 libXtst xextproto libXext
inputproto libXi xproto recordproto; inputproto libXi xproto recordproto;
inherit pkgconfig; inherit pkgconfig;
}; };
@ -6998,12 +6986,11 @@ let pkgs = rec {
qgis_svn = import ../applications/misc/qgis_svn { qgis_svn = import ../applications/misc/qgis_svn {
inherit mkDerivationByConfiguration fetchsvn stdenv flex lib inherit mkDerivationByConfiguration fetchsvn stdenv flex lib
ncurses fetchurl perl cmake gdal geos proj x11 ncurses fetchurl perl cmake gdal geos proj x11
gsl libpng zlib gsl libpng zlib bison
sqlite glibc fontconfig freetype / * use libc from stdenv ? - to lazy now - Marc * /; sqlite glibc fontconfig freetype / * use libc from stdenv ? - to lazy now - Marc * /;
inherit (xlibs) libSM libXcursor libXinerama libXrandr libXrender; inherit (xlibs) libSM libXcursor libXinerama libXrandr libXrender;
inherit (xorg) libICE; inherit (xorg) libICE;
qt = qt4; qt = qt4;
bison = bison23;
# optional features # optional features
# grass = "not yet supported" # cmake -D WITH_GRASS=TRUE and GRASS_PREFX=.. # grass = "not yet supported" # cmake -D WITH_GRASS=TRUE and GRASS_PREFX=..
@ -7041,8 +7028,7 @@ let pkgs = rec {
exultSnapshot = lowPrio (import ../games/exult/snapshot.nix { exultSnapshot = lowPrio (import ../games/exult/snapshot.nix {
inherit fetchurl stdenv SDL SDL_mixer zlib libpng unzip inherit fetchurl stdenv SDL SDL_mixer zlib libpng unzip
autoconf automake libtool flex; autoconf automake libtool flex bison;
bison = bison23;
}); });
fsg = import ../games/fsg { fsg = import ../games/fsg {
@ -7065,7 +7051,7 @@ let pkgs = rec {
}; };
lincity = builderDefsPackage (import ../games/lincity) { lincity = builderDefsPackage (import ../games/lincity) {
inherit (xlibs) libX11 libXext xextproto inherit (xlibs) libX11 libXext xextproto
libICE libSM xproto; libICE libSM xproto;
inherit libpng zlib; inherit libpng zlib;
}; };
@ -7169,10 +7155,9 @@ let pkgs = rec {
xf86vidmodeproto xineramaproto xproto libICE libX11 libXau libXcomposite xf86vidmodeproto xineramaproto xproto libICE libX11 libXau libXcomposite
libXcursor libXdamage libXdmcp libXext libXfixes libXft libXi libXpm libXcursor libXdamage libXdmcp libXext libXfixes libXft libXi libXpm
libXrandr libXrender libXScrnSaver libXt libXtst libXv libXxf86misc libXrandr libXrender libXScrnSaver libXt libXtst libXv libXxf86misc
libxkbfile libXinerama; libxkbfile libXinerama bison;
inherit (gtkLibs) glib; inherit (gtkLibs) glib;
qt = qt4; qt = qt4;
bison = bison23;
openexr = openexr_1_6_1 ; openexr = openexr_1_6_1 ;
}); });
@ -7355,8 +7340,7 @@ let pkgs = rec {
nixCustomFun = src: preConfigure: enableScripts: configureFlags: nixCustomFun = src: preConfigure: enableScripts: configureFlags:
import ../tools/package-management/nix/custom.nix { import ../tools/package-management/nix/custom.nix {
inherit fetchurl stdenv perl curl bzip2 openssl src preConfigure automake inherit fetchurl stdenv perl curl bzip2 openssl src preConfigure automake
autoconf libtool configureFlags enableScripts lib; autoconf libtool configureFlags enableScripts lib bison;
bison = bison23;
flex = flex2533; flex = flex2533;
aterm = aterm242fixes; aterm = aterm242fixes;
db4 = db45; db4 = db45;
@ -7457,9 +7441,8 @@ let pkgs = rec {
gd t1lib freetype icu perl ruby expat curl gd t1lib freetype icu perl ruby expat curl
libjpeg; libjpeg;
inherit (xlibs) libXaw libX11 xproto libXt libXpm inherit (xlibs) libXaw libX11 xproto libXt libXpm
libXmu libXext xextproto libSM libICE; libXmu libXext xextproto libSM libICE bison;
flex = flex2535; flex = flex2535;
bison = bison23;
ghostscript = ghostscriptX; ghostscript = ghostscriptX;
}; };
@ -7475,7 +7458,7 @@ let pkgs = rec {
You need to use texLiveAggregationFun to regenerate, say, ls-R (TeX-related file list) You need to use texLiveAggregationFun to regenerate, say, ls-R (TeX-related file list)
Just installing a few packages doesn't work. Just installing a few packages doesn't work.
*/ */
texLiveAggregationFun = texLiveAggregationFun =
(builderDefsPackage (import ../misc/tex/texlive/aggregate.nix)); (builderDefsPackage (import ../misc/tex/texlive/aggregate.nix));
texLiveContext = builderDefsPackage (import ../misc/tex/texlive/context.nix) { texLiveContext = builderDefsPackage (import ../misc/tex/texlive/context.nix) {