diff options
| author | Marius Bakke <marius@gnu.org> | 2020-05-26 22:38:12 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-05-26 22:38:12 +0200 |
| commit | 8a7a5dc7805f4628e60f90af6b2416f951d0c034 (patch) | |
| tree | 63f13443ea5c9e7ee5bb219fc9ff4f1eacfbf21a /gnu/packages/bash.scm | |
| parent | c37b621cf3f0cd9c06677b4be6f931d927e7fea5 (diff) | |
| parent | 8bd0b533b30d7ee5e03aee99a2eb96d5b0b1c836 (diff) | |
| download | guix-8a7a5dc7805f4628e60f90af6b2416f951d0c034.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/bash.scm')
| -rw-r--r-- | gnu/packages/bash.scm | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/gnu/packages/bash.scm b/gnu/packages/bash.scm index 1b342827c5..3ba8a13e40 100644 --- a/gnu/packages/bash.scm +++ b/gnu/packages/bash.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2019 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2019, 2020 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2014, 2015, 2018 Mark H Weaver <mhw@netris.org> ;;; Copyright © 2015, 2017 Leo Famulari <leo@famulari.name> ;;; Copyright © 2016, 2017, 2018, 2019 Efraim Flashner <efraim@flashner.co.il> @@ -38,8 +38,11 @@ #:use-module (guix store) #:use-module (guix build-system gnu) #:autoload (guix gnupg) (gnupg-verify*) - #:autoload (gcrypt hash) (port-sha256) #:autoload (guix base32) (bytevector->nix-base32-string) + + ;; See <https://bugs.gnu.org/41457> for why not #:autoload here. + #:use-module ((gcrypt hash) #:select (port-sha256)) + #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (ice-9 format)) @@ -48,12 +51,12 @@ "Return the URL of Bash patch number SEQNO." (format #f "mirror://gnu/bash/bash-5.0-patches/bash50-~3,'0d" seqno)) -(define (bash-patch seqno sha256) - "Return the origin of Bash patch SEQNO, with expected hash SHA256" +(define (bash-patch seqno sha256-bv) + "Return the origin of Bash patch SEQNO, with expected hash SHA256-BV." (origin (method url-fetch) (uri (patch-url seqno)) - (sha256 sha256))) + (sha256 sha256-bv))) (define-syntax-rule (patch-series (seqno hash) ...) (list (bash-patch seqno (base32 hash)) |