packages: Fix repacked file name extension when zstd is unavailable. - guix - Wojtek's customized Guix

about summary refs log tree commit diff

path: root/manifest.scm

diff options

author	Maxim Cournoyer <maxim.cournoyer@gmail.com>	2024-01-20 22:50:19 -0500
committer	Ludovic Courtès <ludo@gnu.org>	2024-08-31 10:44:37 +0200
commit	3de22656adbfa62362f735d8e137311a62ded856 (patch)
tree	0e4146d22c2837590b25770244b6d328a6fda696 /manifest.scm
parent	47c595b147b06c90f75929f0886515a2d262b865 (diff)
download	guix-3de22656adbfa62362f735d8e137311a62ded856.tar.gz guix-3de22656adbfa62362f735d8e137311a62ded856.zip

packages: Fix repacked file name extension when zstd is unavailable.

This is a follow-up commit to a869f4bef3 ("packages: Repack patched source archives via zstd by default."). * guix/packages.scm (patch-and-repack): Do not have xz fallback into the zstd variable, which is confusing and caused the extension selection to be wrong when the xz fallback was used. Refine how PATH is set to avoid duplicates. Change-Id: I580deba4de822eccf5f6fe53355b8ba57178c166

Diffstat (limited to 'manifest.scm')

0 files changed, 0 insertions, 0 deletions

ew git worktree at DIRECTORY, detached on commit COMMIT." (invoke "git" "worktree" "add" "--detach" directory commit)) (define (call-with-temporary-git-worktree commit proc) "Execute PROC in the context of a temporary git worktree created from COMMIT. PROC receives the temporary directory file name as an argument." (call-with-temporary-directory (lambda (tmp-directory) (dynamic-wind (lambda () #t) (lambda () (git-add-worktree tmp-directory commit) (proc tmp-directory)) (lambda () (invoke "git" "worktree" "remove" "--force" tmp-directory)))))) (define %savannah-guix-git-repo-push-url-regexp "git.(savannah|sv).gnu.org:?/srv/git/guix.git \\(push\\)") (define-syntax-rule (with-input-pipe-to-string prog arg ...) (let* ((input-pipe (open-pipe* OPEN_READ prog arg ...)) (output (get-string-all input-pipe)) (exit-val (status:exit-val (close-pipe input-pipe)))) (unless (zero? exit-val) (error (format #f "Command ~s exited with non-zero exit status: ~s" (string-join (list prog arg ...)) exit-val))) (string-trim-both output))) (define (find-origin-remote) "Find the name of the git remote with the Savannah Guix git repo URL." (and-let* ((remotes (string-split (with-input-pipe-to-string "git" "remote" "-v") #\newline)) (origin-entry (find (cut string-match %savannah-guix-git-repo-push-url-regexp <>) remotes))) (first (string-split origin-entry #\tab)))) (define (commit-already-pushed? remote commit) "True if COMMIT is found in the REMOTE repository." (not (string-null? (with-input-pipe-to-string "git" "branch" "-r" "--contains" commit (string-append remote "/master"))))) (define (keep-source-in-store store source) "Add SOURCE to the store under the name that the 'guix' package expects." ;; Add SOURCE to the store, but this time under the real name used in the ;; 'origin'. This allows us to build the package without having to make a ;; real checkout; thus, it also works when working on a private branch. (reload-module (resolve-module '(gnu packages package-management))) (let* ((source (add-to-store store (origin-file-name (package-source guix)) #t "sha256" source #:select? (git-predicate source))) (root (store-path-package-name source))) ;; Add an indirect GC root for SOURCE in the current directory. (false-if-exception (delete-file root)) (symlink source root) (add-indirect-root store (string-append (getcwd) "/" root)) (info (G_ "source code kept in ~a (GC root: ~a)~%") source root))) (define (main . args) (match args ((commit version) (with-directory-excursion %top-srcdir (or (getenv "GUIX_ALLOW_ME_TO_USE_PRIVATE_COMMIT") (let ((remote (find-origin-remote))) (unless remote (leave (G_ "Failed to find the origin git remote.~%"))) (commit-already-pushed? remote commit)) (leave (G_ "Commit ~a is not pushed upstream. Aborting.~%") commit)) (call-with-temporary-git-worktree commit (lambda (tmp-directory) (let* ((hash (nix-base32-string->bytevector (string-trim-both (with-output-to-string (lambda () (guix-hash "-rx" tmp-directory)))))) (location (package-definition-location)) (old-hash (content-hash-value (origin-hash (package-source guix))))) (edit-expression location (update-definition commit hash #:old-hash old-hash #:version version)) ;; When GUIX_ALLOW_ME_TO_USE_PRIVATE_COMMIT is set, the sources are ;; added to the store. This is used as part of 'make release'. (when (getenv "GUIX_ALLOW_ME_TO_USE_PRIVATE_COMMIT") (with-store store (keep-source-in-store store tmp-directory)))))))) ((commit) ;; Automatically deduce the version and revision numbers. (main commit #f)))) (apply main (cdr (command-line)))