janneke pushed a commit to branch core-packages-team
in repository guix.
commit aaeb2fda47dc063401e533dbf1a4eb47eebdf08b
Author: Zheng Junjie <z572@z572.online>
AuthorDate: Fri Feb 7 11:38:15 2025 +0800
gnu: zstd: Update to 1.5.6.
* gnu/packages/compression.scm (zstd): Update to 1.5.6
(zstd-1.5.6): Remove variable.
(pzstd): Inherit from zstd.
Change-Id: If0020d61c5516222f6a80bdc7b41c19732f359e1
---
gnu/packages/compression.scm | 32 +++++++++-----------------------
1 file changed, 9 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 80e34c4c72..2242cd1533 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -41,7 +41,7 @@
;;; Copyright © 2024 Vinicius Monego <mon...@posteo.net>
;;; Copyright © 2024 David Elsing <david.els...@posteo.net>
;;; Copyright © 2024 Artyom V. Poptsov <poptsov.art...@gmail.com>
-;;; Copyright © 2024 Zheng Junjie <873216...@qq.com>
+;;; Copyright © 2024, 2025 Zheng Junjie <873216...@qq.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -1743,14 +1743,14 @@ or junctions, and always follows hard links.")
(define-public zstd
(package
(name "zstd")
- (version "1.5.2")
+ (version "1.5.6")
(source
(origin
(method url-fetch)
(uri (string-append
"https://github.com/facebook/zstd/releases/download/";
"v" version "/zstd-" version ".tar.gz"))
(sha256
- (base32 "1l1zm1imcc2ixayykyh4y421shdj3pzp7g2xm2k2js8jmipxahkw"))))
+ (base32 "1h83si7s70jy7mcy0mv1c9mbkz66qqpawxs0zkmc3b1ayinf0acc"))))
(build-system gnu-build-system)
(outputs '("out" ;1.5MiB executables and documentation
"lib" ;1.2MiB shared library and headers
@@ -1787,7 +1787,7 @@ or junctions, and always follows hard links.")
(rename-file (string-append shared-libs "/libzstd.a")
(string-append static-libs
"/libzstd_static.lib"))
(delete-file-recursively
- (string-append shared-libs "/pkgconfig"))
+ (string-append shared-libs "/pkgconfig"))
;; no binary for interpreter `sh' found in $PATH
(delete-file (string-append out "/bin/zstdgrep"))
(delete-file (string-append out "/bin/zstdless"))
@@ -1845,32 +1845,18 @@ speed.")
license:public-domain ; zlibWrapper/examples/fitblk*
license:zlib)))) ; zlibWrapper/{gz*.c,gzguts.h}
-(define-public zstd-1.5.6
- (package
- (inherit zstd)
- ;; Don't hide this package from the UI.
- (properties '())
- (version "1.5.6")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
"https://github.com/facebook/zstd/releases/download/";
- "v" version "/zstd-" version ".tar.gz"))
- (sha256
- (base32 "1h83si7s70jy7mcy0mv1c9mbkz66qqpawxs0zkmc3b1ayinf0acc"))))))
-
(define-public pzstd
- (package/inherit zstd-1.5.6
+ (package/inherit zstd
(name "pzstd")
(outputs '("out"))
(inputs
`(,@(if (%current-target-system)
- `(("googletest" ,googletest))
- '())))
+ `(("googletest" ,googletest))
+ '())))
(native-inputs
`(,@(if (%current-system)
- `(("googletest" ,googletest))
- '())))
+ `(("googletest" ,googletest))
+ '())))
(arguments
`(#:phases
(modify-phases %standard-phases
