From 1261d2637c25b63a7a8c6bff5629265e19fa3dea Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 7 Jun 2023 10:18:54 +0200 Subject: gnu: guile-fibers: Remove 'guile-fibers-next'. * gnu/packages/guile-xyz.scm (guile-fibers-next): Remove. * gnu/packages/package-management.scm (guix-build-coordinator)[arguments] [native-inputs, propagated-inputs]: Replace GUILE-FIBERS-NEXT by GUILE-FIBERS-1.3. (nar-herder)[arguments, native-inputs, propagated-inputs]: Likewise. * gnu/packages/web.scm (guix-data-service)[propagated-inputs]: Likewise. --- gnu/packages/guile-xyz.scm | 17 ----------------- gnu/packages/package-management.scm | 12 ++++++------ gnu/packages/web.scm | 2 +- 3 files changed, 7 insertions(+), 24 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 4acd756f9a..46acc38ecc 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -871,23 +871,6 @@ (define-public guile-fibers-1.1 ;; . (filter (cut string-suffix? "-linux" <>) %supported-systems)))) -(define-public guile-fibers-next - (let ((commit "99fc3e38048f732de67c43fde52e949fa294aa7d") - (revision "1")) - (package - (inherit guile-fibers-1.1) - (name "guile-fibers-next") - (version (git-version "1.3.0" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/wingo/fibers") - (commit commit))) - (file-name (git-file-name "guile-fibers" version)) - (sha256 - (base32 - "1950nf0qa52m1hhc33z0snci5azbdcv4m6hklk5rpqchc90x9h4p"))))))) - (define-public guile-fibers (package (inherit guile-fibers-1.1) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index 4791880375..3a5ba3420c 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1444,7 +1444,7 @@ (define-public guix-build-coordinator "guile-gnutls" ,@(if (hurd-target?) '() - '("guile-fibers-next"))))) + '("guile-fibers"))))) (wrap-program file `("PATH" ":" prefix (,bin @@ -1485,7 +1485,7 @@ (define-public guix-build-coordinator guile-gcrypt guix guile-prometheus - guile-fibers-next + guile-fibers-1.3 guile-lib (first (assoc-ref (package-native-inputs guix) "guile")))) (inputs @@ -1503,7 +1503,7 @@ (define-public guix-build-coordinator guile-sqlite3 guix guile-gnutls - guile-fibers-next)) + guile-fibers-1.3)) (home-page "https://git.cbaines.net/guix/build-coordinator/") (synopsis "Tool to help build derivations") (description @@ -1686,7 +1686,7 @@ (define-public nar-herder "guile-prometheus" "guile-sqlite3" "guile-gnutls" - "guile-fibers-next"))) + "guile-fibers"))) (wrap-program file `("GUILE_LOAD_PATH" ":" prefix (,scm ,(string-join @@ -1719,7 +1719,7 @@ (define-public nar-herder guile-json-4 guile-gcrypt guix - guile-fibers-next + guile-fibers-1.3 guile-prometheus guile-lib guile-lzlib @@ -1732,7 +1732,7 @@ (define-public nar-herder (list guile-json-4 guile-gcrypt guix - guile-fibers-next + guile-fibers-1.3 guile-prometheus guile-lib guile-lzlib diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 7df1cea36c..daa569263b 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4849,7 +4849,7 @@ (define-public guix-data-service bash-minimal)) (propagated-inputs (list guix - guile-fibers-next + guile-fibers-1.3 guile-json-4 guile-email guile-prometheus -- cgit v1.2.3