nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Marius Bakke 2017-02-06 12:18:38 +01:00
parent 686d425904
commit d846834fc2
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
gnu/packages/grub.scm
View File

@ -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)