~ruther/guix-local

0141e00b1481b1a672facff58fd971d0077edb51 — Bruno Victal 3 years ago a1fa230
packages: Remove 'origin-sha256' procedure.

* guix/packages.scm (origin-sha256): Remove procedure.
* tests/import-utils.scm (test-import-utils)
[alist->package with explicit source]: Use content-hash-value.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
2 files changed, 1 insertions(+), 10 deletions(-)

M guix/packages.scm
M tests/import-utils.scm
M guix/packages.scm => guix/packages.scm +0 -9
@@ 74,7 74,6 @@
            origin-uri
            origin-method
            origin-hash
            origin-sha256                         ;deprecated
            origin-file-name
            origin-actual-file-name
            origin-patches


@@ 346,14 345,6 @@ as base32.  Otherwise, it must be a bytevector."
specifications to 'hash'."
  (origin-compatibility-helper (fields ...) ()))

(define-deprecated (origin-sha256 origin)
  origin-hash
  (let ((hash (origin-hash origin)))
    (unless (eq? (content-hash-algorithm hash) 'sha256)
      (raise (condition (&message
                         (message (G_ "no SHA256 hash for origin"))))))
    (content-hash-value hash)))

(define (print-origin origin port)
  "Write a concise representation of ORIGIN to PORT."
  (match origin

M tests/import-utils.scm => tests/import-utils.scm +1 -1
@@ 141,7 141,7 @@ Differences are hard to spot, e.g. in CLOS vs. GOOPS."))
         (license:license? (package-license pkg))
         (build-system? (package-build-system pkg))
         (origin? (package-source pkg))
         (equal? (origin-sha256 (package-source pkg))
         (equal? (content-hash-value (origin-hash (package-source pkg)))
                 (base32 "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i")))))

(test-equal "alist->package with false license"  ;<https://bugs.gnu.org/30470>