From a4acb04cbda6e98cf8b465bfd9b00e82dd24f11a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 30 Oct 2025 16:20:05 +0900 Subject: [PATCH] Revert "gnu: Add zstd-final." This reverts commit e945001f04cc2ffcdee64aec4036a7e96bc67402. --- gnu/packages/commencement.scm | 28 +--------------------------- 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index 7e7382a37a772509aeb842a4aa063455b86c1ad7..e8e7192120c0d6368b1a94b91a41f7088128ace0 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -9,7 +9,7 @@ ;;; Copyright © 2019-2022 Marius Bakke ;;; Copyright © 2020, 2022 Timothy Sample ;;; Copyright © 2020 Guy Fleury Iteriteka -;;; Copyright © 2021, 2025 Maxim Cournoyer +;;; Copyright © 2021 Maxim Cournoyer ;;; Copyright © 2021 Chris Marusich ;;; Copyright © 2021 Julien Lepiller ;;; Copyright © 2021 Pierre Langlois @@ -3271,32 +3271,6 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%" ,@(package-arguments zlib))) (inputs (%boot2-inputs)))) -(define zstd-final - ;; Zstd used by BINUTILS-FINAL. - (package - (inherit zstd) - (source (bootstrap-origin (package-source zstd))) - (arguments - (substitute-keyword-arguments - (ensure-keyword-arguments - (package-arguments zstd) - (list #:guile %bootstrap-guile - #:implicit-inputs? #f - #:allowed-references (list "out" "lib" glibc-final))) - ((#:phases phases '%standard-phases) - #~(modify-phases #$phases - ;; Avoid retaining references to bash & grep in the zstdless - ;; script. - (delete 'patch-command-file-names) - (add-after 'install 'unpatch-bash-shebangs - (lambda _ - (with-directory-excursion (string-append #$output "/bin") - (substitute* '("zstdgrep" "zstdless") - (("#!/gnu/store/.*/bin/sh") - "#!/bin/sh"))))) - (delete 'patch-shebangs))))) - (inputs (%boot2-inputs)))) - (define/system-dependent ld-wrapper-boot3 ;; A linker wrapper that uses the bootstrap Guile. (make-ld-wrapper "ld-wrapper-boot3"