diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-09-27 22:06:38 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-09-27 22:06:38 +0200 |
| commit | 55f0336630a1ed63e6c49985df50dc5d5684b856 (patch) | |
| tree | 4ae22efdc5b02ec11eafea6459666472fdc990f0 /gnu/packages | |
| parent | d6f10ca3fe56709d9a43d3d7e0bfda73e9affa3a (diff) | |
| download | guix-55f0336630a1ed63e6c49985df50dc5d5684b856.tar guix-55f0336630a1ed63e6c49985df50dc5d5684b856.tar.gz | |
gnu: bison: Update to 3.0.
* gnu/packages/bison.scm (bison): Update to 3.0. Make Perl a native
input. Add a variant of Flex as a native input. Use #:export instead
of 'define-public'.
* gnu/packages/flex.scm (flex): Use #:export instead of 'define-public'.
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/bison.scm | 25 | ||||
| -rw-r--r-- | gnu/packages/flex.scm | 7 |
2 files changed, 23 insertions, 9 deletions
diff --git a/gnu/packages/bison.scm b/gnu/packages/bison.scm index 58ff3b9b5c..eafce34b52 100644 --- a/gnu/packages/bison.scm +++ b/gnu/packages/bison.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -22,12 +22,15 @@ #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (gnu packages m4) - #:use-module (gnu packages perl)) + #:use-module (gnu packages perl) + #:use-module (gnu packages flex) + #:use-module (srfi srfi-1) + #:export (bison)) -(define-public bison +(define bison (package (name "bison") - (version "2.7.1") + (version "3.0") (source (origin (method url-fetch) @@ -35,9 +38,19 @@ version ".tar.xz")) (sha256 (base32 - "1yx7isx67sdmyijvihgyra1f59fwdz7sqriginvavfj5yb5ss2dl")))) + "1j14fqgi9wzqgsy4fhkcdrv4hv6rrvhvn84axs520w9b022mbb79")))) (build-system gnu-build-system) - (inputs `(("perl" ,perl))) + (native-inputs `(("perl" ,perl) + + ;; We need Flex for the test suite, and Flex needs Bison. + ;; To break the cycle, we remove Bison from the inputs of + ;; Flex, and disable Flex's test suite, since it requires + ;; Bison. + ("flex" ,(package (inherit flex) + (arguments '(#:tests? #f)) + (inputs + (alist-delete "bison" + (package-inputs flex))))))) (propagated-inputs `(("m4" ,m4))) (home-page "http://www.gnu.org/software/bison/") (synopsis "Parser generator") diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm index 5548dcf05d..beddb620a7 100644 --- a/gnu/packages/flex.scm +++ b/gnu/packages/flex.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -24,9 +24,10 @@ #:use-module (gnu packages) #:use-module (gnu packages m4) #:use-module (gnu packages bison) - #:use-module (gnu packages indent)) + #:use-module (gnu packages indent) + #:export (flex)) -(define-public flex +(define flex (package (name "flex") (version "2.5.37") |