[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/11: packages: Remove 'origin-sha256' procedure.
From: |
guix-commits |
Subject: |
11/11: packages: Remove 'origin-sha256' procedure. |
Date: |
Fri, 7 Apr 2023 12:01:58 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 5481aaacb5f60ba43d8db7e51cb7cc967d5eb55e
Author: Bruno Victal <mirai@makinata.eu>
AuthorDate: Mon Feb 27 00:11:44 2023 +0000
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>
---
guix/packages.scm | 9 ---------
tests/import-utils.scm | 2 +-
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/guix/packages.scm b/guix/packages.scm
index 4c0c194652..2d33212f44 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -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
diff --git a/tests/import-utils.scm b/tests/import-utils.scm
index 44dff14597..1565dd610a 100644
--- a/tests/import-utils.scm
+++ b/tests/import-utils.scm
@@ -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>
- branch master updated (110dc3fde9 -> 5481aaacb5), guix-commits, 2023/04/07
- 03/11: services: ntp-service-type: Remove deprecated server as strings support., guix-commits, 2023/04/07
- 01/11: gnu: Purge pre-1.3.0 deprecated packages., guix-commits, 2023/04/07
- 10/11: services: desktop: Remove 'xfce-desktop-service' procedure., guix-commits, 2023/04/07
- 02/11: gnu: curl-minimal: Remove variable., guix-commits, 2023/04/07
- 11/11: packages: Remove 'origin-sha256' procedure.,
guix-commits <=
- 04/11: services: sddm: Remove 'sddm-service' procedure., guix-commits, 2023/04/07
- 06/11: services: base: Remove 'console-font-service' procedure., guix-commits, 2023/04/07
- 05/11: services: base: Remove 'console-keymap-service-type' variable., guix-commits, 2023/04/07
- 07/11: services: guix-publish: Remove 'compression-level' field., guix-commits, 2023/04/07
- 09/11: services: desktop: Remove 'mate-desktop-service' procedure., guix-commits, 2023/04/07
- 08/11: services: desktop: Remove 'gnome-desktop-service' procedure., guix-commits, 2023/04/07