diff mbox series

[bug#41510] guix: print: Update deprecated method

Message ID qx5ILa32awS_GSGud25AiGYgZTOocdUMh_R6IpH5JVjF6egmzxPsgXzV3xIjicdLNNlQxRjWP4dcgF4XsDyVj01te676-vhw_PCtVWF4mYs=@elenq.tech
State Accepted
Headers show
Series [bug#41510] guix: print: Update deprecated method | expand

Checks

Context Check Description
cbaines/comparison success View comparision
cbaines/git branch success View Git branch
cbaines/applying patch fail View Laminar job

Commit Message

Ekaitz Zarraga May 24, 2020, 4:41 p.m. UTC 
Hi,

This patch corrects the following warning:

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


Best,
Ekaitz




From ac21251092570bd426505f98d4415781e7c66147 Mon Sep 17 00:00:00 2001
From: Ekaitz Zarraga <ekaitz@elenq.tech>
Date: Sun, 24 May 2020 18:36:59 +0200
Subject: [PATCH] guix: print: Update deprecated method

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

--
2.26.2

Comments

Ludovic Courtès May 30, 2020, 2:17 p.m. UTC | #1 
Hi,

Ekaitz Zarraga <ekaitz@elenq.tech> skribis:

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

[...]

> -          (sha256    (origin-sha256 source))
> +          (sha256    (origin-hash source))

This is quite correct (contrary to what the warning suggests).  You also
have to use ‘content-hash-value’.  The code also needs to check whether
it’s actually sha256 or some other algorithm.

Make sure to run:

  make check TESTS=tests/print.scm

afterwards!

Thanks,
Ludo’.
Ekaitz Zarraga May 30, 2020, 2:20 p.m. UTC | #2 
‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
On Saturday, May 30, 2020 4:17 PM, Ludovic Courtès <ludo@gnu.org> wrote:

> Hi,
>
> Ekaitz Zarraga ekaitz@elenq.tech skribis:
>
> > guix/import/print.scm:77:21: warning: 'origin-sha256' is deprecated, use 'origin-hash' instead
>
> [...]
>
> > -            (sha256    (origin-sha256 source))
> >
> >
> >
> > -            (sha256    (origin-hash source))
> >
> >
>
> This is quite correct (contrary to what the warning suggests). You also
> have to use ‘content-hash-value’. The code also needs to check whether
> it’s actually sha256 or some other algorithm.
>
> Make sure to run:
>
> make check TESTS=tests/print.scm
>
> afterwards!
>
> Thanks,
> Ludo’.

LOL

Time to fix the warning then? ;)
Ludovic Courtès Dec. 7, 2020, 11:40 a.m. UTC | #3 
Hi,

Ekaitz Zarraga <ekaitz@elenq.tech> skribis:

> This patch corrects the following warning:
>
> guix/import/print.scm:77:21: warning: 'origin-sha256' is deprecated, use 'origin-hash' instead

This was fixed in a9105c2c4c97ffbdb1b09dadc14773566924ab59.

Closing!

Ludo’.
diff mbox series

Patch

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