Browse Source

Use `port-sha256' and `open-sha256-port'.

* guix/derivations.scm (derivation-hash): Add comment as to why we keep
  the plain `sha256' call.
* guix/scripts/download.scm (guix-download): Use `port-sha256' instead
  of (compose sha256 get-bytevector-all).
* guix/scripts/refresh.scm (update-package): Likewise.
gn-latest-20200428
Ludovic Courtès 7 years ago
parent
commit
b0fad8a2d4
3 changed files with 6 additions and 2 deletions
  1. +4
    -0
      guix/derivations.scm
  2. +1
    -1
      guix/scripts/download.scm
  3. +1
    -1
      guix/scripts/refresh.scm

+ 4
- 0
guix/derivations.scm View File

@@ -469,6 +469,10 @@ in SIZE bytes."
inputs))
(drv (make-derivation outputs inputs sources
system builder args env-vars)))

;; XXX: At this point this remains faster than `port-sha256', because
;; the SHA256 port's `write' method gets called for every single
;; character.
(sha256
(with-fluids ((%default-port-encoding "UTF-8"))
(string->utf8 (call-with-output-string


+ 1
- 1
guix/scripts/download.scm View File

@@ -116,7 +116,7 @@ Supported formats: 'nix-base32' (default), 'base32', and 'base16'
(or path
(leave (_ "~a: download failed~%")
arg))
(compose sha256 get-bytevector-all)))
port-sha256))
(fmt (assq-ref opts 'format)))
(format #t "~a~%~a~%" path (fmt hash))
#t)))

+ 1
- 1
guix/scripts/refresh.scm View File

@@ -137,7 +137,7 @@ values: 'interactive' (default), 'always', and 'never'."
(package-name package)
(package-version package) version)
(let ((hash (call-with-input-file tarball
(compose sha256 get-bytevector-all))))
port-sha256)))
(update-package-source package version hash)))
(warning (_ "~a: version ~a could not be \
downloaded and authenticated; not updating")


Loading…
Cancel
Save