From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id IKo8K0/1+GEJwwAAgWs5BA (envelope-from ) for ; Tue, 01 Feb 2022 09:54:39 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id oFnsI0/1+GG9IwEAG6o9tA (envelope-from ) for ; Tue, 01 Feb 2022 09:54:39 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 2ABBB2ABBC for ; Tue, 1 Feb 2022 09:54:39 +0100 (CET) Received: from localhost ([::1]:42024 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nEovt-0004Lm-DW for larch@yhetil.org; Tue, 01 Feb 2022 03:54:37 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56522) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nEovN-0004Kl-NE for guix-patches@gnu.org; Tue, 01 Feb 2022 03:54:08 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48776) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nEovK-0008FR-9s for guix-patches@gnu.org; Tue, 01 Feb 2022 03:54:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nEovK-00051a-A9 for guix-patches@gnu.org; Tue, 01 Feb 2022 03:54:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53681] [PATCH] gnu: guile-fibers: Add version 1.1.0. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 01 Feb 2022 08:54:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 53681 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 53681@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164370563319295 (code B ref -1); Tue, 01 Feb 2022 08:54:02 +0000 Received: (at submit) by debbugs.gnu.org; 1 Feb 2022 08:53:53 +0000 Received: from localhost ([127.0.0.1]:41679 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nEovA-000518-Kx for submit@debbugs.gnu.org; Tue, 01 Feb 2022 03:53:52 -0500 Received: from lists.gnu.org ([209.51.188.17]:44098) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nEov8-000510-0T for submit@debbugs.gnu.org; Tue, 01 Feb 2022 03:53:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:56422) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nEov1-0004Gs-8C for guix-patches@gnu.org; Tue, 01 Feb 2022 03:53:44 -0500 Received: from mira.cbaines.net ([212.71.252.8]:36284) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nEouy-0008Bv-3R for guix-patches@gnu.org; Tue, 01 Feb 2022 03:53:42 -0500 Received: from localhost (unknown [IPv6:2a02:8010:68c1:0:8ac0:b4c7:f5c8:7caa]) by mira.cbaines.net (Postfix) with ESMTPSA id 90D5F27BBE9 for ; Tue, 1 Feb 2022 08:53:26 +0000 (GMT) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id f15a583b for ; Tue, 1 Feb 2022 08:53:26 +0000 (UTC) From: Christopher Baines Date: Tue, 1 Feb 2022 08:53:26 +0000 Message-Id: <20220201085326.1332-1-mail@cbaines.net> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=212.71.252.8; envelope-from=mail@cbaines.net; helo=mira.cbaines.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01, UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1643705679; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=YUz6WmMA+NoMKz0lzhAjYD8/H4zVcSlpOctRYMR+gkw=; b=dhKGEy9Z/aHc8Hxm5zUwon3PJ6BijsTsUtqHOucNLgZtokbTLfTM/vxkJTeoxPO2VHXx0S yhiiHGR9Z28QBGpiYp9tH2wy460BYpDDji8QIjEclCt7v9NUStWLhwoHjMvyBrGQJ8UnDq VV9gNscodtmBVIDB6N6Op6qeDHeZnImBrAbolWZXm5RuGWwmhjbQ0GgewtAJbrEnEJRWCl oEoTjsZ++xGF07qkbFyv/IH6z35WidZaz/jIprLwXvCaS0/tDaTnITNFx0dXxYqGMZ1nan iAyQ3W/xkrJVTvpq3JbIx/qHgLs8Uadw/XQTflswyuYtMJ96hjqe5d76wd6ONg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1643705679; a=rsa-sha256; cv=none; b=AT1GnuS1dYoG8sflSsETpNLkHHTAPoBOJ4LQHj7gkpWxtvpkMzdcDajZe/nRmFD61pWH0R RqwRFebMv/E2zCsAp+BccgVe3haHNwP8M0rAgSuJ0ykOeGK3H3+FlgVI+nb9q4D/hPU0HC j/61ibDSmc6s6JRQM3AU7KiO8TFXdV2VwsPp56glZ3jLYWErGdJOSX5RxT/VHDfk2nN5/h qKNMdZP+C6aYXfUTqfqLDNtvt0O6jWEAYze1qFVtMlzjWVE6wqPn882E11zUUCSv1Jh7cK gsNvzKlAr4uXYbTgwC94gQgB7Wbr5hUA46+E/k3s0zggnvUZ1QHH9dXcKUDFfw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -2.33 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 2ABBB2ABBC X-Spam-Score: -2.33 X-Migadu-Scanner: scn1.migadu.com X-TUID: 1cbqJgORQ++Q This release looks to break a few packages, so keep using fibers 1.0 to build things, and provide the new version to allow switching to when packages are compatible. * gnu/packages/guile-xyz.scm (guile-fibers-1.1): New variable. (guile-fibers): Inherit from guile-fibers-1.1. (guile2.0-fibers): Rename to guile2.2-fibers, and inherit from guile-fibers-1.1. --- gnu/packages/guile-xyz.scm | 73 ++++++++++++++++++++++++++------------ 1 file changed, 50 insertions(+), 23 deletions(-) diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 38c6def1fc..f35ba43057 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -601,9 +601,55 @@ (define-public guile2.2-dsv (inputs (list guile-2.2)) (propagated-inputs `(("guile-lib" ,guile2.2-lib))))) -(define-public guile-fibers +(define-public guile-fibers-1.1 (package (name "guile-fibers") + (version "1.1.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://github.com/wingo/fibers/releases/download/v" + version "/fibers-" version ".tar.gz")) + (sha256 + (base32 + "1lqz39shlhif5fhpyv2wili0yzb0nhf5ciiv7mdqsq0vljirhrm0")))) + (build-system gnu-build-system) + (arguments + '(#:phases (modify-phases %standard-phases + (add-after 'install 'mode-guile-objects + (lambda* (#:key outputs #:allow-other-keys) + ;; .go files are installed to "lib/guile/X.Y/cache". + ;; This phase moves them to "…/site-ccache". + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib/guile")) + (old (car (find-files lib "^ccache$" + #:directories? #t))) + (new (string-append (dirname old) + "/site-ccache"))) + (rename-file old new) + #t)))))) + (native-inputs + (list texinfo pkg-config)) + (inputs + (list guile-3.0)) + (synopsis "Lightweight concurrency facility for Guile") + (description + "Fibers is a Guile library that implements a a lightweight concurrency +facility, inspired by systems like Concurrent ML, Go, and Erlang. A fiber is +like a \"goroutine\" from the Go language: a lightweight thread-like +abstraction. Systems built with Fibers can scale up to millions of concurrent +fibers, tens of thousands of concurrent socket connections, and many parallel +cores. The Fibers library also provides Concurrent ML-like channels for +communication between fibers. + +Note that Fibers makes use of some Guile 2.1/2.2-specific features and +is not available for Guile 2.0.") + (home-page "https://github.com/wingo/fibers") + (license license:lgpl3+))) + +(define-public guile-fibers + (package + (inherit guile-fibers-1.1) (version "1.0.0") (source (origin (method url-fetch) @@ -637,7 +683,6 @@ (define-public guile-fibers (patches ;; fixes a resource leak that causes crashes in the tests (search-patches "guile-fibers-destroy-peer-schedulers.patch")))) - (build-system gnu-build-system) (arguments '(;; The code uses 'scm_t_uint64' et al., which are deprecated in 3.0. #:configure-flags '("CFLAGS=-Wno-error=deprecated-declarations") @@ -653,29 +698,11 @@ (define-public guile-fibers (new (string-append (dirname old) "/site-ccache"))) (rename-file old new) - #t)))))) - (native-inputs - (list texinfo pkg-config)) - (inputs - (list guile-3.0)) - (synopsis "Lightweight concurrency facility for Guile") - (description - "Fibers is a Guile library that implements a a lightweight concurrency -facility, inspired by systems like Concurrent ML, Go, and Erlang. A fiber is -like a \"goroutine\" from the Go language: a lightweight thread-like -abstraction. Systems built with Fibers can scale up to millions of concurrent -fibers, tens of thousands of concurrent socket connections, and many parallel -cores. The Fibers library also provides Concurrent ML-like channels for -communication between fibers. - -Note that Fibers makes use of some Guile 2.1/2.2-specific features and -is not available for Guile 2.0.") - (home-page "https://github.com/wingo/fibers") - (license license:lgpl3+))) + #t)))))))) -(define-public guile2.0-fibers +(define-public guile2.2-fibers (package - (inherit guile-fibers) + (inherit guile-fibers-1.1) (name "guile2.2-fibers") (inputs (list guile-2.2)))) -- 2.34.0