From patchwork Wed Feb 1 09:36:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 46559 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 B4A4B27BBEB; Wed, 1 Feb 2023 09:37:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 641E027BBE9 for ; Wed, 1 Feb 2023 09:37:16 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pN9Y8-0004b8-Kd; Wed, 01 Feb 2023 04:37:04 -0500 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 1pN9Y7-0004aB-Fm for guix-patches@gnu.org; Wed, 01 Feb 2023 04:37:03 -0500 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 1pN9Y7-0007Bs-6A for guix-patches@gnu.org; Wed, 01 Feb 2023 04:37:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pN9Y7-0006Ek-1d for guix-patches@gnu.org; Wed, 01 Feb 2023 04:37:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61078] [PATCH v2 3/4] gnu: Rename 'guile-3.0/fixed' to 'guile-3.0/pinned'. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Feb 2023 09:37:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 61078 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 61078@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 61078-submit@debbugs.gnu.org id=B61078.167524418423905 (code B ref 61078); Wed, 01 Feb 2023 09:37:03 +0000 Received: (at 61078) by debbugs.gnu.org; 1 Feb 2023 09:36:24 +0000 Received: from localhost ([127.0.0.1]:56484 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pN9XT-0006DU-UN for submit@debbugs.gnu.org; Wed, 01 Feb 2023 04:36:24 -0500 Received: from mail-wm1-f41.google.com ([209.85.128.41]:42555) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pN9XN-0006Ch-Vt for 61078@debbugs.gnu.org; Wed, 01 Feb 2023 04:36:21 -0500 Received: by mail-wm1-f41.google.com with SMTP id j29-20020a05600c1c1d00b003dc52fed235so897821wms.1 for <61078@debbugs.gnu.org>; Wed, 01 Feb 2023 01:36:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=y2uNgTvamPMCrVpOrOoG8cHVeUaLmUyI4P79X+ds45M=; b=mew31MvOqZQgLKJUpS1OhS/caHmC8iBybWbXtr1uNoVlT+xhyU3K5A/Amu89VnIfcD FGRsAiIzJhTebqc7lykQ4ZvKS/p8bk8dhfNhBEKddEXKKvQAHPY06Ze4wF3PNfLKhhHh 60M6MTpXhah/Eu089gQqNk2jAWtKo9kgezd41GVYl266PbhU/ST2JUTsUGvs4cC6GnHi J4XKZqjWRy1+S3RsIuaEdj1NZNZDnB0WQzoSBgAxLahNI6WDUQwsHWNqveVo7Kk9brWE DnmxsSYrbAeEQSh02LpFHNjrEWWbbsw/JOavw6I83Yf3XRhxmSsjkWdT8UQ2mMKO51HS du4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=y2uNgTvamPMCrVpOrOoG8cHVeUaLmUyI4P79X+ds45M=; b=hfYxh2bxeB/OuU8orV6o32h+KZpUWFomFdgnhAiylfvV19QiAw6IbtGP6F8B1VAFJM ygMv/cyQH4iv+KsJIVHI2wNwlXdggWds3RgmuLbf8c3QCYxPiws928FyXBYb3x5r+8Y2 Ek0GkA/Wovibhlvc9CqUyj8sOCobxgpB9UKrVzcs0iUBWC1uClK6R1tgnnZS4lu7DXiU vvlr0pp/7V/sWmhsDEmLJnTZIyNSB4RSS6tD3o3zUnbl5b4wJAA6vxW6VflXIyyuSFCu 8N02d0sEYosVMt+35g5L/2QMXxBQkPohYqJiVFWM/LMQRBbSfF6djkADtm5bXoq81EMh wZhg== X-Gm-Message-State: AO0yUKX6Jwc92kavnU0EhHhZJ3XLcgksuCQMrcs5wEFUWG9GK2+/YG0t xmWqK/VLgfoxtJyv2FbTfFnVGg1IYUc= X-Google-Smtp-Source: AK7set+i0z/49p9zHT5q7Uvl5CdxX47og+oy8+PN/NyilSYfVWYCspKEj2TYWpf5GiMK+pDWPkh8Cg== X-Received: by 2002:a05:600c:510a:b0:3dc:5b88:e706 with SMTP id o10-20020a05600c510a00b003dc5b88e706mr1365771wms.1.1675244172376; Wed, 01 Feb 2023 01:36:12 -0800 (PST) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id p11-20020a1c544b000000b003dc4fd6e624sm1163107wmi.19.2023.02.01.01.36.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Feb 2023 01:36:12 -0800 (PST) From: Simon Tournier Date: Wed, 1 Feb 2023 10:36:02 +0100 Message-Id: <20230201093603.1432036-3-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230201093603.1432036-1-zimon.toutoune@gmail.com> References: <20230201093603.1432036-1-zimon.toutoune@gmail.com> 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.scm: Rename variable 'guile-3.0/fixed' to 'guile-3.0/pinned', add deprecation. * etc/release-manifest.scm (%packages-to-cross-build): Replace 'guile-3.0/fixed' with 'guile-3.0/pinned'. * gnu/packages/autotools.scm (make-autoconf-wrapper)[inputs]: Idem. * gnu/packages/commencement.scm (guile-final): Idem. --- etc/release-manifest.scm | 2 +- gnu/packages/autotools.scm | 2 +- gnu/packages/commencement.scm | 2 +- gnu/packages/guile.scm | 6 +++++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/etc/release-manifest.scm b/etc/release-manifest.scm index 3ef3483300..83983c0738 100644 --- a/etc/release-manifest.scm +++ b/etc/release-manifest.scm @@ -82,7 +82,7 @@ (define %packages-to-cross-build ;; Packages that must be cross-buildable from x86_64-linux. ;; FIXME: Add (@ (gnu packages gcc) gcc) when ;; is fixed. - (append (list (@ (gnu packages guile) guile-3.0/fixed)) + (append (list (@ (gnu packages guile) guile-3.0/pinned)) (map specification->package '("coreutils" "grep" "sed" "findutils" "diffutils" "patch" "gawk" "gettext" "gzip" "xz" diff --git a/gnu/packages/autotools.scm b/gnu/packages/autotools.scm index 118f25ba09..006a9e202b 100644 --- a/gnu/packages/autotools.scm +++ b/gnu/packages/autotools.scm @@ -209,7 +209,7 @@ (define (make-autoconf-wrapper autoconf) (inputs `(("guile" ;; XXX: Kludge to hide the circular dependency. ,(module-ref (resolve-interface '(gnu packages guile)) - 'guile-3.0/fixed)) + 'guile-3.0/pinned)) ("autoconf" ,autoconf) ("bash" ,bash-minimal))) (arguments diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index b4566b41cc..7335aedec2 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -3623,7 +3623,7 @@ (define-public guile-final ;; This package must be public because other modules refer to it. However, ;; mark it as hidden so that 'fold-packages' ignores it. (with-boot4 (hidden-package - (package-with-bootstrap-guile guile-3.0/fixed)))) + (package-with-bootstrap-guile guile-3.0/pinned)))) (define-public glibc-utf8-locales-final ;; Now that we have GUILE-FINAL, build the UTF-8 locales. They are needed diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm index edf289e574..2fd9b711ce 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -419,7 +419,11 @@ (define-public guile-3.0-latest "GUILE_OPTIMIZATIONS = -O1 -Oresolve-primitives -Ocps\n"))))) '()))))))) -(define-public guile-3.0/fixed +;;; The symbol guile-3.0/fixed should be used when guile-3.0 needs fixes +;;; (security or else) and this deprecation could be removed. +(define-deprecated/public-alias guile-3.0/fixed guile-3.0/pinned) + +(define-public guile-3.0/pinned ;; A package of Guile that's rarely changed. It is the one used in the ;; `base' module, and thus changing it entails a full rebuild. (package