[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/07: gnu: shepherd: Switch back to Fibers 1.1 on Arm machines.
From: |
guix-commits |
Subject: |
07/07: gnu: shepherd: Switch back to Fibers 1.1 on Arm machines. |
Date: |
Fri, 8 Sep 2023 13:15:38 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 4dd33fc62899134606f36f92594cf160b972f685
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Fri Sep 8 18:48:11 2023 +0200
gnu: shepherd: Switch back to Fibers 1.1 on Arm machines.
Fixes <https://issues.guix.gnu.org/64966>.
* gnu/packages/admin.scm (shepherd-0.10)[native-inputs]: Use
GUILE-FIBERS-1.1 when ‘target-arm?’ is true.
Reported-by: Timotej Lazar <timotej.lazar@araneo.si>
Reported-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
Reported-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
gnu/packages/admin.scm | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm
index 604cd70c02..5d586e6f36 100644
--- a/gnu/packages/admin.scm
+++ b/gnu/packages/admin.scm
@@ -385,9 +385,18 @@ interface and is based on GNU Guile.")
(base32
"0v9ld9gbqdp5ya380fbkdsxa0iqr90gi6yk004ccz3n792nq6wlj"))))
(native-inputs (modify-inputs (package-native-inputs shepherd-0.9)
- (replace "guile-fibers" guile-fibers-1.3)))
+ (replace "guile-fibers"
+ ;; Work around
+ ;; <https://github.com/wingo/fibers/issues/89>. This
+ ;; affects any system without a functional real-time
+ ;; clock (RTC), but in practice these are typically Arm
+ ;; single-board computers.
+ (if (target-arm?)
+ guile-fibers-1.1
+ guile-fibers-1.3))))
(inputs (modify-inputs (package-inputs shepherd-0.9)
- (replace "guile-fibers" guile-fibers-1.3)))))
+ (replace "guile-fibers"
+ (this-package-native-input "guile-fibers"))))))
(define-public shepherd shepherd-0.9)
- branch master updated (45af7b8923 -> 4dd33fc628), guix-commits, 2023/09/08
- 03/07: gnu: guile-dsv: Update to 0.7.0., guix-commits, 2023/09/08
- 02/07: lint: Check that (cc-for-target) and friends are used., guix-commits, 2023/09/08
- 06/07: gnu: guile-dsv: Fix cross-compiling., guix-commits, 2023/09/08
- 04/07: gnu: guile-smc: Fix build with Guile 2.2., guix-commits, 2023/09/08
- 07/07: gnu: shepherd: Switch back to Fibers 1.1 on Arm machines.,
guix-commits <=
- 01/07: gnu: Add asli., guix-commits, 2023/09/08
- 05/07: gnu: guile2.2-dsv: Fix build., guix-commits, 2023/09/08