[bug#44038] [PATCH] Fix deprecation warning for origin-sha256

[bug#44038] [PATCH] Fix deprecation warning for origin-sha256

[Helio Machado]

[-- Attachment #1.1: Type: text/plain, Size: 163 bytes --]

This patch fixes the following build-time deprecation warning:

    guix/import/print.scm:77:21: warning: 'origin-sha256' is deprecated,
use 'origin-hash' instead

[-- Attachment #1.2: Type: text/html, Size: 252 bytes --]

[-- Attachment #2: 0001-guix-import-Fix-deprecation-warning-for-origin-sha25.patch --]
[-- Type: application/octet-stream, Size: 954 bytes --]

From 531aefdcce503332bacb97f34cd68e249a820cf0 Mon Sep 17 00:00:00 2001
From: Helio Machado <0x2b3bfa0+git@googlemail.com>
Date: Fri, 16 Oct 2020 18:07:26 +0200
Subject: [PATCH] guix/import: Fix deprecation warning for origin-sha256

* guix/import/print.scm (source->code source version): Replace
origin-sha256 by origin-hash
---
 guix/import/print.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/guix/import/print.scm b/guix/import/print.scm
index 11cc218285..afbb680607 100644
--- a/guix/import/print.scm
+++ b/guix/import/print.scm
@@ -74,7 +74,7 @@ when evaluated."
   (define (source->code source version)
     (let ((uri       (origin-uri source))
           (method    (origin-method source))
-          (sha256    (origin-sha256 source))
+          (sha256    (origin-hash source))
           (file-name (origin-file-name source))
           (patches   (origin-patches source)))
       `(origin
-- 
2.24.3 (Apple Git-128)

[bug#44038] [PATCH] Fix deprecation warning for origin-sha256

[Ludovic Courtès]

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 ‘origin-hash’ is not exactly a drop-in
replacement for ‘origin-sha256’, as can be seen in the manual, so this
patch wouldn’t have the desired effect.

Instead, ‘print.scm’ could be changed to emit a (sha256 …) form when the
<content-hash> object is indeed a sha256 hash, and otherwise use a (hash
…) form.

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

Thanks,
Ludo’.

[bug#44038] [PATCH] Fix deprecation warning for origin-sha256

[Helio Machado]

[-- Attachment #1.1: Type: text/plain, Size: 1212 bytes --]

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ès <ludo@gnu.org> 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 ‘origin-hash’ is not exactly a drop-in
> replacement for ‘origin-sha256’, as can be seen in the manual, so this
> patch wouldn’t have the desired effect.
>
> Instead, ‘print.scm’ could be changed to emit a (sha256 …) form when the
> <content-hash> object is indeed a sha256 hash, and otherwise use a (hash
> …) form.
>
> See
> <
> https://guix.gnu.org/manual/devel/en/html_node/origin-Reference.html#index-content_002dhash
> >.
>
> Thanks,
> Ludo’.
>

[-- Attachment #1.2: Type: text/html, Size: 1883 bytes --]

[-- Attachment #2: 0001-guix-import-Fix-deprecation-warning-for-origin-sha25.patch --]
[-- Type: application/octet-stream, Size: 1724 bytes --]

From 31c8a3ee7e6819ca01c875cfefd2818f727bc32e Mon Sep 17 00:00:00 2001
From: Helio Machado <0x2b3bfa0+git@googlemail.com>
Date: Mon, 19 Oct 2020 00:15:00 +0200
Subject: [PATCH] guix/import: Fix deprecation warning for origin-sha256

* guix/import/print.scm (source->code source version): Replace
origin-sha256 by origin-hash
---
 guix/import/print.scm | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/guix/import/print.scm b/guix/import/print.scm
index 11cc218285..e79f831c76 100644
--- a/guix/import/print.scm
+++ b/guix/import/print.scm
@@ -74,7 +74,7 @@ when evaluated."
   (define (source->code source version)
     (let ((uri       (origin-uri source))
           (method    (origin-method source))
-          (sha256    (origin-sha256 source))
+          (hash      (origin-hash source))
           (file-name (origin-file-name source))
           (patches   (origin-patches source)))
       `(origin
@@ -82,9 +82,10 @@ when evaluated."
          (uri (string-append ,@(match (factorize-uri uri version)
                                  ((? string? uri) (list uri))
                                  (factorized factorized))))
-         (sha256
-          (base32
-           ,(format #f "~a" (bytevector->nix-base32-string sha256))))
+         ,(if (equal? (content-hash-algorithm hash) 'sha256)
+              `(sha256 (base32 ,(format #f "~a" (bytevector->nix-base32-string
+                                                 (content-hash-value hash)))))
+              `(hash ,hash))
          ;; FIXME: in order to be able to throw away the directory prefix,
          ;; we just assume that the patch files can be found with
          ;; "search-patches".
-- 
2.24.3 (Apple Git-128)

bug#44038: [PATCH] Fix deprecation warning for origin-sha256

[Ludovic Courtès]

[-- Attachment #1: Type: text/plain, Size: 575 bytes --]

Hi,

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

> From 31c8a3ee7e6819ca01c875cfefd2818f727bc32e Mon Sep 17 00:00:00 2001
> From: Helio Machado <0x2b3bfa0+git@googlemail.com>
> Date: Mon, 19 Oct 2020 00:15:00 +0200
> Subject: [PATCH] guix/import: Fix deprecation warning for origin-sha256
>
> * guix/import/print.scm (source->code source version): Replace
> origin-sha256 by origin-hash

The non-SHA256 case would let the raw <content-hash> record through, so
I amended it as follows (also removing an unnecessary ‘format’ call).

Thanks!

Ludo’.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1067 bytes --]

diff --git a/guix/import/print.scm b/guix/import/print.scm
index e79f831c76..d21ce57aeb 100644
--- a/guix/import/print.scm
+++ b/guix/import/print.scm
@@ -83,9 +83,11 @@ when evaluated."
                                  ((? string? uri) (list uri))
                                  (factorized factorized))))
          ,(if (equal? (content-hash-algorithm hash) 'sha256)
-              `(sha256 (base32 ,(format #f "~a" (bytevector->nix-base32-string
-                                                 (content-hash-value hash)))))
-              `(hash ,hash))
+              `(sha256 (base32 ,(bytevector->nix-base32-string
+                                 (content-hash-value hash))))
+              `(hash (content-hash ,(bytevector->nix-base32-string
+                                     (content-hash-value hash))
+                                   ,(content-hash-algorithm hash))))
          ;; FIXME: in order to be able to throw away the directory prefix,
          ;; we just assume that the patch files can be found with
          ;; "search-patches".