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")