From patchwork Wed Jun 7 08:38:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 50742 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 34D5A27BBE9; Wed, 7 Jun 2023 09:40:28 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 824A627BBEA for ; Wed, 7 Jun 2023 09:40:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6oi3-0004cz-TL; Wed, 07 Jun 2023 04:40:03 -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 1q6oi2-0004av-Dx for guix-patches@gnu.org; Wed, 07 Jun 2023 04:40:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q6oi2-0004Ec-3h for guix-patches@gnu.org; Wed, 07 Jun 2023 04:40:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q6oi1-0000df-Ku for guix-patches@gnu.org; Wed, 07 Jun 2023 04:40:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63942] [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:40:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 63942 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 63942@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.16861271502370 (code B ref -1); Wed, 07 Jun 2023 08:40:01 +0000 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: Ludovic =?utf-8?q?Court=C3=A8s?= 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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; + } From patchwork Wed Jun 7 08:41:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 50745 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id E318827BBE2; Wed, 7 Jun 2023 09:43:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id CDFFB27BBE9 for ; Wed, 7 Jun 2023 09:43:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6okz-00059C-MD; Wed, 07 Jun 2023 04:43:05 -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 1q6okx-00057i-B0 for guix-patches@gnu.org; Wed, 07 Jun 2023 04:43:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q6okx-0004sX-34 for guix-patches@gnu.org; Wed, 07 Jun 2023 04:43:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q6okw-0000kc-VK for guix-patches@gnu.org; Wed, 07 Jun 2023 04:43:02 -0400 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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) From patchwork Wed Jun 7 08:41:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 50743 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 0FB1527BBE9; Wed, 7 Jun 2023 09:43:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id C9C5027BBE2 for ; Wed, 7 Jun 2023 09:43:07 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6okx-00057o-H0; Wed, 07 Jun 2023 04:43:03 -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 1q6okw-00057C-Tw for guix-patches@gnu.org; Wed, 07 Jun 2023 04:43:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q6okw-0004sN-LJ for guix-patches@gnu.org; Wed, 07 Jun 2023 04:43:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q6okw-0000kS-Gc for guix-patches@gnu.org; Wed, 07 Jun 2023 04:43:02 -0400 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 From patchwork Wed Jun 7 08:41:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 50746 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B222B27BBE9; Wed, 7 Jun 2023 09:43:44 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 2477E27BBE2 for ; Wed, 7 Jun 2023 09:43:43 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6okz-00059B-EK; Wed, 07 Jun 2023 04:43:05 -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 1q6okx-00057v-Oe for guix-patches@gnu.org; Wed, 07 Jun 2023 04:43:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q6okx-0004sg-Ge for guix-patches@gnu.org; Wed, 07 Jun 2023 04:43:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q6okx-0000kj-Cp for guix-patches@gnu.org; Wed, 07 Jun 2023 04:43:03 -0400 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 From patchwork Wed Jun 7 08:41:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 50744 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6910427BBEA; Wed, 7 Jun 2023 09:43:19 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D45CC27BBE2 for ; Wed, 7 Jun 2023 09:43:18 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q6okz-00059D-UW; Wed, 07 Jun 2023 04:43:05 -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 1q6oky-00058d-Bw for guix-patches@gnu.org; Wed, 07 Jun 2023 04:43:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1q6oky-0004sn-3W for guix-patches@gnu.org; Wed, 07 Jun 2023 04:43:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1q6okx-0000kq-P4 for guix-patches@gnu.org; Wed, 07 Jun 2023 04:43:03 -0400 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 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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