me/guix
Archived
1
0
Fork 0
Code Activity

gnu: bison: Update to 3.0.

Browse source 
* 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'.
This commit is contained in:
Ludovic Courtès 2013-09-27 22:06:38 +02:00
parent d6f10ca3fe
commit 55f0336630
2 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
gnu/packages/bison.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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. ;;; This file is part of GNU Guix.
;;; ;;;
@ -22,12 +22,15 @@
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (gnu packages m4) #: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 (package
(name "bison") (name "bison")
(version "2.7.1") (version "3.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -35,9 +38,19 @@
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1yx7isx67sdmyijvihgyra1f59fwdz7sqriginvavfj5yb5ss2dl")))) "1j14fqgi9wzqgsy4fhkcdrv4hv6rrvhvn84axs520w9b022mbb79"))))
(build-system gnu-build-system) (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))) (propagated-inputs `(("m4" ,m4)))
(home-page "http://www.gnu.org/software/bison/") (home-page "http://www.gnu.org/software/bison/")
(synopsis "Parser generator") (synopsis "Parser generator")

7
gnu/packages/flex.scm
View file

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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. ;;; This file is part of GNU Guix.
;;; ;;;
@ -24,9 +24,10 @@
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages m4) #:use-module (gnu packages m4)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
#:use-module (gnu packages indent)) #:use-module (gnu packages indent)
#:export (flex))
(define-public flex (define flex
(package (package
(name "flex") (name "flex")
(version "2.5.37") (version "2.5.37")