From 93fabf59962aeb15981bd547850de1dab69eccfb Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 15 May 2017 16:50:32 -0400 Subject: gnu: flex: Update to 2.6.4. * gnu/packages/flex.scm (flex): Update to 2.6.4. --- gnu/packages/flex.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/flex.scm') diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm index 1470b967da..ab0d8c583d 100644 --- a/gnu/packages/flex.scm +++ b/gnu/packages/flex.scm @@ -32,16 +32,16 @@ (define-public flex (package (name "flex") - (version "2.6.3") + (version "2.6.4") (source (origin (method url-fetch) (uri (string-append "https://github.com/westes/flex" "/releases/download/v" version "/" - "flex-" version ".tar.gz")) + "flex-" version ".tar.lz")) (sha256 (base32 - "1an2cn2z85mkpgqcinh1fhhcd7993qm2lil1yxic8iz76ci79ck8")))) + "19sc63m09zamy2qlw5x3sg6wb6hrw96gfl0h87vh6flvsqjg9m3g")))) (build-system gnu-build-system) (inputs (let ((bison-for-tests -- cgit v1.2.3 From 5e54f4adda6b636b03b252804565f4d845d03658 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Mon, 15 May 2017 16:51:01 -0400 Subject: gnu: flex-2.6.1: Remove variable. * gnu/packages/flex.scm (flex-2.6.1): Remove variable. * gnu/packages/bootloaders.scm (grub, dtc): Use flex instead of flex-2.6.1. * gnu/packages/embedded.scm (propeller-binutils, binutils-vc4): Likewise. * gnu/packages/maths.scm (scotch): Likewise. * gnu/packages/wine.scm (wine): Likewise. --- gnu/packages/bootloaders.scm | 7 ++----- gnu/packages/embedded.scm | 4 ++-- gnu/packages/flex.scm | 17 ----------------- gnu/packages/maths.scm | 2 +- gnu/packages/wine.scm | 3 +-- 5 files changed, 6 insertions(+), 27 deletions(-) (limited to 'gnu/packages/flex.scm') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 98afc6a7c1..572186bea7 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -114,10 +114,7 @@ (native-inputs `(("unifont" ,unifont) ("bison" ,bison) - ;; Due to a bug in flex >= 2.6.2, GRUB must be built with an older flex: - ;; - ;; TODO Try building with flex > 2.6.3. - ("flex" ,flex-2.6.1) + ("flex" ,flex) ("texinfo" ,texinfo) ("help2man" ,help2man) @@ -240,7 +237,7 @@ menu to select one of the installed operating systems.") (build-system gnu-build-system) (native-inputs `(("bison" ,bison) - ("flex" ,flex-2.6.1))) ; A bug in flex prevents building with flex-2.6.3. + ("flex" ,flex))) (arguments `(#:make-flags (list "CC=gcc" diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 36f872cdf2..fbbafc6a3b 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -412,7 +412,7 @@ with a layered architecture of JTAG interface and TAP support.") ,@(package-arguments xbinutils))) (native-inputs `(("bison" ,bison) - ("flex" ,flex-2.6.1) ; needed because of yywrap error + ("flex" ,flex) ("texinfo" ,texinfo) ("dejagnu" ,dejagnu) ,@(package-native-inputs xbinutils)))))) @@ -764,7 +764,7 @@ simulator.") (base32 "14b3h2ji740s8zq5vwm4qdcxs4aa4wxi6wb9di3bv1h39x14nyr9")))) ("texinfo" ,texinfo) - ("flex" ,flex-2.6.1) ; A bug in flex prevents building with flex-2.6.3. + ("flex" ,flex) ("bison" ,bison) ("guile-1.8" ,guile-1.8) ("which" ,base:which))) diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm index ab0d8c583d..b68b01e949 100644 --- a/gnu/packages/flex.scm +++ b/gnu/packages/flex.scm @@ -85,20 +85,3 @@ regular expressions for each rule. Whenever it finds a match, it executes the corresponding C code.") (license (non-copyleft "file://COPYING" "See COPYING in the distribution.")))) - -;;; Many packages fail to build with flex > 2.6.1, due to this bug in flex: -;;; -;;; We must not use a flex before 2.6.1, due to CVE-2016-6354. -;;; TODO Try using flex > 2.6.3. -(define-public flex-2.6.1 - (package - (inherit flex) - (version "2.6.1") - (source (origin - (method url-fetch) - (uri (string-append "https://github.com/westes/flex" - "/releases/download/v" version "/" - "flex-" version ".tar.xz")) - (sha256 - (base32 - "0gqhk4vkwy4gl9xbpgkljph8c0a5kpijz6wd0p5r9q202qn42yic")))))) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index cefc53d67d..a4505c7b6f 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -1807,7 +1807,7 @@ implemented in ANSI C, and MPI for communications.") (build-system gnu-build-system) (inputs `(("zlib" ,zlib) - ("flex" ,flex-2.6.1) ; A bug in flex prevents building with flex-2.6.3. + ("flex" ,flex) ("bison" ,bison))) (arguments `(#:phases diff --git a/gnu/packages/wine.scm b/gnu/packages/wine.scm index 9c82e01d67..a74cbcf2b4 100644 --- a/gnu/packages/wine.scm +++ b/gnu/packages/wine.scm @@ -65,8 +65,7 @@ (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config) ("gettext" ,gettext-minimal) - ; A bug in flex prevents building with flex-2.6.3. - ("flex" ,flex-2.6.1) + ("flex" ,flex) ("bison" ,bison) ("perl" ,perl))) (inputs -- cgit v1.2.3 From 77e2538eda8a2721aef8336103c94fe31e12870c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 27 May 2017 12:27:47 +0100 Subject: gnu: packages: flex: Add missing 'lzip' input. * gnu/packages/flex.scm (flex)[native-inputs]: Add lzip. Signed-off-by: Leo Famulari --- gnu/packages/flex.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/flex.scm') diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm index b68b01e949..70707d77d4 100644 --- a/gnu/packages/flex.scm +++ b/gnu/packages/flex.scm @@ -23,6 +23,7 @@ #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (gnu packages) + #:use-module (gnu packages compression) #:use-module (gnu packages m4) #:use-module (gnu packages man) #:use-module (gnu packages bison) @@ -67,6 +68,7 @@ ;; m4 is not present in PATH when cross-building (native-inputs `(("help2man" ,help2man) + ("lzip" ,lzip) ("m4" ,m4))) (propagated-inputs `(("m4" ,m4))) (home-page "https://github.com/westes/flex") -- cgit v1.2.3 From 2dca204eb02835504df6846d9a543c729dc612e4 Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Sun, 28 May 2017 09:49:38 -0400 Subject: gnu: flex: Use the gzip-compressed tarball. This reverts commit 77e2538eda8a2721aef8336103c94fe31e12870c and fetches the gzip-compressed tarball. We do this so that flex-boot0 will not require lzip. * gnu/packages/flex.scm (flex)[source]: Fetch the '.tar.gz' tarball. [native-inputs]: Remove lzip. --- gnu/packages/flex.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'gnu/packages/flex.scm') diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm index 70707d77d4..fdda5f365d 100644 --- a/gnu/packages/flex.scm +++ b/gnu/packages/flex.scm @@ -23,7 +23,6 @@ #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (gnu packages) - #:use-module (gnu packages compression) #:use-module (gnu packages m4) #:use-module (gnu packages man) #:use-module (gnu packages bison) @@ -39,10 +38,10 @@ (uri (string-append "https://github.com/westes/flex" "/releases/download/v" version "/" - "flex-" version ".tar.lz")) + "flex-" version ".tar.gz")) (sha256 (base32 - "19sc63m09zamy2qlw5x3sg6wb6hrw96gfl0h87vh6flvsqjg9m3g")))) + "15g9bv236nzi665p9ggqjlfn4dwck5835vf0bbw2cz7h5c1swyp8")))) (build-system gnu-build-system) (inputs (let ((bison-for-tests @@ -68,7 +67,6 @@ ;; m4 is not present in PATH when cross-building (native-inputs `(("help2man" ,help2man) - ("lzip" ,lzip) ("m4" ,m4))) (propagated-inputs `(("m4" ,m4))) (home-page "https://github.com/westes/flex") -- cgit v1.2.3 From 0a3aca47d9baed5f3cd25c6a6489a625776fd26e Mon Sep 17 00:00:00 2001 From: Leo Famulari Date: Tue, 7 Mar 2017 22:38:35 -0500 Subject: gnu: grub: Fix build failure with recent flex. * gnu/packages/flex.scm (flex-2.6.1): New variable. * gnu/packages/bootloaders.scm (grub)[native-inputs]: Use flex-2.6.1. --- gnu/packages/bootloaders.scm | 5 ++++- gnu/packages/flex.scm | 13 +++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) (limited to 'gnu/packages/flex.scm') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 2d8d89f754..76dad2923e 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -118,7 +118,10 @@ (native-inputs `(("unifont" ,unifont) ("bison" ,bison) - ("flex" ,flex) + ;; Due to a bug in flex >= 2.6.2, GRUB must be built with an older flex: + ;; + ;; TODO Try building with flex > 2.6.4. + ("flex" ,flex-2.6.1) ("texinfo" ,texinfo) ("help2man" ,help2man) diff --git a/gnu/packages/flex.scm b/gnu/packages/flex.scm index fdda5f365d..b09ac0bb89 100644 --- a/gnu/packages/flex.scm +++ b/gnu/packages/flex.scm @@ -85,3 +85,16 @@ regular expressions for each rule. Whenever it finds a match, it executes the corresponding C code.") (license (non-copyleft "file://COPYING" "See COPYING in the distribution.")))) + +(define-public flex-2.6.1 + (package + (inherit flex) + (version "2.6.1") + (source (origin + (method url-fetch) + (uri (string-append "https://github.com/westes/flex" + "/releases/download/v" version "/" + "flex-" version ".tar.xz")) + (sha256 + (base32 + "0gqhk4vkwy4gl9xbpgkljph8c0a5kpijz6wd0p5r9q202qn42yic")))))) -- cgit v1.2.3