diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-05-19 15:55:08 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-05-22 01:29:39 +0200 |
| commit | ce0be5675b702b2ff89aed1772ebb42af4150243 (patch) | |
| tree | ec275112c97e9450ed9c4a8d30e7c153a7c10786 /gnu/packages/bash.scm | |
| parent | 56f7ca6e7c8b5eadeee48b00bcbd78f9fa9e5f43 (diff) | |
packages: Introduce <content-hash> and use it in <origin>.
* guix/packages.scm (<content-hash>): New record type.
(define-content-hash-constructor, build-content-hash)
(content-hash): New macros.
(print-content-hash): New procedure.
(<origin>): Rename constructor to '%origin'.
[sha256]: Remove field.
[hash]: New field. Adjust users.
(origin-compatibility-helper, origin): New macros.
(origin-sha256): New deprecated procedure.
(origin->derivation): Adjust accordingly.
* tests/packages.scm ("package-source-derivation, origin, sha512"): New
test.
* guix/tests.scm: Hide (gcrypt hash) 'sha256' for proper syntax
matching.
* tests/challenge.scm: Add #:prefix for (gcrypt hash) and adjust users.
* tests/derivations.scm: Likewise.
* tests/store.scm: Likewise.
* tests/graph.scm ("bag DAG, including origins"): Provide 'sha256' field
with the right length.
* gnu/packages/aspell.scm (aspell-dictionary)
(aspell-dict-ca, aspell-dict-it): Use 'hash' and 'content-hash' for
proper syntax matching.
* gnu/packages/bash.scm (bash-patch): Rename 'sha256' to 'sha256-bv'.
* gnu/packages/bootstrap.scm (bootstrap-executable): Rename 'sha256' to 'bv'.
* gnu/packages/readline.scm (readline-patch): Likewise.
* gnu/packages/virtualization.scm (qemu-patch): Rename 'sha256' to
'sha256-bv'.
* guix/import/utils.scm: Hide (gcrypt hash) 'sha256'.
Diffstat (limited to 'gnu/packages/bash.scm')
| -rw-r--r-- | gnu/packages/bash.scm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 1b342827c54..311e07a9446 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
| 2 | ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org> | 2 | ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2019, 2020 Ludovic Courtès <ludo@gnu.org> |
| 3 | ;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org> | 3 | ;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org> |
| 4 | ;;; Copyright © 2015, 2017 Leo Famulari <leo@famulari.name> | 4 | ;;; Copyright © 2015, 2017 Leo Famulari <leo@famulari.name> |
| 5 | ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> | 5 | ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> |
| @@ -48,12 +48,12 @@ | |||
| 48 | "Return the URL of Bash patch number SEQNO." | 48 | "Return the URL of Bash patch number SEQNO." |
| 49 | (format #f "mirror://gnu/bash/bash-5.0-patches/bash50-~3,'0d" seqno)) | 49 | (format #f "mirror://gnu/bash/bash-5.0-patches/bash50-~3,'0d" seqno)) |
| 50 | 50 | ||
| 51 | (define (bash-patch seqno sha256) | 51 | (define (bash-patch seqno sha256-bv) |
| 52 | "Return the origin of Bash patch SEQNO, with expected hash SHA256" | 52 | "Return the origin of Bash patch SEQNO, with expected hash SHA256-BV." |
| 53 | (origin | 53 | (origin |
| 54 | (method url-fetch) | 54 | (method url-fetch) |
| 55 | (uri (patch-url seqno)) | 55 | (uri (patch-url seqno)) |
| 56 | (sha256 sha256))) | 56 | (sha256 sha256-bv))) |
| 57 | 57 | ||
| 58 | (define-syntax-rule (patch-series (seqno hash) ...) | 58 | (define-syntax-rule (patch-series (seqno hash) ...) |
| 59 | (list (bash-patch seqno (base32 hash)) | 59 | (list (bash-patch seqno (base32 hash)) |
