From 9249f4c892878f65e871b6ab2442be0f78f5d24d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 30 Jan 2004 15:52:17 +0000 Subject: [PATCH] * Bleeding edge Bison. svn path=/nixpkgs/trunk/; revision=730 --- .../development/tools/parsing/bison/bison-new.nix | 15 +++++++++++++++ .../tools/parsing/bison/builder-new.sh | 10 ++++++++++ pkgs/system/all-packages-generic.nix | 6 ++++++ pkgs/system/populate-cache.nix | 1 + 4 files changed, 32 insertions(+) create mode 100644 pkgs/development/tools/parsing/bison/bison-new.nix create mode 100755 pkgs/development/tools/parsing/bison/builder-new.sh diff --git a/pkgs/development/tools/parsing/bison/bison-new.nix b/pkgs/development/tools/parsing/bison/bison-new.nix new file mode 100644 index 000000000000..b8e3596e7943 --- /dev/null +++ b/pkgs/development/tools/parsing/bison/bison-new.nix @@ -0,0 +1,15 @@ +{stdenv, fetchurl, m4}: + +assert !isNull m4; + +derivation { + name = "bison-1.875c"; + system = stdenv.system; + builder = ./builder-new.sh; + src = fetchurl { + url = ftp://alpha.gnu.org/pub/gnu/bison/bison-1.875c.tar.gz; + md5 = "bba317725fc84013b9d0a6b2576dfaa7"; + }; + stdenv = stdenv; + m4 = m4; +} diff --git a/pkgs/development/tools/parsing/bison/builder-new.sh b/pkgs/development/tools/parsing/bison/builder-new.sh new file mode 100755 index 000000000000..42c191e3544e --- /dev/null +++ b/pkgs/development/tools/parsing/bison/builder-new.sh @@ -0,0 +1,10 @@ +#! /bin/sh + +buildinputs="$m4" +. $stdenv/setup || exit 1 + +tar xvfz $src || exit 1 +cd bison-* || exit 1 +./configure --prefix=$out || exit 1 +make || exit 1 +make install || exit 1 diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index f18aba276fb2..a582e1e8f5ce 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -203,6 +203,12 @@ m4 = gnum4; }; + bisonnew = (import ../development/tools/parsing/bison/bison-new.nix) { + fetchurl = fetchurl; + stdenv = stdenv; + m4 = gnum4; + }; + flex = (import ../development/tools/parsing/flex) { fetchurl = fetchurl; stdenv = stdenv; diff --git a/pkgs/system/populate-cache.nix b/pkgs/system/populate-cache.nix index b4aa946109cb..e37dba6661af 100644 --- a/pkgs/system/populate-cache.nix +++ b/pkgs/system/populate-cache.nix @@ -4,6 +4,7 @@ let { [ pkgs.zip pkgs.unzip pkgs.valgrind + pkgs.bisonnew pkgs.flexnew pkgs.par2cmdline pkgs.cksfv