From f142c0775a3ee2d9bf629c8f8a4513d4b8b051a1 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 21 Mar 2020 15:13:28 +0100 Subject: gnu: GRUB: Build with the latest version of Flex. * gnu/packages/bootloaders.scm (grub)[native-inputs]: Change from FLEX-2.6.1 to FLEX. --- gnu/packages/bootloaders.scm | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'gnu/packages/bootloaders.scm') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 770647935a..b8d68b3c89 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -173,10 +173,7 @@ `(("pkg-config" ,pkg-config) ("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.4. - ("flex" ,flex-2.6.1) + ("flex" ,flex) ("texinfo" ,texinfo) ("help2man" ,help2man) -- cgit v1.2.3 From a67c4ff369c103baa8574f1ffd1e66f969a7b330 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 21 Mar 2020 15:14:08 +0100 Subject: gnu: GRUB: Use the latest version of QEMU for tests. * gnu/packages/bootloaders.scm (grub)[native-inputs]: Change from QEMU-MINIMAL-2.10 to QEMU-MINIMAL. --- gnu/packages/bootloaders.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/bootloaders.scm') diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index b8d68b3c89..cadcc937e1 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -196,7 +196,7 @@ ;; Dependencies for the test suite. The "real" QEMU is needed here, ;; because several targets are used. ("parted" ,parted) - ("qemu" ,qemu-minimal-2.10) + ("qemu" ,qemu-minimal) ("xorriso" ,xorriso))) (home-page "https://www.gnu.org/software/grub/") (synopsis "GRand Unified Boot loader") -- cgit v1.2.3