all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: "Ludovic Courtès" <ludo@gnu.org>
To: 63943@debbugs.gnu.org
Cc: "Ludovic Courtès" <ludo@gnu.org>
Subject: [bug#63943] [PATCH 4/5] gnu: guile-fibers: Remove 'guile-fibers-next'.
Date: Wed,  7 Jun 2023 10:41:51 +0200	[thread overview]
Message-ID: <cef532574eb8a4021611c4f739461620eb30ef1c.1686126946.git.ludo@gnu.org> (raw)
In-Reply-To: <cover.1686126946.git.ludo@gnu.org>

* 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 43334eea0c..608346f300 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -876,23 +876,6 @@ (define-public guile-fibers-1.1
      ;; <https://github.com/wingo/fibers/pull/53>.
      (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 9532fd7187..ad444352cd 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 3af4aa0b8d..cb2134ec07 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
-- 
2.40.1





  parent reply	other threads:[~2023-06-07  8:43 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-06-07  8:39 [bug#63943] [PATCH 0/5] Update Fibers to 1.3.1 Ludovic Courtès
2023-06-07  8:38 ` [bug#63942] [PATCH 1/5] gnu: guile-fibers: Add 1.3.1 Ludovic Courtès
2023-06-07  8:41 ` [bug#63943] [PATCH 2/5] gnu: shepherd@0.10: Use guile-fibers 1.3.1 Ludovic Courtès
2023-06-07  8:41 ` [bug#63943] [PATCH 3/5] gnu: cuirass: " Ludovic Courtès
2023-06-07  8:41 ` Ludovic Courtès [this message]
2023-06-07  8:41 ` [bug#63943] [PATCH 5/5] gnu: gnunet-scheme: " Ludovic Courtès
2023-06-07  9:40 ` [bug#63943] The Shepherd on GNU/Hurd Ludovic Courtès
2023-06-07 10:34   ` Janneke Nieuwenhuizen
2023-06-08 11:45     ` Janneke Nieuwenhuizen
2023-06-10 12:23 ` [bug#63943] [PATCH 0/5] Update Fibers to 1.3.1 Christopher Baines
2023-06-14 21:50   ` bug#63943: " Ludovic Courtès

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=cef532574eb8a4021611c4f739461620eb30ef1c.1686126946.git.ludo@gnu.org \
    --to=ludo@gnu.org \
    --cc=63943@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.