From patchwork Wed Feb 1 09:36:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 46562 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 28A7127BBED; Wed, 1 Feb 2023 09:37:47 +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=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 8C1A027BBE9 for ; Wed, 1 Feb 2023 09:37:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pN9Y7-0004aX-S1; Wed, 01 Feb 2023 04:37:03 -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 1pN9Y6-0004Yv-JA for guix-patches@gnu.org; Wed, 01 Feb 2023 04:37:02 -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 1pN9Y6-0007BK-Aj for guix-patches@gnu.org; Wed, 01 Feb 2023 04:37:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pN9Y6-0006EV-4E for guix-patches@gnu.org; Wed, 01 Feb 2023 04:37:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61078] [PATCH v2 1/4] gnu: Rename 'git-minimal/fixed' to 'git-minimal/pinned'. References: <20230126164238.2462377-1-zimon.toutoune@gmail.com> In-Reply-To: <20230126164238.2462377-1-zimon.toutoune@gmail.com> Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Feb 2023 09:37:02 +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.167524418123884 (code B ref 61078); Wed, 01 Feb 2023 09:37:02 +0000 Received: (at 61078) by debbugs.gnu.org; 1 Feb 2023 09:36:21 +0000 Received: from localhost ([127.0.0.1]:56480 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pN9XQ-0006D3-Ot for submit@debbugs.gnu.org; Wed, 01 Feb 2023 04:36:21 -0500 Received: from mail-wm1-f51.google.com ([209.85.128.51]:44711) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pN9XN-0006Ce-Mb for 61078@debbugs.gnu.org; Wed, 01 Feb 2023 04:36:19 -0500 Received: by mail-wm1-f51.google.com with SMTP id n28-20020a05600c3b9c00b003ddca7a2bcbso894485wms.3 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:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=pM+lDds9krKP4oBZQTdJbQC1kojye8Dp1BGOxt77Rbw=; b=Oe7l3gO5TaQiueeL/2BEwIULpD+nABqIzNS2tyb9z7wDzclaezzgmmR+p+EZ4+GbR/ v1eGQQB+xoVD5uvEVJYTFVnntuLQAgCQIXWDF+TRpT3vpNm2uWOqbCi2TvUJ3c0z/+u6 O9vWzqGErY+CNT/dFAbXL/fArnjmmiHXSaKP4xDmK/k8cbWBGg0c1XH7Qf/U3aetKWj1 rv9W9TWnebPlWXT8kkkQQmLDRvQaIo7AyPaw4ettJh4NjHAq0SJvCMaYV/7J7HWZb7Ja GwMvgeoj6ph4U1W3FAMrajRFU4lUSlbSD/Auv5tF3WCuwx8hBezCWkJbrQFaSKS3X3/y POzQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pM+lDds9krKP4oBZQTdJbQC1kojye8Dp1BGOxt77Rbw=; b=VyuIfnzItDxPGZu6w23Bhvo100iGwzN11xAqxJArJniAXVpDrXmrBzJg9stSqLTWbX pjsfw+fgn9N3TWxKu3foEWChFzGQyaRyaUQ0J+ocv4QM60tT8FkjVThuvTehlMSQj1Gs 5Md4Ip9nwsIKmekWOcjRIuAP9R+MXhbWjJ0O/jAbTuTd2MbZPe6SxG704Gxy1ZHDd9Vm ujIyK8JpUAyVrFyqJoyAHc1Nq7WHVzJzpZdxYjLlb/4271hnzo2VWsFfhAQFmFfHsby+ 8k7csX4hLtUMobj1Q70Ar/8MmWmEOkcrfRcLUEOXSc5GjJEGwm+jl89rpxdmGh0ChOa2 HdaA== X-Gm-Message-State: AO0yUKUkOMclzgPWINHUAFau3cpAdMr8+RDjiNyIqpncRp5R3VGnnqhz kv5VTCNsOq6ro6R8fYOtXeK5OVYX4h4= X-Google-Smtp-Source: AK7set+mvr6Rm657rcx5yBl6udD9DQ1xoG7T/shahTB82jGI7/j+VBk+NnGxNX8CduSW0thygSbklg== X-Received: by 2002:a05:600c:1ca4:b0:3dc:54da:ba3e with SMTP id k36-20020a05600c1ca400b003dc54daba3emr1311780wms.3.1675244171423; Wed, 01 Feb 2023 01:36:11 -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.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Feb 2023 01:36:11 -0800 (PST) From: Simon Tournier Date: Wed, 1 Feb 2023 10:36:00 +0100 Message-Id: <20230201093603.1432036-1-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.38.1 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/version-control.scm: Rename variable 'git-minimal/fixed' to 'git-minimal/pinned', add depreciation. * gnu/packages/erlang.scm (erlang-erlware-commons)[native-inputs]: Replace 'git-minimal/fixed' with 'git-minimal/pinned'. (rebar3-git-vsn)[inputs]: Idem. * gnu/packages/gnome.scm (gnome-photos)[native-inputs]: Idem. * gnu/packages/gtk.scm (graphene)[native-inputs]: Idem. * gnu/packages/haskell.scm (ghc-8.8)[native-inputs]: Idem (ghc-8.10)[native-inputs]: Idem. * gnu/packages/julia-xyz.scm (julia-documenter)[native-inputs]: Idem. * gnu/packages/ocaml.scm (opam)[native-inputs]: Idem. (ocamlformat)[native-inputs]: Idem. * gnu/packages/python-xyz.scm (python-check-manifest)[native-inputs]: Idem. (python-scikit-build)[native-inputs]: Idem. --- gnu/packages/erlang.scm | 4 ++-- gnu/packages/gnome.scm | 2 +- gnu/packages/gtk.scm | 2 +- gnu/packages/haskell.scm | 4 ++-- gnu/packages/julia-xyz.scm | 2 +- gnu/packages/ocaml.scm | 4 ++-- gnu/packages/python-xyz.scm | 4 ++-- gnu/packages/version-control.scm | 7 ++++++- 8 files changed, 17 insertions(+), 12 deletions(-) base-commit: 14323edcc37d9efaae2491cf5f57ea0621412d7e diff --git a/gnu/packages/erlang.scm b/gnu/packages/erlang.scm index cfada5a619..dc9a932aec 100644 --- a/gnu/packages/erlang.scm +++ b/gnu/packages/erlang.scm @@ -376,7 +376,7 @@ (define-public erlang-erlware-commons (propagated-inputs (list erlang-cf)) (native-inputs - (list git-minimal/fixed)) ;; Required for tests + (list git-minimal/pinned)) ;; Required for tests (arguments `(#:phases (modify-phases %standard-phases @@ -701,7 +701,7 @@ (define-public rebar3-git-vsn (base32 "1dfz56034pa25axly9vqdzv3phkn8ll0qwrkws96pbgcprhky1hx")))) (build-system rebar-build-system) (inputs - (list git-minimal/fixed)) + (list git-minimal/pinned)) (arguments `(;; Running the tests require binary artifact (tar-file containing ;; samples git repos) TODO: remove these from the source diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f8b02670f7..937f26e172 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -909,7 +909,7 @@ (define-public gnome-photos (list dbus desktop-file-utils gettext-minimal - git-minimal/fixed + git-minimal/pinned `(,glib "bin") gobject-introspection gsettings-desktop-schemas diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 5024455368..f575194c73 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2519,7 +2519,7 @@ (define-public graphene '("-Dintrospection=false") '())))) (native-inputs - `(("git" ,git-minimal/fixed) + `(("git" ,git-minimal/pinned) ("gobject-introspection" ,gobject-introspection) ("mutest" ,mutest) ("pkg-config" ,pkg-config))) diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm index 91610a1f2e..4eb13f76d7 100644 --- a/gnu/packages/haskell.scm +++ b/gnu/packages/haskell.scm @@ -1143,7 +1143,7 @@ (define-public ghc-8.8 (sha256 (base32 "0c55pj2820q26rikhpf636sn4mjgqsxjrl94vsywrh79dxp3k14z")))) - ("git" ,git-minimal/fixed) ; invoked during tests + ("git" ,git-minimal/pinned) ; invoked during tests ,@(filter (match-lambda (("ghc-bootstrap" . _) #f) (("ghc-testsuite" . _) #f) @@ -1195,7 +1195,7 @@ (define-public ghc-8.10 (sha256 (base32 "1zl25gg6bpx5601k8h3cqnns1xfc0nqgwnh8jvn2s65ra3f2g1nz")))) - ("git" ,git-minimal/fixed) ; invoked during tests + ("git" ,git-minimal/pinned) ; invoked during tests ,@(filter (match-lambda (("ghc-bootstrap" . _) #f) (("ghc-testsuite" . _) #f) diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 414aba03f0..b831b41db2 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -1614,7 +1614,7 @@ (define-public julia-documenter (inputs (list python-wrapper)) (native-inputs - (list git-minimal/fixed ;needed for the "Utilities" test + (list git-minimal/pinned ;needed for the "Utilities" test julia-documentermarkdown julia-documentertools)) (home-page "https://juliadocs.github.io/Documenter.jl") diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 3458c87818..0cc92c3e85 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -938,7 +938,7 @@ (define-public opam ("ocaml-cppo" ,ocaml-cppo) ;; For tests. - ("git" ,git-minimal/fixed) + ("git" ,git-minimal/pinned) ("openssl" ,openssl) ("python" ,python-wrapper) ("rsync" ,rsync) @@ -8656,7 +8656,7 @@ (define-public ocamlformat ocaml-uuseg ocaml-uutf)) (native-inputs - (list git-minimal/fixed ;for tests + (list git-minimal/pinned ;for tests ocaml-alcotest ocaml-ocp-indent ocaml-bisect-ppx)) (home-page "https://github.com/ocaml-ppx/ocamlformat") (synopsis "Auto-formatter for OCaml code") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b14c4ff0f3..66fc1064dc 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -25933,7 +25933,7 @@ (define-public python-check-manifest (invoke "git" "config" "--global" "protocol.file.allow" "always")))))) (native-inputs - (list git-minimal/fixed python-pytest)) + (list git-minimal/pinned python-pytest)) (propagated-inputs (list python-pypa-build python-setuptools python-tomli)) (home-page "https://github.com/mgedmin/check-manifest") @@ -28578,7 +28578,7 @@ (define-public python-scikit-build (native-inputs (list cmake-minimal gfortran - git-minimal/fixed ;for tests + git-minimal/pinned ;for tests ninja python-coverage python-cython diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 78a89cfd5b..12e21336ce 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -67,6 +67,7 @@ (define-module (gnu packages version-control) #:use-module ((guix licenses) #:prefix license:) #:use-module (guix utils) #:use-module (guix packages) + #:use-module (guix deprecation) #:use-module (guix gexp) #:use-module (guix download) #:use-module (guix git-download) @@ -670,7 +671,11 @@ (define-public git-minimal perl zlib)))) -(define-public git-minimal/fixed +;;; The symbol git-minimal/fixed should be used when git-minimal needs fixes +;;; (security or else) and this deprecation could be removed. +(define-deprecated/public-alias git-minimal/fixed git-minimal/pinned) + +(define-public git-minimal/pinned ;; Version that rarely changes, depended on by Graphene/GTK+. (package/inherit git-minimal (version "2.33.1") From patchwork Wed Feb 1 09:36:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 46560 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 C626A27BBED; Wed, 1 Feb 2023 09:37:19 +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 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 3B8AD27BBE9 for ; Wed, 1 Feb 2023 09:37:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pN9Y9-0004bf-8G; Wed, 01 Feb 2023 04:37:05 -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-0004aY-Rr 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-0007CH-Hk 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-0006Er-DU for guix-patches@gnu.org; Wed, 01 Feb 2023 04:37:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61078] [PATCH v2 2/4] gnu: Rename 'libnftnl/fixed' to 'libnftnl/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.167524418423912 (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]:56486 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pN9XU-0006DW-AK for submit@debbugs.gnu.org; Wed, 01 Feb 2023 04:36:24 -0500 Received: from mail-wm1-f52.google.com ([209.85.128.52]:51019) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pN9XN-0006Cg-M9 for 61078@debbugs.gnu.org; Wed, 01 Feb 2023 04:36:21 -0500 Received: by mail-wm1-f52.google.com with SMTP id bg26so6326982wmb.0 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=KlXre3pEvYQBT/osDeQAnlks86uLkxaaKzJ7xwrudVg=; b=DFI2ajdjTi1sSPjyfQXs+ahRNhgrF+JrvtrcxjmYTcSY/Xn692I4AYcoVpz8FZAm8j W6QI98Mdl5J6AKSzmOuqLI5tSR3m0VBflA27+TXg4F+pH8qPIyvUlhDIdE8orDK7NMWu xiOCuWQXVHTHTXfPf87SqjRGDs0NKed5QcRK4Ykhm3E67EQqDGHp7/D0BVXyfoalvlkG DOataLbCr5HBi92CJwpbBZmMVGXHFbnR3WaawRHVVCFZZkP4yGMayZhvxL2ZD66LiJlA 6Ce3uToLxPo3Ows8BE0j/KvIsO3owlSi2v/+ln62S86bKAT8c6hpVEQwzoCgsqpuDRTb 4uwA== 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=KlXre3pEvYQBT/osDeQAnlks86uLkxaaKzJ7xwrudVg=; b=lDRPh+AQNlNeZuUafCoZW29GUKDFSacvNXR81R0TSeX4iHXu6yvvfUc7ey1yBfFqQ8 G0swgv1pa2WYFKedkpsG4SbabPwmZMRlbAr95fFOUYAG9IRHQMWaqy43/ibnVShsX/3p TyVBzKU6zH2pJnvwJKqioDJcIFtQtJnH4WhiPov1X7VoY3DqrxAkxGVvodIyo57vWu15 vjv8XjMjrCbBkvNZtfrigoeWhs2Z2dHrtOGSJfwm22khmisP4uD+KJdNXZO+fXDdsmiJ tHo0mzd61FWpzuNf8NN+gUnhg01IhgGOR2sxM69b86bTZPeEwpET7AiC8KafpsvTrntC T/Rw== X-Gm-Message-State: AO0yUKXuky412zx7ctWo9KSfzm+08LpVCMmRnE1Xg1K+zDZrL6i3HQRf wR4KM2sMKeyH+MAcp0Dclp059s4QR5k= X-Google-Smtp-Source: AK7set+plzlXrtUtPGhoXzZyT5EvjeOTmCbm46tERBN1l4D8jjVvD5sYuKPBbM9EQ84H0crg1NTwOA== X-Received: by 2002:a1c:7c0e:0:b0:3dc:5ae4:c13d with SMTP id x14-20020a1c7c0e000000b003dc5ae4c13dmr1208414wmc.4.1675244171888; Wed, 01 Feb 2023 01:36:11 -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:11 -0800 (PST) From: Simon Tournier Date: Wed, 1 Feb 2023 10:36:01 +0100 Message-Id: <20230201093603.1432036-2-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/linux.scm: Rename variable 'libnftnl/fixed' to 'libnftnl/pinned', add deprecation. (iptables)[native-inputs]: Replace 'libnftnl/fixed' with 'libnftnl/pinned'. --- gnu/packages/linux.scm | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 5a776168cc..25c831ac48 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2848,7 +2848,7 @@ (define-public iptables (native-inputs (list pkg-config flex bison)) (inputs - (list libmnl libnftnl/fixed)) + (list libmnl libnftnl/pinned)) (arguments (list #:tests? #f ; no test suite #:configure-flags ; add $libdir to the RUNPATH of executables @@ -7654,9 +7654,13 @@ (define-public libnftnl used by nftables.") (license license:gpl2+))) +;;; The symbol libnftl/fixed should be used when libnftnl needs fixes +;;; (security or else) and this deprecation could be removed. +(define-deprecated/public-alias libnftnl/fixed libnftnl/pinned) + ;; This is used in iptables, which contributes to rust. We're pinning this ;; variant to avoid accidental rebuilds of rust. -(define-public libnftnl/fixed +(define-public libnftnl/pinned (package (inherit libnftnl) (version "1.2.0") (source 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 From patchwork Wed Feb 1 09:36:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 46561 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 77F8527BBEE; Wed, 1 Feb 2023 09:37:44 +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 9424C27BBED for ; Wed, 1 Feb 2023 09:37:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pN9Y7-0004aa-Tg; Wed, 01 Feb 2023 04:37:03 -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-0004Zx-2Q 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 1pN9Y6-0007BV-PA for guix-patches@gnu.org; Wed, 01 Feb 2023 04:37:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pN9Y6-0006Ed-L5 for guix-patches@gnu.org; Wed, 01 Feb 2023 04:37:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61078] [PATCH v2 4/4] gnu: Rename 'samba/fixed' to 'samba/pinned'. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 01 Feb 2023 09:37:02 +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.167524418223895 (code B ref 61078); Wed, 01 Feb 2023 09:37:02 +0000 Received: (at 61078) by debbugs.gnu.org; 1 Feb 2023 09:36:22 +0000 Received: from localhost ([127.0.0.1]:56482 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pN9XR-0006D7-Bo for submit@debbugs.gnu.org; Wed, 01 Feb 2023 04:36:21 -0500 Received: from mail-wm1-f42.google.com ([209.85.128.42]:39573) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pN9XO-0006Ci-FJ for 61078@debbugs.gnu.org; Wed, 01 Feb 2023 04:36:20 -0500 Received: by mail-wm1-f42.google.com with SMTP id hn2-20020a05600ca38200b003dc5cb96d46so867789wmb.4 for <61078@debbugs.gnu.org>; Wed, 01 Feb 2023 01:36:18 -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=mxbzr6ENj18++HjOzek5UazKZTv6YOsfIZJ01LbGepw=; b=f5UnDlHDqgKCQn2N1ia9zj4ztH2eUJ1PesNReoW5kiwm8Uy4Tiox3w9chPyJ+e2uQM OMuLOeR/zGNpkUflwYNETmUvpor4lTb8iW5t3owfOnvwbA2Jj7hez0yXcqY1x7bUEvCO T2bARf4QmD5YPiFmnOpNKtdx/UEpbc8gzi+cvObTXPts68fZDaMqSc1+++05HGiraPga eO6+wAVMx3y6BWZQodayQoSjQNrGKiuQiGHaxF2XIQ4R2pXArRXe28Y2kxVP766mqQBi SdK0rY8U/3OAV1oag/pbf2DjEfhtIkHxoAO22VhtK4hQS+x2yYm+NHumflV4gKmgFhL0 OCyQ== 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=mxbzr6ENj18++HjOzek5UazKZTv6YOsfIZJ01LbGepw=; b=ChccwnbZiOSYpjc0S/TLwpHrnvSnnmP0hKdXj4NjYkzI91H2CcZX/1whVrSOi5pcGA ExKbnfCCsAaSLkGaWagHHPyPzynctJHXDdWmer3rVepHcT4OafopNz9LbnwFN6IR0NAP xJmClklJV45nvL+zDBimKufg8THBSDWofauJZPV5k2LarpHyteC66+bDA2WnQQEljGUv B7kF2jC0Qcisin4uHiX3fcTzeoKyIfAu2byfiAaMRY/6imwewv7XPyHq6gBGmJjzq8vF i2QAN70YXJq5rCh9FYdfuLH0cNMzXpp9oCnBYpWujko4VyG32+/PlrUhwBy/pzjHAW4E KPsw== X-Gm-Message-State: AO0yUKXZapdQaE7wvkbXtreyNf6PjS6unO8IycqiDKtZUfu11uN2R36A knqsNqXOAgBCKVIMLXttzMGPlboUTVc= X-Google-Smtp-Source: AK7set/ZM8JcuwU5sW8GLEw9rtg8+avPvTGyFXXnILn00q/E5UEFR00VaOoR7sHMA1wI936oMsYLsg== X-Received: by 2002:a05:600c:204e:b0:3dc:4234:fe89 with SMTP id p14-20020a05600c204e00b003dc4234fe89mr1214993wmg.2.1675244172904; 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.12 (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:03 +0100 Message-Id: <20230201093603.1432036-4-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/samba.scm: Rename variable 'samba/fixed' to 'samba/pinned' and 'samba/fixed-patched' to 'samba/fixed'. * gnu/packages/gnome.scm (libsoup-minimal)[inputs]: Replace 'samba/fixed' with 'samba/pinned'. --- gnu/packages/gnome.scm | 2 +- gnu/packages/samba.scm | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 937f26e172..b1f0615702 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5199,7 +5199,7 @@ (define-public libsoup-minimal sqlite zlib)) (inputs - (list mit-krb5 samba/fixed)) ; For ntlm_auth support + (list mit-krb5 samba/pinned)) ; For ntlm_auth support (home-page "https://wiki.gnome.org/Projects/libsoup") (synopsis "GLib-based HTTP Library") (description diff --git a/gnu/packages/samba.scm b/gnu/packages/samba.scm index 00442d9645..da103ed839 100644 --- a/gnu/packages/samba.scm +++ b/gnu/packages/samba.scm @@ -275,14 +275,14 @@ (define-public samba Desktops into Active Directory environments using the winbind daemon.") (license license:gpl3+))) -;;; FIXME: Invert inheritance relationship; the "fixed" package shouldn't be +;;; FIXME: Invert inheritance relationship; the "pinned" package shouldn't be ;;; susceptible to changes in the free one. -(define-public samba/fixed +(define-public samba/pinned ;; Version that rarely changes, depended on by libsoup. (hidden-package (package (inherit samba) - (replacement samba/fixed-patched) + (replacement samba/fixed) (version "4.15.3") (source (origin @@ -306,9 +306,9 @@ (define-public samba/fixed libxslt libxml2))))) -(define-public samba/fixed-patched +(define-public samba/fixed (package - (inherit samba/fixed) + (inherit samba/pinned) ;; This is 4.15.13, but we need to trim the store file name to have ;; the same length as the one we are grafting above. (version "4.15.A")