From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id YG8DN+TGjF/qIQAA0tVLHw (envelope-from ) for ; Sun, 18 Oct 2020 22:51:16 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id 0BPGMuTGjF8PEgAAbx9fmQ (envelope-from ) for ; Sun, 18 Oct 2020 22:51:16 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 6F37194042A for ; Sun, 18 Oct 2020 22:51:16 +0000 (UTC) Received: from localhost ([::1]:37408 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kUHWF-00043m-2t for larch@yhetil.org; Sun, 18 Oct 2020 18:51:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59382) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kUHW3-0003xj-JH for guix-patches@gnu.org; Sun, 18 Oct 2020 18:51:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:56013) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kUHW3-0008Tq-9n for guix-patches@gnu.org; Sun, 18 Oct 2020 18:51:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kUHW3-0001Db-8E for guix-patches@gnu.org; Sun, 18 Oct 2020 18:51:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#44038] [PATCH] Fix deprecation warning for origin-sha256 Resent-From: Helio Machado <0x2b3bfa0@gmail.com> Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Oct 2020 22:51:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 44038 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= , 44038@debbugs.gnu.org Received: via spool by 44038-submit@debbugs.gnu.org id=B44038.16030614464631 (code B ref 44038); Sun, 18 Oct 2020 22:51:03 +0000 Received: (at 44038) by debbugs.gnu.org; 18 Oct 2020 22:50:46 +0000 Received: from localhost ([127.0.0.1]:39322 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kUHVl-0001Cd-O3 for submit@debbugs.gnu.org; Sun, 18 Oct 2020 18:50:46 -0400 Received: from mail-qk1-f173.google.com ([209.85.222.173]:46296) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <0x2b3bfa0@gmail.com>) id 1kUH84-0000bU-LE for 44038@debbugs.gnu.org; Sun, 18 Oct 2020 18:26:16 -0400 Received: by mail-qk1-f173.google.com with SMTP id a23so6421044qkg.13 for <44038@debbugs.gnu.org>; Sun, 18 Oct 2020 15:26:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:sender:from:date:message-id :subject:to; bh=efi7kz6ek7vN/CnkmikGBervp1xROqmdCPpp1nCf/dw=; b=Lw5yr56pJFxmaZ1Smo3BgXlfEaQUy3LOYSlE6y8OrlhvBs4IFdxX25oyITYDrzL9Up lkVCHy2ZaF17xs+s9nOUwdc8jvVaaKfucYumitytLW8A6gWwiEVXEnaQtNddK/jFIT7P IVAvxe40u5Uh3oXrZUcyzycMnslAJwNDexhTxN0Bk3Mvz3A6Uw//gdHw8Po/NKb4Rb+i Irfl725ATViLjXM2xi1UDccp197ZpkPvoGNVUVTAKH3byEX/Yzei8qCyIfpEmBegsOpv b9n9Fbjmjh3fa5DeDHfBaqvLAaXxmpw5k8oM0gXXerlMZjYuSt8jayeMLq+mz3ch3si/ AmUg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:sender:from :date:message-id:subject:to; bh=efi7kz6ek7vN/CnkmikGBervp1xROqmdCPpp1nCf/dw=; b=fjy3RPvygrgbKHlgZtg7qKQ4ZLqsCOQA7Ul6l9EquPQMJ9pmkYjJNwq3VRiim/iRtY QvakxlZmSchx8Wozad5dHqiTjzRzWLmbXskp6w1YGppuRkSGJylKgcTvMjcM52zhne++ BIP4KlVkRlFzZOi9nk6GpD/BWFmvug2WLl+sh5PsDADxnC9rJnIci7GDXbA1akLsyxk9 Q5t1jcCD8Zf2zHp3Cy6wQmYKLXNXv3m/w1XSk5ejIp1ZpJ0HNlSR4hzosECmSviXOd6M Ubeu/J2t+U96/iLqCHCniDW8hqkRJuPz/8Jy1P+otWwgnN8xqrzDCPgvrw/i5PnUOLlG 8I0w== X-Gm-Message-State: AOAM5308UG3ZbA73b5deVyRDJp61ON4p4RMF1Vp2gl6eIt+sSM/KN/Oj zfKMXd5NQSRJ588TwEGBZ5AeoTZcbS9WyESrMMc= X-Google-Smtp-Source: ABdhPJwCh+PYpstpd0ko4tLKtSPPJXctnUrdU6NJjf4/Czi5Q0CupqG0vuOl3+Qjwmh65G5m7JEAP1oPr5U5bxAZSPI= X-Received: by 2002:a37:9747:: with SMTP id z68mr13324044qkd.424.1603059970811; Sun, 18 Oct 2020 15:26:10 -0700 (PDT) MIME-Version: 1.0 References: <87y2k44n8m.fsf@gnu.org> In-Reply-To: <87y2k44n8m.fsf@gnu.org> X-Google-Sender-Delegation: heliomachadomegias@gmail.com From: Helio Machado <0x2b3bfa0@gmail.com> Date: Mon, 19 Oct 2020 00:25:34 +0200 X-Google-Sender-Auth: aGfFzvtKCDp06la9dmDBskIDv9o Message-ID: Content-Type: multipart/mixed; boundary="0000000000001dd3eb05b1f97cde" X-Spam-Score: 0.3 (/) X-Mailman-Approved-At: Sun, 18 Oct 2020 18:50:44 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -0.7 (/) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (body hash did not verify) header.d=gmail.com header.s=20161025 header.b=Lw5yr56p; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.09 X-TUID: NSrl18oWeb13 --0000000000001dd3eb05b1f97cde Content-Type: multipart/alternative; boundary="0000000000001dd3e405b1f97cdc" --0000000000001dd3e405b1f97cdc Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hello, Sorry for the low-quality patch; it seemed so obvious that laziness won over good sense. The amended patch implements your suggestion and checks whether the used hash is `sha256` or anything else, adapting the output accordingly in each case. Thank you for your patience, Helio. On Sat, 17 Oct 2020 at 22:21, Ludovic Court=C3=A8s wrote: > Hi, > > Helio Machado <0x2b3bfa0@gmail.com> skribis: > > > This patch fixes the following build-time deprecation warning: > > > > guix/import/print.scm:77:21: warning: 'origin-sha256' is deprecated= , > > use 'origin-hash' instead > > Thanks for looking into it! The deprecation warning is a bit confusing > though in this case because =E2=80=98origin-hash=E2=80=99 is not exactly = a drop-in > replacement for =E2=80=98origin-sha256=E2=80=99, as can be seen in the ma= nual, so this > patch wouldn=E2=80=99t have the desired effect. > > Instead, =E2=80=98print.scm=E2=80=99 could be changed to emit a (sha256 = =E2=80=A6) form when the > object is indeed a sha256 hash, and otherwise use a (hash > =E2=80=A6) form. > > See > < > https://guix.gnu.org/manual/devel/en/html_node/origin-Reference.html#inde= x-content_002dhash > >. > > Thanks, > Ludo=E2=80=99. > --0000000000001dd3e405b1f97cdc Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hello,

Sorry for the low-quality patch;= it seemed so obvious that laziness won over good sense.

The amended patch implements your suggestion and checks whether the = used hash is `sha256` or anything else, adapting the output accordingly in = each case.

Thank you for your patience,
= Helio.=C2=A0

On Sat, 17 Oct 2020 at 22:21, Ludovic Court=C3=A8s <ludo@gnu.org> wrote:
Hi,

Helio Machado <= 0x2b3bfa0@gmail.com> skribis:

> This patch fixes the following build-time deprecation warning:
>
>=C2=A0 =C2=A0 =C2=A0guix/import/print.scm:77:21: warning: 'origin-s= ha256' is deprecated,
> use 'origin-hash' instead

Thanks for looking into it!=C2=A0 The deprecation warning is a bit confusin= g
though in this case because =E2=80=98origin-hash=E2=80=99 is not exactly a = drop-in
replacement for =E2=80=98origin-sha256=E2=80=99, as can be seen in the manu= al, so this
patch wouldn=E2=80=99t have the desired effect.

Instead, =E2=80=98print.scm=E2=80=99 could be changed to emit a (sha256 =E2= =80=A6) form when the
<content-hash> object is indeed a sha256 hash, and otherwise use a (h= ash
=E2=80=A6) form.

See
<https= ://guix.gnu.org/manual/devel/en/html_node/origin-Reference.html#index-conte= nt_002dhash>.

Thanks,
Ludo=E2=80=99.
--0000000000001dd3e405b1f97cdc-- --0000000000001dd3eb05b1f97cde Content-Type: application/octet-stream; name="0001-guix-import-Fix-deprecation-warning-for-origin-sha25.patch" Content-Disposition: attachment; filename="0001-guix-import-Fix-deprecation-warning-for-origin-sha25.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kgfo5xaa0 RnJvbSAzMWM4YTNlZTdlNjgxOWNhMDFjODc1Y2ZlZmQyODE4ZjcyN2JjMzJlIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBIZWxpbyBNYWNoYWRvIDwweDJiM2JmYTArZ2l0QGdvb2dsZW1h aWwuY29tPgpEYXRlOiBNb24sIDE5IE9jdCAyMDIwIDAwOjE1OjAwICswMjAwClN1YmplY3Q6IFtQ QVRDSF0gZ3VpeC9pbXBvcnQ6IEZpeCBkZXByZWNhdGlvbiB3YXJuaW5nIGZvciBvcmlnaW4tc2hh MjU2CgoqIGd1aXgvaW1wb3J0L3ByaW50LnNjbSAoc291cmNlLT5jb2RlIHNvdXJjZSB2ZXJzaW9u KTogUmVwbGFjZQpvcmlnaW4tc2hhMjU2IGJ5IG9yaWdpbi1oYXNoCi0tLQogZ3VpeC9pbXBvcnQv cHJpbnQuc2NtIHwgOSArKysrKy0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA1IGluc2VydGlvbnMoKyks IDQgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvZ3VpeC9pbXBvcnQvcHJpbnQuc2NtIGIvZ3Vp eC9pbXBvcnQvcHJpbnQuc2NtCmluZGV4IDExY2MyMTgyODUuLmU3OWY4MzFjNzYgMTAwNjQ0Ci0t LSBhL2d1aXgvaW1wb3J0L3ByaW50LnNjbQorKysgYi9ndWl4L2ltcG9ydC9wcmludC5zY20KQEAg LTc0LDcgKzc0LDcgQEAgd2hlbiBldmFsdWF0ZWQuIgogICAoZGVmaW5lIChzb3VyY2UtPmNvZGUg c291cmNlIHZlcnNpb24pCiAgICAgKGxldCAoKHVyaSAgICAgICAob3JpZ2luLXVyaSBzb3VyY2Up KQogICAgICAgICAgIChtZXRob2QgICAgKG9yaWdpbi1tZXRob2Qgc291cmNlKSkKLSAgICAgICAg ICAoc2hhMjU2ICAgIChvcmlnaW4tc2hhMjU2IHNvdXJjZSkpCisgICAgICAgICAgKGhhc2ggICAg ICAob3JpZ2luLWhhc2ggc291cmNlKSkKICAgICAgICAgICAoZmlsZS1uYW1lIChvcmlnaW4tZmls ZS1uYW1lIHNvdXJjZSkpCiAgICAgICAgICAgKHBhdGNoZXMgICAob3JpZ2luLXBhdGNoZXMgc291 cmNlKSkpCiAgICAgICBgKG9yaWdpbgpAQCAtODIsOSArODIsMTAgQEAgd2hlbiBldmFsdWF0ZWQu IgogICAgICAgICAgKHVyaSAoc3RyaW5nLWFwcGVuZCAsQChtYXRjaCAoZmFjdG9yaXplLXVyaSB1 cmkgdmVyc2lvbikKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICgoPyBzdHJpbmc/ IHVyaSkgKGxpc3QgdXJpKSkKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChmYWN0 b3JpemVkIGZhY3Rvcml6ZWQpKSkpCi0gICAgICAgICAoc2hhMjU2Ci0gICAgICAgICAgKGJhc2Uz MgotICAgICAgICAgICAsKGZvcm1hdCAjZiAifmEiIChieXRldmVjdG9yLT5uaXgtYmFzZTMyLXN0 cmluZyBzaGEyNTYpKSkpCisgICAgICAgICAsKGlmIChlcXVhbD8gKGNvbnRlbnQtaGFzaC1hbGdv cml0aG0gaGFzaCkgJ3NoYTI1NikKKyAgICAgICAgICAgICAgYChzaGEyNTYgKGJhc2UzMiAsKGZv cm1hdCAjZiAifmEiIChieXRldmVjdG9yLT5uaXgtYmFzZTMyLXN0cmluZworICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIChjb250ZW50LWhhc2gtdmFsdWUg aGFzaCkpKSkpCisgICAgICAgICAgICAgIGAoaGFzaCAsaGFzaCkpCiAgICAgICAgICA7OyBGSVhN RTogaW4gb3JkZXIgdG8gYmUgYWJsZSB0byB0aHJvdyBhd2F5IHRoZSBkaXJlY3RvcnkgcHJlZml4 LAogICAgICAgICAgOzsgd2UganVzdCBhc3N1bWUgdGhhdCB0aGUgcGF0Y2ggZmlsZXMgY2FuIGJl IGZvdW5kIHdpdGgKICAgICAgICAgIDs7ICJzZWFyY2gtcGF0Y2hlcyIuCi0tIAoyLjI0LjMgKEFw cGxlIEdpdC0xMjgpCgo= --0000000000001dd3eb05b1f97cde--