[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
151/244: packages: Remove 'origin-sha256' procedure.
From: |
guix-commits |
Subject: |
151/244: packages: Remove 'origin-sha256' procedure. |
Date: |
Wed, 12 Apr 2023 08:49:09 -0400 (EDT) |
apteryx pushed a commit to branch staging
in repository guix.
commit 0141e00b1481b1a672facff58fd971d0077edb51
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>
- 166/244: gnu: tuxedo-keyboard: Update to 3.2.1., (continued)
- 166/244: gnu: tuxedo-keyboard: Update to 3.2.1., guix-commits, 2023/04/12
- 199/244: gnu: xfce4-session: Update to 4.18.2., guix-commits, 2023/04/12
- 179/244: svn-download: Default to non-recursive checkouts., guix-commits, 2023/04/12
- 229/244: gnu: ldc: Use default test check., guix-commits, 2023/04/12
- 218/244: gnu: s6: Update to 2.11.3.2., guix-commits, 2023/04/12
- 224/244: gnu: s6-linux-utils: Update to 2.6.1.2., guix-commits, 2023/04/12
- 164/244: gnu: fet: Update to 6.8.7., guix-commits, 2023/04/12
- 185/244: gnu: xcb-imdkit: Update to 1.0.5., guix-commits, 2023/04/12
- 208/244: gnu: emacs-gptel: Update to 0.3.2., guix-commits, 2023/04/12
- 216/244: gnu: skalibs: Update to 2.13.1.1., guix-commits, 2023/04/12
- 151/244: packages: Remove 'origin-sha256' procedure.,
guix-commits <=
- 184/244: gnu: fcitx-qt5: Update to 1.2.7., guix-commits, 2023/04/12
- 217/244: gnu: execline: Update to 2.9.3.0., guix-commits, 2023/04/12
- 191/244: gnu: fcitx5-chinese-addons: Update to 5.0.17., guix-commits, 2023/04/12
- 195/244: gnu: garcon: Update to 4.18.1., guix-commits, 2023/04/12
- 157/244: gnu: seer-gdb: Update to 1.16., guix-commits, 2023/04/12
- 227/244: gnu: ijs: Fix cross-building to riscv64-linux., guix-commits, 2023/04/12
- 213/244: gnu: haproxy: Update to 2.7.6., guix-commits, 2023/04/12
- 188/244: gnu: fcitx5-gtk: Update to 5.0.23., guix-commits, 2023/04/12
- 203/244: gnu: xfburn: Update to 0.7.0., guix-commits, 2023/04/12
- 165/244: gnu: pyzo: Update to 4.12.8., guix-commits, 2023/04/12