diff options
| author | Noé Lopez <noelopez@free.fr> | 2025-07-15 11:30:55 +0200 |
|---|---|---|
| committer | Noé Lopez <noelopez@free.fr> | 2026-06-15 18:51:09 +0200 |
| commit | a25b934e1a6c1c8a4f1246ab16f54ca1fea47aae (patch) | |
| tree | 2a51a268f4cc2b5ad72552240b04f92237158e2a | |
| parent | 9a62baae0e7de3ca774fd93c3038882aebc4eb84 (diff) | |
gnu: shepherd: Move guile-fibers to propagated inputs.
Fixes guix/guix#1079.
Fixes <https://issues.guix.gnu.org/75833>.
* gnu/packages/admin.scm (shepherd-0.10, shepherd-1.0):
Move guile-fibers from inputs to propagated-inputs.
Use new inheritance style.
(shepherd-for-home): Don’t inherit propagated-inputs.
* gnu/services/shepherd.scm (scm->go): Find guile-fibers in propagated-inputs
instead of inputs.
Reported-by: Tomas Volf <~@wolfsden.cz>
Change-Id: I9a406ba763408c064df0e68928564888b76b43b5
Signed-off-by: Noé Lopez <noelopez@free.fr>
| -rw-r--r-- | gnu/packages/admin.scm | 17 | ||||
| -rw-r--r-- | gnu/services/shepherd.scm | 2 |
2 files changed, 11 insertions, 8 deletions
diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 36ffcfff8db..7d506616cd6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm | |||
| @@ -565,8 +565,8 @@ and provides a \"top-like\" mode (monitoring).") | |||
| 565 | (target-riscv64?)) | 565 | (target-riscv64?)) |
| 566 | guile-fibers-1.1 | 566 | guile-fibers-1.1 |
| 567 | guile-fibers-1.3))) ;pinned version to avoid rebuilds | 567 | guile-fibers-1.3))) ;pinned version to avoid rebuilds |
| 568 | (inputs (list guile-3.0 | 568 | (propagated-inputs (list (this-package-native-input "guile-fibers"))) |
| 569 | (this-package-native-input "guile-fibers"))) | 569 | (inputs (list guile-3.0)) |
| 570 | (synopsis "System service manager") | 570 | (synopsis "System service manager") |
| 571 | (description | 571 | (description |
| 572 | "The GNU Shepherd is a daemon-managing daemon, meaning that it supervises | 572 | "The GNU Shepherd is a daemon-managing daemon, meaning that it supervises |
| @@ -618,7 +618,7 @@ interface and is based on GNU Guile.") | |||
| 618 | (dirname fibers-go))))))) | 618 | (dirname fibers-go))))))) |
| 619 | #~%standard-phases))) | 619 | #~%standard-phases))) |
| 620 | (native-inputs | 620 | (native-inputs |
| 621 | (modify-inputs (package-native-inputs shepherd-0.10) | 621 | (modify-inputs native-inputs |
| 622 | (replace "guile-fibers" | 622 | (replace "guile-fibers" |
| 623 | ;; Work around <https://codeberg.org/guile/fibers/issues/89>. | 623 | ;; Work around <https://codeberg.org/guile/fibers/issues/89>. |
| 624 | ;; This affects any system without a functional real-time | 624 | ;; This affects any system without a functional real-time |
| @@ -628,10 +628,12 @@ interface and is based on GNU Guile.") | |||
| 628 | (target-riscv64?)) | 628 | (target-riscv64?)) |
| 629 | guile-fibers-1.1 | 629 | guile-fibers-1.1 |
| 630 | guile-fibers)))) ;use latest guile-fibers available | 630 | guile-fibers)))) ;use latest guile-fibers available |
| 631 | (inputs | 631 | (propagated-inputs |
| 632 | (modify-inputs (package-inputs shepherd-0.10) | 632 | (modify-inputs propagated-inputs |
| 633 | (replace "guile-fibers" | 633 | (replace "guile-fibers" |
| 634 | (this-package-native-input "guile-fibers")) | 634 | (this-package-native-input "guile-fibers")))) |
| 635 | (inputs | ||
| 636 | (modify-inputs inputs | ||
| 635 | (append gzip zstd))))) | 637 | (append gzip zstd))))) |
| 636 | 638 | ||
| 637 | (define-public shepherd shepherd-0.10) | 639 | (define-public shepherd shepherd-0.10) |
| @@ -663,7 +665,8 @@ interface and is based on GNU Guile.") | |||
| 663 | (synopsis | 665 | (synopsis |
| 664 | "The Shepherd for Guix Home, without @command{halt} and @command{reboot}") | 666 | "The Shepherd for Guix Home, without @command{halt} and @command{reboot}") |
| 665 | (native-inputs '()) | 667 | (native-inputs '()) |
| 666 | (inputs (list base)))))) | 668 | (inputs (list base)) |
| 669 | (propagated-inputs '()))))) | ||
| 667 | 670 | ||
| 668 | (define-public shepherd-run | 671 | (define-public shepherd-run |
| 669 | (package | 672 | (package |
diff --git a/gnu/services/shepherd.scm b/gnu/services/shepherd.scm index 89c8fd3a135..b1e8b040375 100644 --- a/gnu/services/shepherd.scm +++ b/gnu/services/shepherd.scm | |||
| @@ -398,7 +398,7 @@ stored." | |||
| 398 | and return the resulting '.go' file. SHEPHERD is used as shepherd package." | 398 | and return the resulting '.go' file. SHEPHERD is used as shepherd package." |
| 399 | (define shepherd&co | 399 | (define shepherd&co |
| 400 | (cons shepherd | 400 | (cons shepherd |
| 401 | (match (lookup-package-input shepherd "guile-fibers") | 401 | (match (lookup-package-propagated-input shepherd "guile-fibers") |
| 402 | (#f '()) | 402 | (#f '()) |
| 403 | (fibers (list fibers))))) | 403 | (fibers (list fibers))))) |
| 404 | 404 | ||
