diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-06-07 11:54:03 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-06-07 11:54:03 +0200 |
| commit | aeafff536f933b07836b14d089dfc52b0e432ec9 (patch) | |
| tree | 4ede554999f98cf9e19c04098c934db52efae795 /gnu/packages/grub.scm | |
| parent | 9dee9e8ffe4650949bd3ad2edf559cf4a33e9e6e (diff) | |
| parent | f82c58539e1f7b9b864e68ea2ab0c6a17c15fbb5 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/grub.scm')
| -rw-r--r-- | gnu/packages/grub.scm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/gnu/packages/grub.scm b/gnu/packages/grub.scm index ec2feebbf4..31b270c0d8 100644 --- a/gnu/packages/grub.scm +++ b/gnu/packages/grub.scm @@ -25,6 +25,7 @@ #:use-module (guix build-system gnu) #:use-module (gnu packages) #:use-module (gnu packages flex) + #:use-module (gnu packages disk) #:use-module (gnu packages bison) #:use-module (gnu packages gettext) #:use-module (gnu packages fontutils) @@ -99,11 +100,6 @@ ;; Make the font visible. (copy-file (assoc-ref inputs "unifont") "unifont.bdf.gz") (system* "gunzip" "unifont.bdf.gz") - - ;; TODO: Re-enable this test when we have Parted. - (substitute* "tests/partmap_test.in" - (("set -e") "exit 77")) - #t))))) (inputs `(;; ("lvm2" ,lvm2) @@ -121,6 +117,7 @@ ;; Dependencies for the test suite. The "real" QEMU is needed here, ;; because several targets are used. + ("parted" ,parted) ("qemu" ,qemu-for-tests) ("xorriso" ,xorriso))) (home-page "http://www.gnu.org/software/grub/") |