summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2017-02-06 12:18:38 +0100
committerMarius Bakke <mbakke@fastmail.com>2017-02-06 14:22:16 +0100
commitd846834fc2b2f76aa2e258685bc211edd31866c5 (patch)
tree02809135fc78305d7b6fde50bead7c97041796f5 /gnu
parent686d425904f53af1c6e0f1fa7282fd00343a5725 (diff)
gnu: grub: Update to 2.02rc1.
* gnu/packages/grub.scm (grub, grub-efi): Update to 2.02rc1. [arguments]: Don't disable grub_func_test. Remove #:configure-flags.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/grub.scm19
1 files changed, 5 insertions, 14 deletions
diff --git a/gnu/packages/grub.scm b/gnu/packages/grub.scm
index 3658f221ce..25c2d8076b 100644
--- a/gnu/packages/grub.scm
+++ b/gnu/packages/grub.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
;;; Copyright © 2015 Leo Famulari <leo@famulari.name>
;;; Copyright © 2016 Jan Nieuwenhuizen <janneke@gnu.org>
+;;; Copyright © 2016, 2017 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -52,23 +53,20 @@
(define-public grub
(package
(name "grub")
- (version "2.02beta3")
+ (version "2.02rc1")
(source (origin
(method url-fetch)
(uri (string-append
"ftp://alpha.gnu.org/gnu/grub/grub-"
- "2.02~beta3"
+ "2.02~rc1"
".tar.xz"))
(file-name (string-append name "-" version ".tar.xz"))
(sha256
(base32
- "18ddwnw0vxs7zigvah0g6a5z5vvlz0p8fjglxv1h59sjbrakvv1h"))))
+ "0y02v19x9sb5jvj740f604vvi5j1rx8pily1jk0l64bdp7lkjlj4"))))
(build-system gnu-build-system)
(arguments
- '(;; Two warnings: suggest braces, signed/unsigned comparison.
- #:configure-flags '("--disable-werror")
-
- #:phases (modify-phases %standard-phases
+ '(#:phases (modify-phases %standard-phases
(add-after 'unpack 'patch-stuff
(lambda* (#:key inputs #:allow-other-keys)
(substitute* "grub-core/Makefile.in"
@@ -87,13 +85,6 @@
;; Make the font visible.
(copy-file (assoc-ref inputs "unifont") "unifont.bdf.gz")
(system* "gunzip" "unifont.bdf.gz")
-
- ;; We hit an assertion failure in
- ;; grub-core/tests/video_checksum.c, as reported at
- ;; <https://lists.gnu.org/archive/html/grub-devel/2016-07/msg00026.html>.
- ;; Disable this test for now.
- (substitute* "tests/grub_func_test.in"
- (("set -e") "exit 77\nset -e"))
#t)))))
(inputs
`(("gettext" ,gettext-minimal)