import: print: Fix deprecation warning for origin-sha256.
* guix/import/print.scm (source->code source version): Replace 'origin-sha256' by 'origin-hash' and handle non-SHA256 hashes. Co-authored-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
parent
1f39175d1a
commit
a9105c2c4c
|
@ -74,7 +74,7 @@ (define (search-path-specification->code spec)
|
|||
(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,12 @@ (define (source->code source version)
|
|||
(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 ,(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".
|
||||
|
|
Loading…
Reference in a new issue