From unknown Sun Jun 22 22:47:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63943] [PATCH 0/5] Update Fibers to 1.3.1 Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 07 Jun 2023 08:40:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63943 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63943@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16861271942434 (code B ref -1); Wed, 07 Jun 2023 08:40:02 +0000 Received: (at submit) by debbugs.gnu.org; 7 Jun 2023 08:39:54 +0000 Received: from localhost ([127.0.0.1]:53533 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6oht-0000dC-NO for submit@debbugs.gnu.org; Wed, 07 Jun 2023 04:39:53 -0400 Received: from lists.gnu.org ([209.51.188.17]:35292) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6ohr-0000d3-7l for submit@debbugs.gnu.org; Wed, 07 Jun 2023 04:39:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6ohr-0004XJ-0b for guix-patches@gnu.org; Wed, 07 Jun 2023 04:39:51 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6ohq-0004C0-O9; Wed, 07 Jun 2023 04:39:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=jxF86/dbikX4QbnoFqANPCbxJ05jZLumd3vx6ohsviA=; b=kUT0ubCi8Mjr+X Hfv2ya8bmxGiRwcbH1lc5l866xoqdE3/Xv0oRoRwjLo7M7HjPIvHa0AQUujsPESalDT3j38IcuiWp BO1uR6A3k0jVjAhm4ByBrpUGvIiTxxyOPG3lxWVxAyUnxp9dFqzSFv3b+4WW0IDNOtshyRhYLPSvz brQBLewUykZLnw/1hfzrffmkFaOHfdnz5ufEaRefiHjrZvXYPG8D/M6WdCvpQXsCTLJCTAJ8kEvMO E2JYnCi/AEf0Vu0XrUpGWQMVLcIsAHfc8tMD/ta0FWTzfgXDo6g76d4pW0Pyqy912aaoBUzUq/rd4 A3zDZj1Bv1dqaiqH4CzA==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6ohq-000699-Av; Wed, 07 Jun 2023 04:39:50 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Wed, 7 Jun 2023 10:39:36 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello! This is the much anticipated upgrade of Fibers to 1.3.1, which among other things brings a libevent backend, making it usable on non-Linux systems. To me it’s important so we can upgrade the Shepherd in use on GNU/Hurd (it’s still stuck at 0.8 because so far Fibers lacked support for non-Linux systems), which in turn means we can use the newer Shepherd APIs in its config file. Unfortunately, while shepherd cross-builds and runs on GNU/Hurd, I’m not confident it “works”. I’ll write more in a separate message. There’s still one users of ‘guile-fibers-1.1’: ‘guile-gemini’. It can probably run on Fibers 1.3 but I don’t think it has tests for that. Thoughts? Ludo’. Ludovic Courtès (5): gnu: guile-fibers: Add 1.3.1. gnu: shepherd@0.10: Use guile-fibers 1.3.1. gnu: cuirass: Use guile-fibers 1.3.1. gnu: guile-fibers: Remove 'guile-fibers-next'. gnu: gnunet-scheme: Use guile-fibers 1.3.1. gnu/local.mk | 1 + gnu/packages/admin.scm | 8 ++- gnu/packages/ci.scm | 2 +- gnu/packages/gnunet.scm | 4 +- gnu/packages/guile-xyz.scm | 68 +++++++++++-------- gnu/packages/package-management.scm | 12 ++-- .../guile-fibers-libevent-32-bit.patch | 18 +++++ gnu/packages/web.scm | 2 +- 8 files changed, 74 insertions(+), 41 deletions(-) create mode 100644 gnu/packages/patches/guile-fibers-libevent-32-bit.patch base-commit: 1a2eb26286c72ac2754969f53f5833b053b96b67 -- 2.40.1 From unknown Sun Jun 22 22:47:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63943] [PATCH 1/5] gnu: guile-fibers: Add 1.3.1. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 07 Jun 2023 08:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63943 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63943@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 63943-submit@debbugs.gnu.org id=B63943.16861273302746 (code B ref 63943); Wed, 07 Jun 2023 08:43:02 +0000 Received: (at 63943) by debbugs.gnu.org; 7 Jun 2023 08:42:10 +0000 Received: from localhost ([127.0.0.1]:53545 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6ok6-0000iD-6j for submit@debbugs.gnu.org; Wed, 07 Jun 2023 04:42:10 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52428) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6ok4-0000hq-3P for 63943@debbugs.gnu.org; Wed, 07 Jun 2023 04:42:08 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6ojy-0004mW-PZ; Wed, 07 Jun 2023 04:42:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=WA1Bd7UAklboQB/AOX4y9llOcvQ0a+P9Wm4e4craD9g=; b=qZe5EPCTNiPF/ukPnPbl Mo/qQFN7hUGwGqdRiKiLcjV9Ys0hEBnY3UPXrWA24wtsSj9nPsEWVgOVloAif7Fr+wmCSmA42QyZg LaZsU00Mbs3dCbsVmUkqvL+NHR3rNqBdP9KtaGr+KxZbBarERX7KpJ6x72Gi7vtRWjD43nCCTTxeN PuvgMLQeC3irWs7R/y+U+KbNy0HXs6M/bl5Y7e7GzntB/PfTazRTixtrfnUFW49MHYCEZxUU8tPOV qPLd92EHvD3Cm8ZN8KWiGZqNhHhRzPPtc7yXK5BFyTPKtMdQXk5jteOQGLzhrKXJNWr6pkfPQWNpY 2PRWCunpKWslqw==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6ojy-0006Pe-CR; Wed, 07 Jun 2023 04:42:02 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Wed, 7 Jun 2023 10:41:48 +0200 Message-Id: <3a86e6815a5d5d160e17105095546f6c3ff0d95a.1686126946.git.ludo@gnu.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/guile-xyz.scm (guile-fibers-1.3): New variable. (guile-fibers-1.1): Inherit from it. * gnu/packages/patches/guile-fibers-libevent-32-bit.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/guile-xyz.scm | 53 ++++++++++++++----- .../guile-fibers-libevent-32-bit.patch | 18 +++++++ 3 files changed, 59 insertions(+), 13 deletions(-) create mode 100644 gnu/packages/patches/guile-fibers-libevent-32-bit.patch diff --git a/gnu/local.mk b/gnu/local.mk index f9afb433e6..f466f91746 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1317,6 +1317,7 @@ dist_patch_DATA = \ %D%/packages/patches/guile-fibers-epoll-instance-is-dead.patch \ %D%/packages/patches/guile-fibers-fd-finalizer-leak.patch \ %D%/packages/patches/guile-fibers-wait-for-io-readiness.patch \ + %D%/packages/patches/guile-fibers-libevent-32-bit.patch \ %D%/packages/patches/guile-fix-invalid-unicode-handling.patch \ %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \ %D%/packages/patches/guile-git-adjust-for-libgit2-1.2.0.patch \ diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index d8684bb818..43334eea0c 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -92,6 +92,7 @@ (define-module (gnu packages guile-xyz) #:use-module (gnu packages hurd) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) + #:use-module (gnu packages libevent) #:use-module (gnu packages libffi) #:use-module (gnu packages libunistring) #:use-module (gnu packages linux) @@ -788,10 +789,10 @@ (define-public guile2.2-dsv (inputs (list guile-2.2)) (propagated-inputs `(("guile-lib" ,guile2.2-lib))))) -(define-public guile-fibers-1.1 +(define-public guile-fibers-1.3 (package (name "guile-fibers") - (version "1.1.1") + (version "1.3.1") (source (origin (method git-fetch) (uri (git-reference @@ -800,11 +801,9 @@ (define-public guile-fibers-1.1 (file-name (git-file-name name version)) (sha256 (base32 - "0ll63d7202clapg1k4bilbnlmfa4qvpjnsd7chbkka4kxf5klilc")) + "0wvdi4l58f9a5c9wi3cdc9l1bniscsixb6w2zj86mch7j7j814lc")) (patches - (search-patches "guile-fibers-wait-for-io-readiness.patch" - "guile-fibers-epoll-instance-is-dead.patch" - "guile-fibers-fd-finalizer-leak.patch")))) + (search-patches "guile-fibers-libevent-32-bit.patch")))) (build-system gnu-build-system) (arguments (list #:make-flags @@ -822,17 +821,15 @@ (define-public guile-fibers-1.1 (substitute* "Makefile" (("tests/speedup.scm") "")))))))) (native-inputs - (list texinfo pkg-config autoconf automake libtool + (list texinfo pkg-config autoconf-2.71 automake libtool guile-3.0 ;for 'guild compile ;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS' gettext-minimal)) (inputs - (list guile-3.0)) ;for libguile-3.0.so - (supported-systems - ;; This version requires 'epoll' and is thus limited to Linux-based - ;; systems, but this may change soon: - ;; . - (filter (cut string-suffix? "-linux" <>) %supported-systems)) + (append (list guile-3.0) ;for libguile-3.0.so + (if (hurd-target?) + (list libevent) + '()))) (synopsis "Lightweight concurrency facility for Guile") (description "Fibers is a Guile library that implements a a lightweight concurrency @@ -849,6 +846,36 @@ (define-public guile-fibers-1.1 (properties '((upstream-name . "fibers"))) (license license:lgpl3+))) +(define-public guile-fibers-1.1 + (package + (inherit guile-fibers-1.3) + (version "1.1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/wingo/fibers") + (commit (string-append "v" version)))) + (file-name (git-file-name "guile-fibers" version)) + (sha256 + (base32 + "0ll63d7202clapg1k4bilbnlmfa4qvpjnsd7chbkka4kxf5klilc")) + (patches + (search-patches "guile-fibers-wait-for-io-readiness.patch" + "guile-fibers-epoll-instance-is-dead.patch" + "guile-fibers-fd-finalizer-leak.patch")))) + (native-inputs + (list texinfo pkg-config autoconf automake libtool + guile-3.0 ;for 'guild compile + ;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS' + gettext-minimal)) + (inputs + (list guile-3.0)) ;for libguile-3.0.so + (supported-systems + ;; This version requires 'epoll' and is thus limited to Linux-based + ;; systems, which is fixed in 1.2.0: + ;; . + (filter (cut string-suffix? "-linux" <>) %supported-systems)))) + (define-public guile-fibers-next (let ((commit "99fc3e38048f732de67c43fde52e949fa294aa7d") (revision "1")) diff --git a/gnu/packages/patches/guile-fibers-libevent-32-bit.patch b/gnu/packages/patches/guile-fibers-libevent-32-bit.patch new file mode 100644 index 0000000000..a1cc99fdbe --- /dev/null +++ b/gnu/packages/patches/guile-fibers-libevent-32-bit.patch @@ -0,0 +1,18 @@ +This fixes a bug with the libevent backend on 32-bit platforms: + + https://github.com/wingo/fibers/issues/86 + +diff --git a/extensions/libevent.c b/extensions/libevent.c +index 4f44de9..52c9d73 100644 +--- a/extensions/libevent.c ++++ b/extensions/libevent.c +@@ -215,7 +215,8 @@ run_event_loop (void *p) + microsec = -1; + else if (data->timeout >= 0) + { +- microsec = data->timeout / time_units_per_microsec; ++ microsec = (time_units_per_microsec == 0) ++ ? 0 : data->timeout / time_units_per_microsec; + tv.tv_sec = 0; + tv.tv_usec = microsec; + } -- 2.40.1 From unknown Sun Jun 22 22:47:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63943] [PATCH 3/5] gnu: cuirass: Use guile-fibers 1.3.1. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 07 Jun 2023 08:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63943 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63943@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 63943-submit@debbugs.gnu.org id=B63943.16861273322771 (code B ref 63943); Wed, 07 Jun 2023 08:43:02 +0000 Received: (at 63943) by debbugs.gnu.org; 7 Jun 2023 08:42:12 +0000 Received: from localhost ([127.0.0.1]:53551 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6ok7-0000iX-Qi for submit@debbugs.gnu.org; Wed, 07 Jun 2023 04:42:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52442) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6ok5-0000ht-KD for 63943@debbugs.gnu.org; Wed, 07 Jun 2023 04:42:09 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6ok0-0004mn-DF; Wed, 07 Jun 2023 04:42:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=CQPSj8BA+LHwgXQY7IrLOfe1m/c/DuXeWSJ3qMJvm68=; b=Be7xkWAdbw7kDCS7e0O0 wJ3iOlNdAGzmIRlVGlFr52MN0g0cPBPhYtWx0a+IKpgrW5RshFxYURUJK+OFnwtOp+WR56VazBXAL 5GGT1FkPpXFnU2YeX/1meVmxomKbZYhhMoYsFn9wqJJzJHj361VXOv1yGRCL6x1ZFVySSrraRmPz2 QzxXGenF2FKneJaWEUmovdkP6pY/Mf2BvE/AORMFYE0L6sW45JNpexvrgo9s3+9NBA828lKImd/My 9fNxjvs6MTY1JCIBetwUeNgoUspxmZjLjWz8i6xGlEJj+BfNojA+OFNjM2ovwvHmmmZDqGxCK52nz qj1AUtDV2JobXg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6ok0-0006Pe-0W; Wed, 07 Jun 2023 04:42:04 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Wed, 7 Jun 2023 10:41:50 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/ci.scm (cuirass)[inputs]: Replace GUILE-FIBERS-1.1 with GUILE-FIBERS-1.3. --- gnu/packages/ci.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index cb55a62334..00be723eec 100644 --- a/gnu/packages/ci.scm +++ b/gnu/packages/ci.scm @@ -142,7 +142,7 @@ (define-public cuirass (inputs (list guile-3.0-latest guile-avahi - guile-fibers-1.1 + guile-fibers-1.3 guile-gcrypt guile-json-4 guile-simple-zmq -- 2.40.1 From unknown Sun Jun 22 22:47:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63943] [PATCH 2/5] gnu: shepherd@0.10: Use guile-fibers 1.3.1. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 07 Jun 2023 08:43:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63943 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63943@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 63943-submit@debbugs.gnu.org id=B63943.16861273342782 (code B ref 63943); Wed, 07 Jun 2023 08:43:02 +0000 Received: (at 63943) by debbugs.gnu.org; 7 Jun 2023 08:42:14 +0000 Received: from localhost ([127.0.0.1]:53553 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6okA-0000im-7s for submit@debbugs.gnu.org; Wed, 07 Jun 2023 04:42:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6ok4-0000hs-PO for 63943@debbugs.gnu.org; Wed, 07 Jun 2023 04:42:11 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6ojz-0004mg-Ic; Wed, 07 Jun 2023 04:42:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=Ab2CQl7w0Sxheos2r4O9HgvniC9TzENAeRqjdm8LsMU=; b=RLHTNntBRkRqWc9y/Qg+ 1bMznbwSmX06f+nvwcieA0AmxSrvm6/9wPwSLu/Kz+vT+1aNWq7VvIEYx6lHTge1amcH/wrHHW324 UorLLJur/vzoA7Ogkvggc4i3cCP9FdJ6q68julcPkSsq2EFy1hdTy85tZHHegDfjjppaMCa/kVeHu nfpAZt6VIKGO1XE1wjNFuj7MmVYt0bk3yB5BP/G/F79z50qkPXtNchsLe2dOkVLhcuipj6xWe0XDA TkC10rH+zOJw/R0BnLW4vG6Kb02TFISKultBU728JL91GkO4XEj7fOuShY3ecO6xesud9iTLFo7sb eGH0wvglvf4QPg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6ojz-0006Pe-60; Wed, 07 Jun 2023 04:42:03 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Wed, 7 Jun 2023 10:41:49 +0200 Message-Id: <68631cfdb4640f17de837909335309e87430318c.1686126946.git.ludo@gnu.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/admin.scm (shepherd-0.10)[native-inputs, inputs]: Replace GUILE-FIBERS-1.1 with GUILE-FIBERS-1.3. --- gnu/packages/admin.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 3193aa1456..23f2f4c981 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012-2022 Ludovic Courtès +;;; Copyright © 2012-2023 Ludovic Courtès ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2014, 2015, 2016, 2018, 2019, 2020 Mark H Weaver ;;; Copyright © 2014, 2015-2018, 2020-2023 Eric Bavier @@ -378,7 +378,11 @@ (define-public shepherd-0.10 version ".tar.gz")) (sha256 (base32 - "1720czfchg4pzw44v0zj3rc3k6jhl3ixwnpw4v4v9bqx98ad49yw")))))) + "1720czfchg4pzw44v0zj3rc3k6jhl3ixwnpw4v4v9bqx98ad49yw")))) + (native-inputs (modify-inputs (package-native-inputs shepherd-0.9) + (replace "guile-fibers" guile-fibers-1.3))) + (inputs (modify-inputs (package-inputs shepherd-0.9) + (replace "guile-fibers" guile-fibers-1.3))))) (define-public shepherd shepherd-0.9) -- 2.40.1 From unknown Sun Jun 22 22:47:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63943] [PATCH 4/5] gnu: guile-fibers: Remove 'guile-fibers-next'. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 07 Jun 2023 08:43:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63943 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63943@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 63943-submit@debbugs.gnu.org id=B63943.16861273352789 (code B ref 63943); Wed, 07 Jun 2023 08:43:03 +0000 Received: (at 63943) by debbugs.gnu.org; 7 Jun 2023 08:42:15 +0000 Received: from localhost ([127.0.0.1]:53555 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6okA-0000io-Nw for submit@debbugs.gnu.org; Wed, 07 Jun 2023 04:42:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52458) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6ok6-0000hw-Gm for 63943@debbugs.gnu.org; Wed, 07 Jun 2023 04:42:11 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6ok1-0004mx-9Y; Wed, 07 Jun 2023 04:42:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=5kCaYoc1dLlDVSQDndjatRWTmImeEfSz6SxCmVKXwC0=; b=bpyDEDX9pZjOEB3ozax3 tvsQASo3T4GZ/sjnznLcS1KVwiSEhBJZOhwROzIBbWveTZaNdsZD9wNHZlwmQBPegCmJl3BoRW7cv Qh/37PeyepwU249qkPlJ9e81c/2a4IwKWxy2hpmRt1CIkXs5hqtTJY3hMYXRTELU/5y2h6V7sJVCs vzlYXzNWZ3N6bHkkLL3hNs/RdnCqTwsYH5d0m4PGnjmzTdhWniUYL0Wbn6S+cWqOY58MSqRvWcPfS f+hnYvtNqAPvqgPLB4VZ0Gk2PXAcni/tgbxRo0M2y6595wa6s81zxe3YfV+BSZyY10/WvDg81BJAL qelFc+b46u4d4Q==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6ok0-0006Pe-Rt; Wed, 07 Jun 2023 04:42:05 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Wed, 7 Jun 2023 10:41:51 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * 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 ;; . (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 From unknown Sun Jun 22 22:47:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63943] [PATCH 5/5] gnu: gnunet-scheme: Use guile-fibers 1.3.1. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 07 Jun 2023 08:43:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63943 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63943@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 63943-submit@debbugs.gnu.org id=B63943.16861273352795 (code B ref 63943); Wed, 07 Jun 2023 08:43:03 +0000 Received: (at 63943) by debbugs.gnu.org; 7 Jun 2023 08:42:15 +0000 Received: from localhost ([127.0.0.1]:53557 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6okB-0000iw-7O for submit@debbugs.gnu.org; Wed, 07 Jun 2023 04:42:15 -0400 Received: from eggs.gnu.org ([209.51.188.92]:52470) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6ok7-0000hy-An for 63943@debbugs.gnu.org; Wed, 07 Jun 2023 04:42:11 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6ok2-0004n9-3c; Wed, 07 Jun 2023 04:42:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=9y9fJavhAXjINJMwAKzg3xihw58iuTTB94+P/+FsLlQ=; b=nd4v4f3OokDk/6m+svpT P7pSQE+n2Hb912WwfjdBSjdfcgXjPuTKQJyn2xeXK/Xq51fdGFuvgc8NOo0MYyvfSaciZ0deYpkQG SQ7p6UDDZaG0Bp61AfvkKARI4g/jsbXv/8B57T80/kN5gP9gAE23RcKiGU+ciFcobdiIoM/9LsiTD T6qrJp56In70VVwcZsmdXdaUnTRVbaeWSIxYa/MGfOYP9G6m7+2ZyTsr4h74umQelblf6p94/HnCB DkVTzJUdrbMpK19rFB+8Tjlw4tpZWbdmdxbp2h32TXIPNcdayFxRSy3OGrwjWrroQJK6Mv59RBelK XMWIYMT8C9MonA==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6ok1-0006Pe-Mn; Wed, 07 Jun 2023 04:42:05 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Wed, 7 Jun 2023 10:41:52 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/gnunet.scm (gnunet-scheme)[native-inputs] [propagated-inputs]: Replace GUILE-FIBERS-1.1 with GUILE-FIBERS-1.3. --- gnu/packages/gnunet.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index ff7499263e..f16a223d10 100644 --- a/gnu/packages/gnunet.scm +++ b/gnu/packages/gnunet.scm @@ -409,14 +409,14 @@ (define-public gnunet-scheme "faketime -m -f '1970-01-01 00:00:00' $(TEXMACS_CONVERT)"))))))) (inputs (list guile-3.0)) ;for pkg-config (propagated-inputs (list guile-bytestructures guile-gcrypt guile-pfds - guile-fibers-1.1)) + guile-fibers-1.3)) (native-inputs (list guile-3.0 ;as a compiler ;; for cross-compilation, the guile inputs need to be ;; native-inputs as well. guile-bytestructures guile-gcrypt guile-pfds - guile-fibers-1.1 + guile-fibers-1.3 libfaketime automake autoconf -- 2.40.1 From debbugs-submit-bounces@debbugs.gnu.org Wed Jun 07 04:42:18 2023 Received: (at control) by debbugs.gnu.org; 7 Jun 2023 08:42:18 +0000 Received: from localhost ([127.0.0.1]:53561 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6okE-0000jG-Hy for submit@debbugs.gnu.org; Wed, 07 Jun 2023 04:42:18 -0400 Received: from eggs.gnu.org ([209.51.188.92]:45012) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6okD-0000id-0n for control@debbugs.gnu.org; Wed, 07 Jun 2023 04:42:17 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6ok7-0004nZ-QK for control@debbugs.gnu.org; Wed, 07 Jun 2023 04:42:11 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-version:Subject:From:To:Date:in-reply-to: references; bh=XMICAT6R8m4k4+AL0Z/5KfVd7uMR/W4UvLNhze/mx7M=; b=qXEtaJN0DBaIG8 SThgJ/VVtPEk6Goseyly1lYq37pcO7DQEui7R3zMZLlvUAUwzyeIOM7xIlY5t3yKJ7FcknC/CkCxC 4Qphp1GgDXc+HB5S1CHk4eDJm6A2xFuNJXd3mmDMlTBIjE2RF2hpVi/SMWU2Q6888ZBiNZpAXLqS1 E58ZU3GLIsMFcvLocBvmQcK3VIU4hgOHpod9p29eMUNC6vFYXWIBzq8ByTGWp/pumQjx9oMXt6DUX nrIaSaQr75JIyjXMjcxjf1yMksnYJkaNue5vqY12kYv+bKL672WKr9Cvwub+9/VHxHx4AG/12xTpo yVEMZodYVhX/E935NJgQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6ok7-0006SF-Dy for control@debbugs.gnu.org; Wed, 07 Jun 2023 04:42:11 -0400 Date: Wed, 07 Jun 2023 10:42:10 +0200 Message-Id: <87v8fz64v1.fsf@gnu.org> To: control@debbugs.gnu.org From: =?utf-8?Q?Ludovic_Court=C3=A8s?= Subject: control message for bug #63943 MIME-version: 1.0 Content-type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) merge 63943 63942 quit From unknown Sun Jun 22 22:47:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63943] The Shepherd on GNU/Hurd Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 07 Jun 2023 09:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63943 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63943@debbugs.gnu.org Cc: Josselin Poiret , Janneke Nieuwenhuizen Received: via spool by 63943-submit@debbugs.gnu.org id=B63943.168613083427667 (code B ref 63943); Wed, 07 Jun 2023 09:41:01 +0000 Received: (at 63943) by debbugs.gnu.org; 7 Jun 2023 09:40:34 +0000 Received: from localhost ([127.0.0.1]:53604 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6peb-0007C9-U8 for submit@debbugs.gnu.org; Wed, 07 Jun 2023 05:40:34 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60494) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6peZ-0007Bv-6I for 63943@debbugs.gnu.org; Wed, 07 Jun 2023 05:40:32 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6peT-00061h-KT; Wed, 07 Jun 2023 05:40:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=bt044jl5hZPhVq696vfFPGT9FU/rU7ra/ldHC5dKS6c=; b=hQoNx3d8tbiFRZ9ul6e0 oan/XJXoCcWPadsPHJMPelEUZE7ne1xSi45T6WOTolDWnsf+zQ58ivb2CqYxLCBFtR6dL8LcYKyh8 b8xnW1Siecu6JcXyxxyONP+MbLhrpJqMIZGCMf76ytWDJlSAwfboShKVR+x2GTz9H6WV9pK8damcD naai0wy3/I0ESTYHlaHkeiyqXSyZhfoUxrqjTktCMoy1Gy6j99W4OpC8BluyN9rcVKMaZHf6zTZq0 ya8YlNKuZ+l2zRyD/yM8SgoY7ohOY1PrsqMYA78NfP3aRl9FqSiGecjR/3e7dZCSZcSIXv0OTWiFl FSs3g5vOymvEdQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6peA-0003Up-Kt; Wed, 07 Jun 2023 05:40:17 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= References: Date: Wed, 07 Jun 2023 11:40:04 +0200 In-Reply-To: ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Wed, 7 Jun 2023 10:39:36 +0200") Message-ID: <87fs73626j.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s skribis: > To me it=E2=80=99s important so we can upgrade the Shepherd in use on GNU= /Hurd > (it=E2=80=99s still stuck at 0.8 because so far Fibers lacked support for > non-Linux systems), which in turn means we can use the newer Shepherd > APIs in its config file. Unfortunately, while shepherd cross-builds > and runs on GNU/Hurd, I=E2=80=99m not confident it =E2=80=9Cworks=E2=80= =9D. I=E2=80=99ll write more > in a separate message. The patch I ended up not including in this series is use of current Shepherd on GNU/Hurd (attached). Problems that I see are: =E2=80=A2 =E2=80=98networking=E2=80=99 gets stuck in =E2=80=98starting=E2= =80=99 state. My guess is that it uses =E2=80=98system*=E2=80=99 (the replacement provided by shepherd) a= nd that one does not return because we never get SIGCHLD. =E2=80=A2 (@ (ice-9 threads) all-threads) says there are two threads. Th= at was already the case with 0.8, but it=E2=80=99s no good. Also, I haven=E2=80=99t tried to run the Shepherd=E2=80=99s test suite nati= vely on GNU/Hurd; I=E2=80=99m sure it=E2=80=99d uncover problems. Overall, I=E2=80=99m pessimistic about signal handling without =E2=80=98sig= nalfd=E2=80=99. We could try to get shepherd to kinda work without =E2=80=98signalfd=E2=80=99 = (we could even test that code path on GNU/Linux), but that=E2=80=99s going to be brit= tle as we can already see. What d=E2=80=99ya think, comrades? Ludo=E2=80=99. --=-=-= Content-Type: text/x-patch; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable diff --git a/gnu/system.scm b/gnu/system.scm index 354f58f55b..5c4c045e28 100644 --- a/gnu/system.scm +++ b/gnu/system.scm @@ -804,9 +804,7 @@ (define (hurd-default-essential-services os) %boot-service %hurd-startup-service %activation-service - (service shepherd-root-service-type - (shepherd-configuration - (shepherd shepherd-0.8))) ;no Fibers + (service shepherd-root-service-type) =20 (service user-processes-service-type) (account-service (append (operating-system-accounts os) diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 558d1ee9e3..0aa473fd42 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright =C2=A9 2020-2022 Ludovic Court=C3=A8s +;;; Copyright =C2=A9 2020-2023 Ludovic Court=C3=A8s ;;; Copyright =C2=A9 2020 Jan (janneke) Nieuwenhuizen ;;; ;;; This file is part of GNU Guix. @@ -68,7 +68,7 @@ (define %base-packages/hurd ;; Note: the Shepherd comes before the Hurd, not just because its duty i= s to ;; shepherd the herd, but also because we want its 'halt' and 'reboot' ;; commands to take precedence. - (list shepherd-0.8 hurd bash coreutils file findutils grep sed + (list shepherd-0.10 hurd bash coreutils file findutils grep sed diffutils patch gawk tar gzip bzip2 xz lzip guile-3.0-latest guile-colorized guile-readline net-base inetutils less shadow sudo which --=-=-=-- From unknown Sun Jun 22 22:47:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63943] The Shepherd on GNU/Hurd Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 07 Jun 2023 10:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63943 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 63943@debbugs.gnu.org, Josselin Poiret Received: via spool by 63943-submit@debbugs.gnu.org id=B63943.16861340941703 (code B ref 63943); Wed, 07 Jun 2023 10:35:02 +0000 Received: (at 63943) by debbugs.gnu.org; 7 Jun 2023 10:34:54 +0000 Received: from localhost ([127.0.0.1]:53657 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6qVC-0000RN-7v for submit@debbugs.gnu.org; Wed, 07 Jun 2023 06:34:54 -0400 Received: from eggs.gnu.org ([209.51.188.92]:44288) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6qV9-0000RA-G8 for 63943@debbugs.gnu.org; Wed, 07 Jun 2023 06:34:52 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6qV3-0006Nv-8r; Wed, 07 Jun 2023 06:34:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=Z7hk6w9nkOvQrgOrZK57I2DtNayLjn1hr6qY1ZC0l5g=; b=ayXxDSW1faQwNCj9whdN sPCHgTk3CGTVXyMrxz8fkylnEqoPPR7022iB/wZHkIz83GkuLb68r99S7e6iGhCUwTZUIbK3vVNRw 3D/26Q3xrGVR1z+0+0btSJIuPy4mKuasCG57yrAqPTJUF57E6lFVT3sfCA5qVFpkmFEUZgrjgbpUL mMCcioTH/gVh54cc59JJHo9FrFVMICcKh4+ipU6tTSOds+PrIPgSRHYY1rtp3Wnej6iOPM3U1vn3o LWZeRnVV9gvettVbsoLbA9FIDGRscV2Gx2Tn5uT6BpXTMkLJ4hszCDGUsI825EjrXawq1bWOaXBGK Gy3lmWbPNZP5NQ==; Received: from 2a02-a462-da03-1-2701-7f81-a736-4607.fixed6.kpn.net ([2a02:a462:da03:1:2701:7f81:a736:4607] helo=drakenpad.janneke.lilypond.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6qV0-0008TE-2P; Wed, 07 Jun 2023 06:34:44 -0400 From: Janneke Nieuwenhuizen Organization: AvatarAcademy.nl References: <87fs73626j.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Wed, 07 Jun 2023 12:34:37 +0200 In-Reply-To: <87fs73626j.fsf@gnu.org> ("Ludovic =?UTF-8?Q?Court=C3=A8s?="'s message of "Wed, 07 Jun 2023 11:40:04 +0200") Message-ID: <87v8fz36iq.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Ludovic Court=C3=A8s writes: > Ludovic Court=C3=A8s skribis: > >> To me it=E2=80=99s important so we can upgrade the Shepherd in use on GN= U/Hurd >> (it=E2=80=99s still stuck at 0.8 because so far Fibers lacked support for >> non-Linux systems), which in turn means we can use the newer Shepherd >> APIs in its config file. Unfortunately, while shepherd cross-builds >> and runs on GNU/Hurd, I=E2=80=99m not confident it =E2=80=9Cworks=E2=80= =9D. I=E2=80=99ll write more >> in a separate message. > > The patch I ended up not including in this series is use of current > Shepherd on GNU/Hurd (attached). > > Problems that I see are: > > =E2=80=A2 =E2=80=98networking=E2=80=99 gets stuck in =E2=80=98starting= =E2=80=99 state. My guess is that it > uses =E2=80=98system*=E2=80=99 (the replacement provided by shepherd)= and that one > does not return because we never get SIGCHLD. > > =E2=80=A2 (@ (ice-9 threads) all-threads) says there are two threads. = That > was already the case with 0.8, but it=E2=80=99s no good. > > Also, I haven=E2=80=99t tried to run the Shepherd=E2=80=99s test suite na= tively on > GNU/Hurd; I=E2=80=99m sure it=E2=80=99d uncover problems. > > Overall, I=E2=80=99m pessimistic about signal handling without =E2=80=98s= ignalfd=E2=80=99. We > could try to get shepherd to kinda work without =E2=80=98signalfd=E2=80= =99 (we could > even test that code path on GNU/Linux), but that=E2=80=99s going to be br= ittle > as we can already see. > > What d=E2=80=99ya think, comrades? It would be great, if it works ;-) While I'd like to test it and I'm still making progress building natively on the Hurd but it's hard to predict when I'll get to building fibers: --8<---------------cut here---------------start------------->8--- root@guixydevel ~/src/guix/wip-hurd# ./pre-inst-env guix build guile-fibers= @1.3.1 The following derivations will be built: /gnu/store/rc75bjs5pjni9w6dvhjvmik55vgdk501-guile-fibers-1.3.1.drv /gnu/store/l9pvk6ari19l5j8bvbjij4df8rx8a943-guile-fibers-1.3.1-checkout.d= rv /gnu/store/79j9l6rxqpayvrh2fmk665xiw6izfd9v-guile-fibers-1.3.1-checkout.d= rv /gnu/store/71lgpvpmgjb40n6r5qkrk7zp5cgmc67x-guile-json-4.7.3.drv /gnu/store/b8wcy6aw9zsd3s7rjp6idmzzh0slp9xn-module-import-compiled.drv /gnu/store/kkgkbhg583zplxd75kivl3s06xp3id7i-guile-gnutls-3.7.12.drv /gnu/store/2nnnqgifm6kwwaard67vmlxsqg9z4dbn-guile-gnutls-3.7.12.tar.xz.drv /gnu/store/lxhq4z01ihalnbxp592z4mm9iyjbvb3p-texinfo-6.8.drv /gnu/store/78nfa0r179gs408gxf50i0q0c2cd3mi7-texinfo-6.8.tar.xz.drv /gnu/store/p6hq43iga4kb4g09h2baq5mdca5m5h29-git-minimal-2.40.1.drv /gnu/store/7j5v82rv9ar36xxnh3sk5srw1dr48azn-curl-7.85.0.drv /gnu/store/74n0wvcc4c8qjdalf2mw77ij3my7amcc-nghttp2-1.49.0.drv /gnu/store/8z7cr0bgayis4qc97n72hia0qy2y7cx9-jansson-2.14.drv /gnu/store/cma9bgjc8a2wx4qfrzyxbzhwhyxpabdc-python-3.10.7.drv /gnu/store/00rah96n5lqi6ciz6xwnp1pxjh87sxak-sqlite-3.39.3.drv /gnu/store/6g1l3r6bz60rbpf589wldflgnv91aiql-sqlite-autoconf-3390300.tar.x= z.drv /gnu/store/0mwhankh574hrcyjcbpiv4vzgz79fx3d-libxext-1.3.4.drv /gnu/store/agp5cags2viz3i03qpgwbrvsxwzq905j-tk-8.6.12.drv /gnu/store/479v3x0adq8i592v84b65zp4ssz9k3k6-libxft-2.3.4.drv /gnu/store/6zhyims30137hinkqki2fs1r7906nys6-fontconfig-minimal-2.14.0.drv /gnu/store/bfxx8cznlb4hszg1qm0limhyjsv7d7yr-font-dejavu-2.37.drv /gnu/store/svnq4kdgyvh6zp8vb0swcnrkj039wwqy-module-import-compiled.drv /gnu/store/qvqxdab06klfn40bdf4fmmmflrgaah6q-tk8.6.12-src.tar.xz.drv /gnu/store/jzjsa7b6ly6a4wz4a9k0s66fnxv0imb0-libev-4.33.drv /gnu/store/bhxa1vsdx7qm2cdqwqr0j7k6zdvhnv6l-mit-krb5-1.20.drv /gnu/store/a552az04c0fwd1hs936gsq6ivszhiimd-krb5-1.20.tar.xz.drv /gnu/store/pg26yqmmv4fz2if4k6fd5hbnh5xnqy2r-libevent-2.1.12.drv /gnu/store/3861750mi7r1faq24va47dc6dqr122pj-python-wrapper-3.10.7.drv --8<---------------cut here---------------end--------------->8--- most (all?) of these dependencies are on my list working towards a self-hosting guix. Greetings, janneke --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Sun Jun 22 22:47:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63943] The Shepherd on GNU/Hurd Resent-From: Janneke Nieuwenhuizen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Jun 2023 11:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63943 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 63943@debbugs.gnu.org, Josselin Poiret Received: via spool by 63943-submit@debbugs.gnu.org id=B63943.168622475719565 (code B ref 63943); Thu, 08 Jun 2023 11:46:02 +0000 Received: (at 63943) by debbugs.gnu.org; 8 Jun 2023 11:45:57 +0000 Received: from localhost ([127.0.0.1]:55777 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q7E5V-00055V-0r for submit@debbugs.gnu.org; Thu, 08 Jun 2023 07:45:57 -0400 Received: from eggs.gnu.org ([209.51.188.92]:39206) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q7E5R-00055G-JL for 63943@debbugs.gnu.org; Thu, 08 Jun 2023 07:45:56 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7E5L-0004PR-1q; Thu, 08 Jun 2023 07:45:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=4oTzXj7TwTxkr9lmIdNzV8a9RSclhO7yvrO0AVQvTXw=; b=HB9hDIO0Vt5LxXu8WHkW SRkCGhPP/yDfhn05Yjg45MAgvzwBrmI8rK3MG7Wiqx+FdmuwD3xGviv4vuNTOv455OvpbSfMBEswR q7RRHcCDU1uVcCF80LaeajJc70VUeEYFidXCRtIqIt03PSawtwZMtm2iU46n8D2ZM46kqLP4pQKtF fkC3B2W3TwBQgtEjHO4miZv8+fiSCJkujZg5h49lXoDllMKdrhs9QS6GT555p0S+NumhGKKRRMUP2 J8slht71FJ6yfXVB+0bA8vt+lFWFpIyB7PuRGLaFgWcb9TABOeJFEzyoRsVsmMuTr/16tcEdxfRYO IA0zUduaIikzsQ==; Received: from 2a02-a462-da03-1-2701-7f81-a736-4607.fixed6.kpn.net ([2a02:a462:da03:1:2701:7f81:a736:4607] helo=drakenpad.janneke.lilypond.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q7E4f-000507-4a; Thu, 08 Jun 2023 07:45:11 -0400 From: Janneke Nieuwenhuizen Organization: AvatarAcademy.nl References: <87fs73626j.fsf@gnu.org> <87v8fz36iq.fsf@gnu.org> X-Url: http://AvatarAcademy.nl Date: Thu, 08 Jun 2023 13:45:00 +0200 In-Reply-To: <87v8fz36iq.fsf@gnu.org> (Janneke Nieuwenhuizen's message of "Wed, 07 Jun 2023 12:34:37 +0200") Message-ID: <875y7y18lf.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Janneke Nieuwenhuizen writes: hi! > Ludovic Court=C3=A8s writes: > >> Ludovic Court=C3=A8s skribis: >> >>> To me it=E2=80=99s important so we can upgrade the Shepherd in use on G= NU/Hurd >>> (it=E2=80=99s still stuck at 0.8 because so far Fibers lacked support f= or >>> non-Linux systems), which in turn means we can use the newer Shepherd >>> APIs in its config file. Unfortunately, while shepherd cross-builds >>> and runs on GNU/Hurd, I=E2=80=99m not confident it =E2=80=9Cworks=E2=80= =9D. I=E2=80=99ll write more >>> in a separate message. >> >> The patch I ended up not including in this series is use of current >> Shepherd on GNU/Hurd (attached). >> >> Problems that I see are: [..] > It would be great, if it works ;-) > > While I'd like to test it and I'm still making progress building > natively on the Hurd but it's hard to predict when I'll get to building > fibers: Finally up to guile-fibers@1.3.1, I broke off the test suite after 2h. I'll retry using --verbosity=3D2 during the night (hopefully today or tomorrow). Greetings, Janneke --=20 Janneke Nieuwenhuizen | GNU LilyPond https://LilyPond.org Freelance IT https://www.JoyOfSource.com | Avatar=C2=AE https://AvatarAcade= my.com From unknown Sun Jun 22 22:47:54 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#63943] [PATCH 0/5] Update Fibers to 1.3.1 Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 10 Jun 2023 12:27:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63943 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 63943@debbugs.gnu.org Received: via spool by 63943-submit@debbugs.gnu.org id=B63943.16863999678750 (code B ref 63943); Sat, 10 Jun 2023 12:27:01 +0000 Received: (at 63943) by debbugs.gnu.org; 10 Jun 2023 12:26:07 +0000 Received: from localhost ([127.0.0.1]:33406 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q7xfS-0002H3-Nj for submit@debbugs.gnu.org; Sat, 10 Jun 2023 08:26:06 -0400 Received: from mira.cbaines.net ([212.71.252.8]:42616) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q7xfQ-0002Gq-7i for 63943@debbugs.gnu.org; Sat, 10 Jun 2023 08:26:05 -0400 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:3a91:a0a4:ecee:f157]) by mira.cbaines.net (Postfix) with ESMTPSA id BD11527BBE2; Sat, 10 Jun 2023 13:26:02 +0100 (BST) Received: from felis (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 56015781; Sat, 10 Jun 2023 12:26:02 +0000 (UTC) References: User-agent: mu4e 1.10.2; emacs 28.2 From: Christopher Baines Date: Sat, 10 Jun 2023 13:23:39 +0100 In-reply-to: Message-ID: <878rcrzep1.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" X-Spam-Score: -0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Ludovic Court=C3=A8s writes: > Hello! > > This is the much anticipated upgrade of Fibers to 1.3.1, which among > other things brings a libevent backend, making it usable on non-Linux > systems. > > To me it=E2=80=99s important so we can upgrade the Shepherd in use on GNU= /Hurd > (it=E2=80=99s still stuck at 0.8 because so far Fibers lacked support for > non-Linux systems), which in turn means we can use the newer Shepherd > APIs in its config file. Unfortunately, while shepherd cross-builds > and runs on GNU/Hurd, I=E2=80=99m not confident it =E2=80=9Cworks=E2=80= =9D. I=E2=80=99ll write more > in a separate message. > > There=E2=80=99s still one users of =E2=80=98guile-fibers-1.1=E2=80=99: = =E2=80=98guile-gemini=E2=80=99. It > can probably run on Fibers 1.3 but I don=E2=80=99t think it has tests for > that. > > Thoughts? > > Ludo=E2=80=99. > > Ludovic Court=C3=A8s (5): > gnu: guile-fibers: Add 1.3.1. > gnu: shepherd@0.10: Use guile-fibers 1.3.1. > gnu: cuirass: Use guile-fibers 1.3.1. > gnu: guile-fibers: Remove 'guile-fibers-next'. > gnu: gnunet-scheme: Use guile-fibers 1.3.1. Looks good to me, [1] is looking good as well. 1: https://qa.guix.gnu.org/issue/63942 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmSEa9pfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh aW5lcy5uZXQACgkQXiijOwuE9XdtOw/9HKTN/pk3LhYwosgo7xbFF6MpuI6Gy905 fpo5m1au4UqXjwyh7SzSW0Cp5J46xSmoODM2PqCuh/eyt/vusABAPHWNoa+IOYaS OeBSujYpCD3Zs/phVXsDhva/EEfgA7LSXr/6iRa76e8dYeKWlzGBSfL6TJldxihN CrvI0v8PccCZTobxQmCr0l8r4dtQpBAaJfw/pVks51g/Phi6WoQqz1bQDiv08+te 8QaWv7VyV87DDp3c6cbaE6PJV/sS1HDbltInt+aauRIbMxzAW7vwZ6/zfaBBZnCA C45fJJ0vzdv6V6t5JUhBkKI2/Lws9VeRS8itzEevvlT0/btNzSaL9IDggEgJcGtQ RhKvbGtx0edKTcN1ZA53TpThrTBdKQ+Psy2kqTRcss3Ny0LXP3zMkpZI9YNCO7O7 tV8qcOO88GNO3Gd05EF2f1GlLUKZ8To3rg9fVMZ3NSEBYS+7sFJpNlVuzK2g+tbd 0E+4ydo5toPsgyzEhnPCc7dY9YIBK7p28idB09+GXw5u38oDJsEFDqc3EuM7oYAx 27tjQHybTzIcyBe26SvsBjw92LGb5/g/Nmef+bji3qZhrw731n8WwqL37adMZmnI 2/GY2H56TfbyhamF1W+pjLag8j7mYH4eQ+t+q7i+e+tk29K3ptWm9gZL4HNZQHYj zNOauMAC0Sg= =GQuN -----END PGP SIGNATURE----- --=-=-=-- From unknown Sun Jun 22 22:47:54 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Subject: bug#63943: closed (Re: bug#63943: [PATCH 0/5] Update Fibers to 1.3.1) Message-ID: References: <87ilbppvb9.fsf_-_@gnu.org> X-Gnu-PR-Message: they-closed 63943 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 63943@debbugs.gnu.org Date: Wed, 14 Jun 2023 21:51:01 +0000 Content-Type: multipart/mixed; boundary="----------=_1686779461-32657-1" This is a multi-part message in MIME format... ------------=_1686779461-32657-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #63943: [PATCH 0/5] Update Fibers to 1.3.1 which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 63943@debbugs.gnu.org. --=20 63943: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D63943 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1686779461-32657-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 63943-done) by debbugs.gnu.org; 14 Jun 2023 21:51:00 +0000 Received: from localhost ([127.0.0.1]:45639 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9YOK-0008UX-If for submit@debbugs.gnu.org; Wed, 14 Jun 2023 17:51:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9YOJ-0008UH-2N for 63943-done@debbugs.gnu.org; Wed, 14 Jun 2023 17:50:59 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q9YOD-00089s-Pk; Wed, 14 Jun 2023 17:50:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=tteY9XQl0IJCw4/4KBm8qOwfdIefyiKTGKtNYIWWL/k=; b=KIsyX0731SZ/WBX5DmdJ y+UKQ2CYMm+4i6ANsoAK6n33dpasSrF+aeUpDZYaUsmlT3nL78s0Ttdzym7LGGjT4go+k1XXXORTB sMtr1whZjIIdJXMa+rw8AbEhNo0TBy3bYaPOldaQaiRNVHLCQKehsZLioXxzKiGg/Vf0pWluK+I/Y 8bmfxWKi7TUj1jPSv8B6Hmv1XWgXkYPadL/NWteYB4jc+bY+2u157+0bPa3tRTumZrUQNzSG2q5nL 3L5i6aGyDeCVNoWi2SOXI8GFkaFRYHQLDLJyNxPXjWQR4e37Qfy5Yk5yaBYB2tqs8ygj6CyRJsxuN 5RX5qHtc3Dzclg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q9YOD-0001vl-DO; Wed, 14 Jun 2023 17:50:53 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Christopher Baines Subject: Re: bug#63943: [PATCH 0/5] Update Fibers to 1.3.1 References: <878rcrzep1.fsf@cbaines.net> Date: Wed, 14 Jun 2023 23:50:50 +0200 In-Reply-To: <878rcrzep1.fsf@cbaines.net> (Christopher Baines's message of "Sat, 10 Jun 2023 13:23:39 +0100") Message-ID: <87ilbppvb9.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 63943-done Cc: 63943-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Christopher Baines skribis: > Looks good to me, [1] is looking good as well. > > 1: https://qa.guix.gnu.org/issue/63942 Pushed as 35c27ec5eedfe8ea4fc653bef0bf213c1a58e7a2, thanks! Ludo=E2=80=99. ------------=_1686779461-32657-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 7 Jun 2023 08:39:54 +0000 Received: from localhost ([127.0.0.1]:53533 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6oht-0000dC-NO for submit@debbugs.gnu.org; Wed, 07 Jun 2023 04:39:53 -0400 Received: from lists.gnu.org ([209.51.188.17]:35292) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6ohr-0000d3-7l for submit@debbugs.gnu.org; Wed, 07 Jun 2023 04:39:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6ohr-0004XJ-0b for guix-patches@gnu.org; Wed, 07 Jun 2023 04:39:51 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6ohq-0004C0-O9; Wed, 07 Jun 2023 04:39:50 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:Subject:To:From:in-reply-to: references; bh=jxF86/dbikX4QbnoFqANPCbxJ05jZLumd3vx6ohsviA=; b=kUT0ubCi8Mjr+X Hfv2ya8bmxGiRwcbH1lc5l866xoqdE3/Xv0oRoRwjLo7M7HjPIvHa0AQUujsPESalDT3j38IcuiWp BO1uR6A3k0jVjAhm4ByBrpUGvIiTxxyOPG3lxWVxAyUnxp9dFqzSFv3b+4WW0IDNOtshyRhYLPSvz brQBLewUykZLnw/1hfzrffmkFaOHfdnz5ufEaRefiHjrZvXYPG8D/M6WdCvpQXsCTLJCTAJ8kEvMO E2JYnCi/AEf0Vu0XrUpGWQMVLcIsAHfc8tMD/ta0FWTzfgXDo6g76d4pW0Pyqy912aaoBUzUq/rd4 A3zDZj1Bv1dqaiqH4CzA==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6ohq-000699-Av; Wed, 07 Jun 2023 04:39:50 -0400 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: guix-patches@gnu.org Subject: [PATCH 0/5] Update Fibers to 1.3.1 Date: Wed, 7 Jun 2023 10:39:36 +0200 Message-Id: X-Mailer: git-send-email 2.40.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: submit Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hello! This is the much anticipated upgrade of Fibers to 1.3.1, which among other things brings a libevent backend, making it usable on non-Linux systems. To me it’s important so we can upgrade the Shepherd in use on GNU/Hurd (it’s still stuck at 0.8 because so far Fibers lacked support for non-Linux systems), which in turn means we can use the newer Shepherd APIs in its config file. Unfortunately, while shepherd cross-builds and runs on GNU/Hurd, I’m not confident it “works”. I’ll write more in a separate message. There’s still one users of ‘guile-fibers-1.1’: ‘guile-gemini’. It can probably run on Fibers 1.3 but I don’t think it has tests for that. Thoughts? Ludo’. Ludovic Courtès (5): gnu: guile-fibers: Add 1.3.1. gnu: shepherd@0.10: Use guile-fibers 1.3.1. gnu: cuirass: Use guile-fibers 1.3.1. gnu: guile-fibers: Remove 'guile-fibers-next'. gnu: gnunet-scheme: Use guile-fibers 1.3.1. gnu/local.mk | 1 + gnu/packages/admin.scm | 8 ++- gnu/packages/ci.scm | 2 +- gnu/packages/gnunet.scm | 4 +- gnu/packages/guile-xyz.scm | 68 +++++++++++-------- gnu/packages/package-management.scm | 12 ++-- .../guile-fibers-libevent-32-bit.patch | 18 +++++ gnu/packages/web.scm | 2 +- 8 files changed, 74 insertions(+), 41 deletions(-) create mode 100644 gnu/packages/patches/guile-fibers-libevent-32-bit.patch base-commit: 1a2eb26286c72ac2754969f53f5833b053b96b67 -- 2.40.1 ------------=_1686779461-32657-1-- From unknown Sun Jun 22 22:47:54 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Subject: bug#63942: closed (Re: bug#63943: [PATCH 0/5] Update Fibers to 1.3.1) Message-ID: References: <87ilbppvb9.fsf_-_@gnu.org> <3a86e6815a5d5d160e17105095546f6c3ff0d95a.1686126946.git.ludo@gnu.org> X-Gnu-PR-Message: they-closed 63942 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 63942@debbugs.gnu.org Date: Wed, 14 Jun 2023 21:51:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1686779462-32657-3" This is a multi-part message in MIME format... ------------=_1686779462-32657-3 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #63943: [PATCH 1/5] gnu: guile-fibers: Add 1.3.1. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 63942@debbugs.gnu.org. --=20 63943: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D63943 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1686779462-32657-3 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 63943-done) by debbugs.gnu.org; 14 Jun 2023 21:51:00 +0000 Received: from localhost ([127.0.0.1]:45639 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9YOK-0008UX-If for submit@debbugs.gnu.org; Wed, 14 Jun 2023 17:51:00 -0400 Received: from eggs.gnu.org ([209.51.188.92]:48794) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q9YOJ-0008UH-2N for 63943-done@debbugs.gnu.org; Wed, 14 Jun 2023 17:50:59 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q9YOD-00089s-Pk; Wed, 14 Jun 2023 17:50:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=tteY9XQl0IJCw4/4KBm8qOwfdIefyiKTGKtNYIWWL/k=; b=KIsyX0731SZ/WBX5DmdJ y+UKQ2CYMm+4i6ANsoAK6n33dpasSrF+aeUpDZYaUsmlT3nL78s0Ttdzym7LGGjT4go+k1XXXORTB sMtr1whZjIIdJXMa+rw8AbEhNo0TBy3bYaPOldaQaiRNVHLCQKehsZLioXxzKiGg/Vf0pWluK+I/Y 8bmfxWKi7TUj1jPSv8B6Hmv1XWgXkYPadL/NWteYB4jc+bY+2u157+0bPa3tRTumZrUQNzSG2q5nL 3L5i6aGyDeCVNoWi2SOXI8GFkaFRYHQLDLJyNxPXjWQR4e37Qfy5Yk5yaBYB2tqs8ygj6CyRJsxuN 5RX5qHtc3Dzclg==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q9YOD-0001vl-DO; Wed, 14 Jun 2023 17:50:53 -0400 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Christopher Baines Subject: Re: bug#63943: [PATCH 0/5] Update Fibers to 1.3.1 References: <878rcrzep1.fsf@cbaines.net> Date: Wed, 14 Jun 2023 23:50:50 +0200 In-Reply-To: <878rcrzep1.fsf@cbaines.net> (Christopher Baines's message of "Sat, 10 Jun 2023 13:23:39 +0100") Message-ID: <87ilbppvb9.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 63943-done Cc: 63943-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Christopher Baines skribis: > Looks good to me, [1] is looking good as well. > > 1: https://qa.guix.gnu.org/issue/63942 Pushed as 35c27ec5eedfe8ea4fc653bef0bf213c1a58e7a2, thanks! Ludo=E2=80=99. ------------=_1686779462-32657-3 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 7 Jun 2023 08:39:10 +0000 Received: from localhost ([127.0.0.1]:53529 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6ohB-0000c9-K4 for submit@debbugs.gnu.org; Wed, 07 Jun 2023 04:39:10 -0400 Received: from lists.gnu.org ([209.51.188.17]:44988) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1q6oh6-0000bz-DO for submit@debbugs.gnu.org; Wed, 07 Jun 2023 04:39:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6oh6-0003u0-3d for guix-patches@gnu.org; Wed, 07 Jun 2023 04:39:04 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6oh5-000475-25; Wed, 07 Jun 2023 04:39:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=WA1Bd7UAklboQB/AOX4y9llOcvQ0a+P9Wm4e4craD9g=; b=IAlKVmNIBhp6ExL3DCOk v4nYdWlPuYJpLSOZw6qbXY3gDp2CSR6fDGxFWAjNSwcEH99EIZKtSnNGjM9lX5/QlvXLQuymaIZlD ryeSAfVXiS3fhXeOPlgLErJnffTzCPcnpJYGXr1W0EabhifWiPu7IXj3QMVWqNQrNYksEl56YL+ny ObvBXUlr0ci7lkz/+Kyjzidyt+KghX9HFhLBTK0cW8r2n0+wxISsF1NX7ITG5tJSw6OtA7uB/xIHH Ip2dIHVphEOfTXMba7Kdcy2hSENy1bntTZRQxdqEiM5iGTjTd82SFTvXMVdDMIaQJjRHD3RZ1jDnH NkU0rYJRNKZ4PQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q6oh4-000664-Le; Wed, 07 Jun 2023 04:39:02 -0400 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= To: guix-patches@gnu.org Subject: [PATCH 1/5] gnu: guile-fibers: Add 1.3.1. Date: Wed, 7 Jun 2023 10:38:48 +0200 Message-Id: <3a86e6815a5d5d160e17105095546f6c3ff0d95a.1686126946.git.ludo@gnu.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -0.0 (/) X-Debbugs-Envelope-To: submit Cc: =?UTF-8?q?Ludovic=20Court=C3=A8s?= X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/guile-xyz.scm (guile-fibers-1.3): New variable. (guile-fibers-1.1): Inherit from it. * gnu/packages/patches/guile-fibers-libevent-32-bit.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/guile-xyz.scm | 53 ++++++++++++++----- .../guile-fibers-libevent-32-bit.patch | 18 +++++++ 3 files changed, 59 insertions(+), 13 deletions(-) create mode 100644 gnu/packages/patches/guile-fibers-libevent-32-bit.patch diff --git a/gnu/local.mk b/gnu/local.mk index f9afb433e6..f466f91746 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1317,6 +1317,7 @@ dist_patch_DATA = \ %D%/packages/patches/guile-fibers-epoll-instance-is-dead.patch \ %D%/packages/patches/guile-fibers-fd-finalizer-leak.patch \ %D%/packages/patches/guile-fibers-wait-for-io-readiness.patch \ + %D%/packages/patches/guile-fibers-libevent-32-bit.patch \ %D%/packages/patches/guile-fix-invalid-unicode-handling.patch \ %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch \ %D%/packages/patches/guile-git-adjust-for-libgit2-1.2.0.patch \ diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index d8684bb818..43334eea0c 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -92,6 +92,7 @@ (define-module (gnu packages guile-xyz) #:use-module (gnu packages hurd) #:use-module (gnu packages image) #:use-module (gnu packages imagemagick) + #:use-module (gnu packages libevent) #:use-module (gnu packages libffi) #:use-module (gnu packages libunistring) #:use-module (gnu packages linux) @@ -788,10 +789,10 @@ (define-public guile2.2-dsv (inputs (list guile-2.2)) (propagated-inputs `(("guile-lib" ,guile2.2-lib))))) -(define-public guile-fibers-1.1 +(define-public guile-fibers-1.3 (package (name "guile-fibers") - (version "1.1.1") + (version "1.3.1") (source (origin (method git-fetch) (uri (git-reference @@ -800,11 +801,9 @@ (define-public guile-fibers-1.1 (file-name (git-file-name name version)) (sha256 (base32 - "0ll63d7202clapg1k4bilbnlmfa4qvpjnsd7chbkka4kxf5klilc")) + "0wvdi4l58f9a5c9wi3cdc9l1bniscsixb6w2zj86mch7j7j814lc")) (patches - (search-patches "guile-fibers-wait-for-io-readiness.patch" - "guile-fibers-epoll-instance-is-dead.patch" - "guile-fibers-fd-finalizer-leak.patch")))) + (search-patches "guile-fibers-libevent-32-bit.patch")))) (build-system gnu-build-system) (arguments (list #:make-flags @@ -822,17 +821,15 @@ (define-public guile-fibers-1.1 (substitute* "Makefile" (("tests/speedup.scm") "")))))))) (native-inputs - (list texinfo pkg-config autoconf automake libtool + (list texinfo pkg-config autoconf-2.71 automake libtool guile-3.0 ;for 'guild compile ;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS' gettext-minimal)) (inputs - (list guile-3.0)) ;for libguile-3.0.so - (supported-systems - ;; This version requires 'epoll' and is thus limited to Linux-based - ;; systems, but this may change soon: - ;; . - (filter (cut string-suffix? "-linux" <>) %supported-systems)) + (append (list guile-3.0) ;for libguile-3.0.so + (if (hurd-target?) + (list libevent) + '()))) (synopsis "Lightweight concurrency facility for Guile") (description "Fibers is a Guile library that implements a a lightweight concurrency @@ -849,6 +846,36 @@ (define-public guile-fibers-1.1 (properties '((upstream-name . "fibers"))) (license license:lgpl3+))) +(define-public guile-fibers-1.1 + (package + (inherit guile-fibers-1.3) + (version "1.1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/wingo/fibers") + (commit (string-append "v" version)))) + (file-name (git-file-name "guile-fibers" version)) + (sha256 + (base32 + "0ll63d7202clapg1k4bilbnlmfa4qvpjnsd7chbkka4kxf5klilc")) + (patches + (search-patches "guile-fibers-wait-for-io-readiness.patch" + "guile-fibers-epoll-instance-is-dead.patch" + "guile-fibers-fd-finalizer-leak.patch")))) + (native-inputs + (list texinfo pkg-config autoconf automake libtool + guile-3.0 ;for 'guild compile + ;; Gettext brings 'AC_LIB_LINKFLAGS_FROM_LIBS' + gettext-minimal)) + (inputs + (list guile-3.0)) ;for libguile-3.0.so + (supported-systems + ;; This version requires 'epoll' and is thus limited to Linux-based + ;; systems, which is fixed in 1.2.0: + ;; . + (filter (cut string-suffix? "-linux" <>) %supported-systems)))) + (define-public guile-fibers-next (let ((commit "99fc3e38048f732de67c43fde52e949fa294aa7d") (revision "1")) diff --git a/gnu/packages/patches/guile-fibers-libevent-32-bit.patch b/gnu/packages/patches/guile-fibers-libevent-32-bit.patch new file mode 100644 index 0000000000..a1cc99fdbe --- /dev/null +++ b/gnu/packages/patches/guile-fibers-libevent-32-bit.patch @@ -0,0 +1,18 @@ +This fixes a bug with the libevent backend on 32-bit platforms: + + https://github.com/wingo/fibers/issues/86 + +diff --git a/extensions/libevent.c b/extensions/libevent.c +index 4f44de9..52c9d73 100644 +--- a/extensions/libevent.c ++++ b/extensions/libevent.c +@@ -215,7 +215,8 @@ run_event_loop (void *p) + microsec = -1; + else if (data->timeout >= 0) + { +- microsec = data->timeout / time_units_per_microsec; ++ microsec = (time_units_per_microsec == 0) ++ ? 0 : data->timeout / time_units_per_microsec; + tv.tv_sec = 0; + tv.tv_usec = microsec; + } -- 2.40.1 ------------=_1686779462-32657-3--