From patchwork Thu Jan 26 16:43:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 46422 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 C7BB927BBEB; Thu, 26 Jan 2023 16:45:33 +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 6852427BBE9 for ; Thu, 26 Jan 2023 16:45:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pL5NB-0000cw-OT; Thu, 26 Jan 2023 11:45:13 -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 1pL5N2-0000bX-2h for guix-patches@gnu.org; Thu, 26 Jan 2023 11:45:04 -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 1pL5N1-0007Ip-L6 for guix-patches@gnu.org; Thu, 26 Jan 2023 11:45:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pL5N1-0002f4-Fx for guix-patches@gnu.org; Thu, 26 Jan 2023 11:45:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61078] [PATCH 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: Thu, 26 Jan 2023 16:45: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.16747514489957 (code B ref 61078); Thu, 26 Jan 2023 16:45:03 +0000 Received: (at 61078) by debbugs.gnu.org; 26 Jan 2023 16:44:08 +0000 Received: from localhost ([127.0.0.1]:36011 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pL5M7-0002aR-A5 for submit@debbugs.gnu.org; Thu, 26 Jan 2023 11:44:07 -0500 Received: from mail-wm1-f45.google.com ([209.85.128.45]:34307) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pL5M4-0002ZI-Po for 61078@debbugs.gnu.org; Thu, 26 Jan 2023 11:44:05 -0500 Received: by mail-wm1-f45.google.com with SMTP id q10-20020a1cf30a000000b003db0edfdb74so4233100wmq.1 for <61078@debbugs.gnu.org>; Thu, 26 Jan 2023 08:44:04 -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=53Ht3twDo0i0FHLHGKMkyMEm4FadMbxkZcQzmhafEvk=; b=nCM8HLAHhAJX8Vv0k56mAm1w3p0Umk2mYOffvWouWe6DtOcxwhZ/ZYou4iS0kbfGsY JV49qVyOMoKm7ZCzKrp3zFCx/o/FU+UPkSncOBD212uht8aNDRkHY5IigvrYltQznCLw D65vBROpKhnzltUE7MGSfMt7GMqLG6UtkJG+qgM4KMAekRPpulMR7uI3Dz9LcIeqnrjz 0VTmtDvoo+dRZIcQsOf5aNVJMS3Zz8r0h4G77vVqKKtmUsAbFnQeCAepu3V9bR1SvbFi 8rbrYi31g4N5mFhPflU+HY68c50hkEeBpbZRZ83+mnWs5D7qKAUJNJEtikT52MdFdvsK +67A== 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=53Ht3twDo0i0FHLHGKMkyMEm4FadMbxkZcQzmhafEvk=; b=R9b25TtmbTGSlN5MYVlVzUYuWMXLrP1GGV/s4QUEfD9Xj9rV6deSzFutY/JMOBMCVN Rubyorz2qrF/JPQL7Ol2oRjv29vwehSvZi1i74YMRnrC1/8RVjx2I8vSY5aScR+kpzAk 6ZSCaHRb/N7284Z+XCTQX/oo/xOe4OXKuVxDH4jUgRUg3YejdIeKInNxAiesm/DLWjv+ Jtv2IKmc4pidJZpva10ffVIQbwO4nLSQq9qXYGI40XMBriXZXH0e7qcDfAS+52/IkdQ7 Fgxwex2/yRZorsRyqRkdswEIyllakrE/olafwK1F1D246+5nu/LXkHpdyt79itPGpq8r xhmg== X-Gm-Message-State: AFqh2kr2WvW6GnHXwkPRafFLO+R+daMBAXrUxkIdmeGwCX7JW2XaXJq6 JHtfpa/u2+r0BTeKw/aT0ORzYoYLCPE= X-Google-Smtp-Source: AMrXdXtNm/ERph4nUdjGY5iPCvA04dYCpa2lqPw8OzqnX62o5hFS99Vu/BRTTynGLlsiKYMB/THr5g== X-Received: by 2002:a05:600c:3ba8:b0:3d9:8635:a901 with SMTP id n40-20020a05600c3ba800b003d98635a901mr9382841wms.3.1674751438867; Thu, 26 Jan 2023 08:43:58 -0800 (PST) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id t10-20020a05600c328a00b003d9a86a13bfsm1735900wmp.28.2023.01.26.08.43.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 08:43:58 -0800 (PST) From: Simon Tournier Date: Thu, 26 Jan 2023 17:43:44 +0100 Message-Id: <20230126164347.2462817-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'. * 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 | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) 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 de5b5df450..10945ff457 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..502260fa43 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -670,7 +670,7 @@ (define-public git-minimal perl zlib)))) -(define-public git-minimal/fixed +(define-public git-minimal/pinned ;; Version that rarely changes, depended on by Graphene/GTK+. (package/inherit git-minimal (version "2.33.1") From patchwork Thu Jan 26 16:43:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 46424 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 D208327BBEB; Thu, 26 Jan 2023 16:45:55 +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=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 D0C6627BBE9 for ; Thu, 26 Jan 2023 16:45:53 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pL5NA-0000cd-9a; Thu, 26 Jan 2023 11:45:12 -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 1pL5N2-0000bW-1g for guix-patches@gnu.org; Thu, 26 Jan 2023 11:45:04 -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 1pL5N1-0007Ft-7V for guix-patches@gnu.org; Thu, 26 Jan 2023 11:45:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pL5N1-0002dO-3k for guix-patches@gnu.org; Thu, 26 Jan 2023 11:45:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61078] [PATCH 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: Thu, 26 Jan 2023 16:45: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.16747514479950 (code B ref 61078); Thu, 26 Jan 2023 16:45:03 +0000 Received: (at 61078) by debbugs.gnu.org; 26 Jan 2023 16:44:07 +0000 Received: from localhost ([127.0.0.1]:36009 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pL5M6-0002aH-Tr for submit@debbugs.gnu.org; Thu, 26 Jan 2023 11:44:07 -0500 Received: from mail-wm1-f46.google.com ([209.85.128.46]:40805) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pL5M4-0002ZJ-Qc for 61078@debbugs.gnu.org; Thu, 26 Jan 2023 11:44:05 -0500 Received: by mail-wm1-f46.google.com with SMTP id e19-20020a05600c439300b003db1cac0c1fso3602362wmn.5 for <61078@debbugs.gnu.org>; Thu, 26 Jan 2023 08:44:04 -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=fzodtgoslSVYiyx3iKcXeBCuvJ3FRLV36LZ5pUz+5j8=; b=QYuKRA1aGLSUd6S7IYO/ONJqNv7LGutM77NPJe0cyc7nvpbQ5y1aM3MlbnThU+o8y3 BYIxoo5xlIe4TvDEqsYsdAdLv/DxnJGj7fdrbdcFc2Kj9XmEi/HJmIdEjKkKwRJDxtvM jTcLDiKMTJTUS8MrjZfHntkzNER9SHT89pag/3p6DXGKaa4etJxPJ7lWaGk3UhaDJDd/ Y/u9kzuKx8Wk76CpnVJ4Q7F9kUOXanE0PVxKnYMuxiBu5PspSC0k+7l8e6Rb8v0BlZJM UoyCjF8P21UDR5VWQFixQzxJ7w7P1zWFXq+hUWGXDzl9hpz1bsvN2/SXE53wXTjnoYq3 T0NA== 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=fzodtgoslSVYiyx3iKcXeBCuvJ3FRLV36LZ5pUz+5j8=; b=EEFIdUuRzMWuR0kD/qbHqBCxe6B6RPeQI8aohsaN35IBiCi19gMjrjQ9xGvzn+Lpdd AzwJnUdrmMyTsvrsOFkS8z8sS7HrTYYGocDNpJ0okgHiX0of4uHFLGZjaDOnGbO7k5er F5GKeyS6nSYtxZfyk7jj69IQFflEh8koudJkFT37d0/SBs+WC2Qf/lcyJaU/rLkNsAfL 6rjc1IVfW1D+2PfsVDRYW2LIACfcQnbh/oEXf1uLCojSpUtK+M81ln2iVfTv7KV7ullQ o/93qKPWLgSn0Sp3Ac9H1Gm2R1xHk95HW4FviVcgs9HktcTjQ68RqRUuUVidDsv4mHmq ofgQ== X-Gm-Message-State: AFqh2kon7IuQhcE0rCtBuH41ojsFyMc43yHalq+L1W1dkC0tF21H9F6P J63uTxuU6x4m4CU5F68BglYI8b2XHaE= X-Google-Smtp-Source: AMrXdXuCM7Z6bSdug5RNz+xcwPZ6BIMkJTIK5fc9TuP0/A4aew30BF/qidSg+AcyiVYX0VkkWc1Y2Q== X-Received: by 2002:a05:600c:5120:b0:3db:21b8:5f53 with SMTP id o32-20020a05600c512000b003db21b85f53mr7282207wms.1.1674751439289; Thu, 26 Jan 2023 08:43:59 -0800 (PST) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id t10-20020a05600c328a00b003d9a86a13bfsm1735900wmp.28.2023.01.26.08.43.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 08:43:59 -0800 (PST) From: Simon Tournier Date: Thu, 26 Jan 2023 17:43:45 +0100 Message-Id: <20230126164347.2462817-2-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230126164347.2462817-1-zimon.toutoune@gmail.com> References: <20230126164347.2462817-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'. (iptables)[native-inputs]: Replace 'libnftnl/fixed' with 'libnftnl/pinned'. --- gnu/packages/linux.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c90fbf396f..bcdf004350 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 @@ -7656,7 +7656,7 @@ (define-public libnftnl ;; 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 Thu Jan 26 16:43:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 46425 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 08CAD27BBED; Thu, 26 Jan 2023 16:45:59 +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 C97D027BBE9 for ; Thu, 26 Jan 2023 16:45:57 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pL5NA-0000cv-Gb; Thu, 26 Jan 2023 11:45:13 -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 1pL5N2-0000bZ-8Y for guix-patches@gnu.org; Thu, 26 Jan 2023 11:45:04 -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 1pL5N1-0007J3-V9 for guix-patches@gnu.org; Thu, 26 Jan 2023 11:45:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pL5N1-0002gi-S3 for guix-patches@gnu.org; Thu, 26 Jan 2023 11:45:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61078] [PATCH 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: Thu, 26 Jan 2023 16:45: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.16747514489964 (code B ref 61078); Thu, 26 Jan 2023 16:45:03 +0000 Received: (at 61078) by debbugs.gnu.org; 26 Jan 2023 16:44:08 +0000 Received: from localhost ([127.0.0.1]:36013 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pL5M7-0002aY-TZ for submit@debbugs.gnu.org; Thu, 26 Jan 2023 11:44:08 -0500 Received: from mail-wm1-f49.google.com ([209.85.128.49]:39514) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pL5M5-0002ZK-Cy for 61078@debbugs.gnu.org; Thu, 26 Jan 2023 11:44:05 -0500 Received: by mail-wm1-f49.google.com with SMTP id f19-20020a1c6a13000000b003db0ef4dedcso3610776wmc.4 for <61078@debbugs.gnu.org>; Thu, 26 Jan 2023 08:44:05 -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=2PsrgBUBjS/KlIx71Rkm9AJquXL6zwxFK+pZbdJ3ilo=; b=E670jgOdPGDsZaFZtKRPNF/EvZW1xsDbdwJdKMhzt3PZ+hD53z9vyiHp6Il/Jl8ct4 ULwiwynsBGr8G3xe9SPMs+bdk30EnphON20G13ae2/Wu6lXiL6w4kXP2hhQ9VOQLgf6f 4HeHOzDfozkSiUXry12DoXLAb8XNrxq+o8KZHntpL0Q+b8WZHPdpapHioTVKKYH1kkqJ glbIaG9aSWSRBQguQauK+PGCf75XbKRE5iT2rPAPdycIDCT4Mwv0RtnfkosukHkVYOVK tILN2X+EaqJBD2WNynAMP4hjRZd2Pd7gbJN8sKNiGrDRvj9zAa0azlVLND/OvNDCG5yE AUsg== 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=2PsrgBUBjS/KlIx71Rkm9AJquXL6zwxFK+pZbdJ3ilo=; b=M6eVr82ArZMAaM7WedMYkzqPvkfTyNRUgAIscKGPwau82ApFgzJ5JAxcbPe/alKhXV gX7p9wX7wdmoIqapSPNmDipv6yQnDjhAo3zENKfcYBFjC9HtAPNA23SMgOEEDWmbCwkz TF/jTRmBiLN5qlpZWXmIaot7pbdlnDxKEHRaRBJEJSX8Q3f+ptu82UcXUeJOeZLRx870 gP54fGWQdvfGKqvtmymVfccd1K24emfJMh+7vBmAudlMh4a40BTw3Hp4FkJ2KFuq1m1s oOI2zlk9etLRkDjDxtW5FnNRUCPXBzE+3yblaXngT/AwX1ExCaxtq8G6Ph6mBpw2EJn8 byIQ== X-Gm-Message-State: AFqh2kpG7se9Rcn3vSfuCuqehFATiVYNpmwNSuQBbSHc590mj7KuLJln TayUo7H+sIXFBTzzEXynNJmbttM1CjI= X-Google-Smtp-Source: AMrXdXvKdTCONaAGCjm2axOqj/8q8Bc+FS+cHylnpWjpRg6EOUtrOSh54FFMLk/JR4mH72aMyxW1KQ== X-Received: by 2002:a05:600c:3b05:b0:3d3:4f99:bb14 with SMTP id m5-20020a05600c3b0500b003d34f99bb14mr8014614wms.0.1674751439710; Thu, 26 Jan 2023 08:43:59 -0800 (PST) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id t10-20020a05600c328a00b003d9a86a13bfsm1735900wmp.28.2023.01.26.08.43.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 08:43:59 -0800 (PST) From: Simon Tournier Date: Thu, 26 Jan 2023 17:43:46 +0100 Message-Id: <20230126164347.2462817-3-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230126164347.2462817-1-zimon.toutoune@gmail.com> References: <20230126164347.2462817-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'. * 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 | 2 +- 4 files changed, 4 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..f529e57a50 100644 --- a/gnu/packages/guile.scm +++ b/gnu/packages/guile.scm @@ -419,7 +419,7 @@ (define-public guile-3.0-latest "GUILE_OPTIMIZATIONS = -O1 -Oresolve-primitives -Ocps\n"))))) '()))))))) -(define-public guile-3.0/fixed +(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 Thu Jan 26 16:43:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 46423 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 EC47E27BBEB; Thu, 26 Jan 2023 16:45: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 9D0DD27BBE9 for ; Thu, 26 Jan 2023 16:45:43 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pL5NS-0000fl-H3; Thu, 26 Jan 2023 11:45:30 -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 1pL5N2-0000bd-KL for guix-patches@gnu.org; Thu, 26 Jan 2023 11:45:06 -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 1pL5N2-0007JC-CD for guix-patches@gnu.org; Thu, 26 Jan 2023 11:45:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pL5N2-0002ig-8G for guix-patches@gnu.org; Thu, 26 Jan 2023 11:45:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#61078] [PATCH 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: Thu, 26 Jan 2023 16:45:04 +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.16747514569978 (code B ref 61078); Thu, 26 Jan 2023 16:45:04 +0000 Received: (at 61078) by debbugs.gnu.org; 26 Jan 2023 16:44:16 +0000 Received: from localhost ([127.0.0.1]:36015 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pL5MG-0002as-Di for submit@debbugs.gnu.org; Thu, 26 Jan 2023 11:44:16 -0500 Received: from mail-wm1-f49.google.com ([209.85.128.49]:52818) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pL5M5-0002ZM-Lg for 61078@debbugs.gnu.org; Thu, 26 Jan 2023 11:44:06 -0500 Received: by mail-wm1-f49.google.com with SMTP id k16so1545444wms.2 for <61078@debbugs.gnu.org>; Thu, 26 Jan 2023 08:44:05 -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=IR/ok95Emzkm6FZZ8CFKJ5dW4DmsL6aZ1GFsi95CVfg=; b=NIcpoq2jUvNAHcE4xmKGNPNNBt5uLNge4vJzO+5sWVc/D3Tow6EW9BAsz6EksYmgoL 9Tf/oi8K3is2ocPAL8GRCvtYkOwTZfz/9yAm5p0u9pyNIPIIfH04m0K9NMA8b3UM+p2+ 0URbEIbpZad5SIcCILzKLWGLmm0zhmJ5PcHyfE2B1n8y4yhOFU5ien6ls+466/mhkQYj uokWeK/mcuVCSj0iKRvuY3somKJmoLMzDcz1/9TW+WAISl5Oi/zFLSfigUIVbMlUSk0n pab1ZL5l0W+wWDfOAVW02e4ogqbe1hcr6oM3fWOhGWGgmKSAvDrNX94CYM3XMYszxIZQ W7bA== 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=IR/ok95Emzkm6FZZ8CFKJ5dW4DmsL6aZ1GFsi95CVfg=; b=ivtYrqxpniACbMBWXqgA7SnvqaYbiL42FuD61vuacUpvdiZLAcualXyRY20UKbDQpM g8rF5F5ZwT2f0X0rc7pQQsNcXLLZF5nGqWpS8gsmy1QgP2+Bfn+chNAuPreeRUfO6FPl MWFSQzs9EjIzlzTUwvRSIdouVhtWbFkcAfjy3RjSPnqLxcC9b/tnWn/Gb0gHBABQ+vpX aiULHQKsewAWGVTnLbvzhVYdCcwB+a9mmhI8XNMPJ74eiUmPrYbov2g1p88EyeGyFEva iVVPo01FZmbTTsRf5GJSkmnUxfRK2QHWJt5my4rJqBJrIQ5jigFR5I4t9/aPgctZJUIJ pnjw== X-Gm-Message-State: AFqh2kpw1B90f097BbQL2nL5mzrVUV7RFQ8LuZwFhFPV2hGadUEgcnWp lZjRYXixU10TJbMHqvlMKtCglNElKdg= X-Google-Smtp-Source: AMrXdXtL9uHHYdhs+qePf3CDDYYR7gCfeNIDeYNkzio/IdggjCROzw9HKPj0UMCAVqa31vaQVacg0w== X-Received: by 2002:a05:600c:1c83:b0:3da:ff24:4b93 with SMTP id k3-20020a05600c1c8300b003daff244b93mr9381425wms.3.1674751440188; Thu, 26 Jan 2023 08:44:00 -0800 (PST) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id t10-20020a05600c328a00b003d9a86a13bfsm1735900wmp.28.2023.01.26.08.43.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Jan 2023 08:43:59 -0800 (PST) From: Simon Tournier Date: Thu, 26 Jan 2023 17:43:47 +0100 Message-Id: <20230126164347.2462817-4-zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230126164347.2462817-1-zimon.toutoune@gmail.com> References: <20230126164347.2462817-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 10945ff457..9d79055289 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5190,7 +5190,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")