From patchwork Tue Sep 12 06:58:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christopher Baines X-Patchwork-Id: 53759 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 EB9EF27BBEA; Tue, 12 Sep 2023 08:00:36 +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.9 required=5.0 tests=BAYES_00,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 CE4DC27BBE2 for ; Tue, 12 Sep 2023 08:00:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qfxMS-00018u-7j; Tue, 12 Sep 2023 02:59:00 -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 1qfxMP-0000xZ-Iw for guix-patches@gnu.org; Tue, 12 Sep 2023 02:58:57 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qfxMP-0007cA-BD for guix-patches@gnu.org; Tue, 12 Sep 2023 02:58:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qfxMT-0005fZ-Pv for guix-patches@gnu.org; Tue, 12 Sep 2023 02:59:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65887] [PATCH] gnu: guile-fibers: Remove version from latest package. Resent-From: Christopher Baines Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 12 Sep 2023 06:59:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65887 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65887@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.169450191721760 (code B ref -1); Tue, 12 Sep 2023 06:59:01 +0000 Received: (at submit) by debbugs.gnu.org; 12 Sep 2023 06:58:37 +0000 Received: from localhost ([127.0.0.1]:55898 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxM5-0005eu-5l for submit@debbugs.gnu.org; Tue, 12 Sep 2023 02:58:37 -0400 Received: from lists.gnu.org ([2001:470:142::17]:60854) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfxM2-0005ed-IJ for submit@debbugs.gnu.org; Tue, 12 Sep 2023 02:58:35 -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 1qfxLr-0000Jj-RY for guix-patches@gnu.org; Tue, 12 Sep 2023 02:58:23 -0400 Received: from mira.cbaines.net ([212.71.252.8]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qfxLo-0007R4-7p for guix-patches@gnu.org; Tue, 12 Sep 2023 02:58:23 -0400 Received: from localhost (unknown [217.155.61.229]) by mira.cbaines.net (Postfix) with ESMTPSA id 6558227BBE2 for ; Tue, 12 Sep 2023 07:58:17 +0100 (BST) Received: from localhost (localhost [local]) by localhost (OpenSMTPD) with ESMTPA id cfe7718e for ; Tue, 12 Sep 2023 06:58:17 +0000 (UTC) From: Christopher Baines Date: Tue, 12 Sep 2023 07:58:16 +0100 Message-ID: <0db9624176856259e901cabfbb18bb3e19366778.1694501896.git.mail@cbaines.net> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 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, 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches As I think this makes more sense, the version is only specified when you need a specific previous release. * gnu/packages/guile-xyz.scm (guile-fibers): Rename to guile-fibers-1.0. (guile-fibers-1.3): Rename to guile-fibers. (guile-fibers-1.1): Inherit from guile-fibers. * gnu/packages/admin.scm (shepherd-0.10)[native-inputs]: Replace guile-fibers-1.3 with guile-fibers. * gnu/packages/ci.scm (cuirass)[inputs]: Likewise. * gnu/packages/gnunet.scm (gnunet-scheme)[propagated-inputs,native-inputs]: Likewise. * gnu/packages/package-management.scm (guix-build-coordinator) [inputs,propagated-inputs]: Likewise. * gnu/packages/package-management.scm (nar-herder)[inputs,propagated-inputs]: Likewise. * gnu/packages/web.scm (guix-data-service)[propagated-inputs]: Likewise. --- gnu/packages/admin.scm | 2 +- gnu/packages/ci.scm | 2 +- gnu/packages/gnunet.scm | 4 ++-- gnu/packages/guile-xyz.scm | 8 +++++--- gnu/packages/package-management.scm | 8 ++++---- gnu/packages/web.scm | 2 +- 6 files changed, 14 insertions(+), 12 deletions(-) base-commit: daeeaa221605726d8853b00261619ba039bd6db7 diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index 5d586e6f36..6fc16d8af6 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -393,7 +393,7 @@ (define-public shepherd-0.10 ;; single-board computers. (if (target-arm?) guile-fibers-1.1 - guile-fibers-1.3)))) + guile-fibers)))) (inputs (modify-inputs (package-inputs shepherd-0.9) (replace "guile-fibers" (this-package-native-input "guile-fibers")))))) diff --git a/gnu/packages/ci.scm b/gnu/packages/ci.scm index f38dd4383d..848e008b3b 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.3 + guile-fibers guile-gcrypt guile-json-4 guile-simple-zmq diff --git a/gnu/packages/gnunet.scm b/gnu/packages/gnunet.scm index f16a223d10..d1ac228639 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.3)) + guile-fibers)) (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.3 + guile-fibers libfaketime automake autoconf diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index b40079c383..83634c8e8c 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -799,7 +799,7 @@ (define-public guile2.2-dsv (replace "guile-lib" guile2.2-lib) (replace "guile-smc" guile2.2-smc))))) -(define-public guile-fibers-1.3 +(define-public guile-fibers (package (name "guile-fibers") (version "1.3.1") @@ -856,9 +856,11 @@ (define-public guile-fibers-1.3 (properties '((upstream-name . "fibers"))) (license license:lgpl3+))) +(define-public guile-fibers-1.3 guile-fibers) + (define-public guile-fibers-1.1 (package - (inherit guile-fibers-1.3) + (inherit guile-fibers) (version "1.1.1") (source (origin (method git-fetch) @@ -886,7 +888,7 @@ (define-public guile-fibers-1.1 ;; . (filter (cut string-suffix? "-linux" <>) %supported-systems)))) -(define-public guile-fibers +(define-public guile-fibers-1.0 (package (inherit guile-fibers-1.1) (version "1.0.0") diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index aa24798071..fe4dc2d462 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1541,7 +1541,7 @@ (define-public guix-build-coordinator guile-gcrypt guix guile-prometheus - guile-fibers-1.3 + guile-fibers guile-lib (first (assoc-ref (package-native-inputs guix) "guile")))) (inputs @@ -1559,7 +1559,7 @@ (define-public guix-build-coordinator guile-sqlite3 guix guile-gnutls - guile-fibers-1.3)) + guile-fibers)) (home-page "https://git.cbaines.net/guix/build-coordinator/") (synopsis "Tool to help build derivations") (description @@ -1775,7 +1775,7 @@ (define-public nar-herder guile-json-4 guile-gcrypt guix - guile-fibers-1.3 + guile-fibers guile-prometheus guile-lib guile-lzlib @@ -1788,7 +1788,7 @@ (define-public nar-herder (list guile-json-4 guile-gcrypt guix - guile-fibers-1.3 + guile-fibers guile-prometheus guile-lib guile-lzlib diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 1b4eafeab8..159de69977 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -4916,7 +4916,7 @@ (define-public guix-data-service bash-minimal)) (propagated-inputs (list guix - guile-fibers-1.3 + guile-fibers guile-json-4 guile-email guile-prometheus