[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#61829] [PATCH 11/11] guix: packages: Remove 'origin-sha256' procedu
From: |
Bruno Victal |
Subject: |
[bug#61829] [PATCH 11/11] guix: packages: Remove 'origin-sha256' procedure. |
Date: |
Mon, 27 Feb 2023 00:11:44 +0000 |
* guix/packages.scm (origin-sha256): Remove procedure.
* tests/import-utils.scm (test-import-utils)
[alist->package with explicit source]: Use content-hash-value.
---
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 041a872f9d..bded89b1e0 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -73,7 +73,6 @@ (define-module (guix packages)
origin-uri
origin-method
origin-hash
- origin-sha256 ;deprecated
origin-file-name
origin-actual-file-name
origin-patches
@@ -345,14 +344,6 @@ (define-syntax-rule (origin fields ...)
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 @@ (define-module (test-import-utils)
(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>
--
2.39.1
- [bug#61829] [PATCH 01/11] gnu: Purge pre-1.3.0 deprecated packages., (continued)
- [bug#61829] [PATCH 01/11] gnu: Purge pre-1.3.0 deprecated packages., Bruno Victal, 2023/02/26
- [bug#61829] [PATCH 05/11] services: base: Remove 'console-keymap-service-type' variable., Bruno Victal, 2023/02/26
- [bug#61829] [PATCH 03/11] services: ntp-service-type: Remove deprecated server as strings support., Bruno Victal, 2023/02/26
- [bug#61829] [PATCH 09/11] services: desktop: Remove 'mate-desktop-service' procedure., Bruno Victal, 2023/02/26
- [bug#61829] [PATCH 02/11] gnu: curl-minimal: Remove variable., Bruno Victal, 2023/02/26
- [bug#61829] [PATCH 06/11] services: base: Remove 'console-font-service' procedure., Bruno Victal, 2023/02/26
- [bug#61829] [PATCH 08/11] services: desktop: Remove 'gnome-desktop-service' procedure., Bruno Victal, 2023/02/26
- [bug#61829] [PATCH 10/11] services: desktop: Remove 'xfce-desktop-service' procedure., Bruno Victal, 2023/02/26
- [bug#61829] [PATCH 11/11] guix: packages: Remove 'origin-sha256' procedure.,
Bruno Victal <=
- [bug#61829] [PATCH 07/11] services: guix-publish: Remove 'compression-level' field., Bruno Victal, 2023/02/26