diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-06-03 17:51:21 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-06-03 17:51:21 +0200 |
| commit | d0c45d2d822fdf31b8a8edc73fe7be12a0676705 (patch) | |
| tree | 04ae8108a67013fce99273db4582c29e7845f0a7 /gnu/packages/bootloaders.scm | |
| parent | 0b70f7d557181febd80b16c8e3a03887df3871af (diff) | |
| parent | ac1560f18c25e4312c1f32c001405c176daa1764 (diff) | |
| download | gnu-guix-d0c45d2d822fdf31b8a8edc73fe7be12a0676705.tar gnu-guix-d0c45d2d822fdf31b8a8edc73fe7be12a0676705.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/image.scm
(incorporated libtiff graft)
Diffstat (limited to 'gnu/packages/bootloaders.scm')
| -rw-r--r-- | gnu/packages/bootloaders.scm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index 396368379f..c4be211f1a 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -91,7 +91,11 @@ ;; Make the font visible. (copy-file (assoc-ref inputs "unifont") "unifont.bdf.gz") (system* "gunzip" "unifont.bdf.gz") - #t))))) + #t))) + + ;; We suspect there are race conditions when running tests in parallel: + ;; <https://bugs.gnu.org/26936>. + #:parallel-tests? #f)) (inputs `(("gettext" ,gettext-minimal) |