1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 13:10:33 +02:00

transformations: Fix recursive?' inheritance for with-git-url'.

* guix/transformations.scm (transform-package-source-git-url): Use the second
value of `package-git-url+recursive?'.
* tests/transformations.scm
("options->transformation, with-git-url, recursive? inheritance"): New test.

Change-Id: Ifd89bf1b0267f2b080b872cc7b318b9ae3706422
This commit is contained in:
Maxim Cournoyer
2026-01-29 13:46:47 +09:00
parent df96ee97e9
commit f3d73553cd
2 changed files with 20 additions and 1 deletions

View File

@@ -356,7 +356,9 @@ a checkout of the Git repository at the given URL."
(origin-uri (package-source old))))
(recursive? (if (or (git-checkout? uri)
(git-reference? uri))
(package-git-url+recursive? old)
(let ((_ recursive?
(package-git-url+recursive? old)))
recursive?)
#t)))
(package
(inherit old)

View File

@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2016-2017, 2019-2024, 2026 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2021 Marius Bakke <marius@gnu.org>
;;; Copyright © 2026 Maxim Cournoyer <maxim@guixotic.coop>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -372,6 +373,22 @@
((("x" dep3))
(map package-source (list dep1 dep3)))))))))))
(test-equal "options->transformation, with-git-url, recursive? inheritance"
(git-checkout (url "https://example2.org")
(recursive? #f))
(let* ((p (dummy-package "chbouib"
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://example1.org")
(commit "cabba9e")
(recursive? #f)))
(sha256 #f)))))
(t (options->transformation
'((with-git-url . "chbouib=https://example2.org")))))
(let ((new (t p)))
(package-source new))))
(define* (depends-on-toolchain? p #:optional (toolchain "gcc-toolchain"))
"Return true if P depends on TOOLCHAIN instead of the default tool chain."
(define toolchain-packages