diff options
| author | Ludovic Courtès <ludovic.courtes@inria.fr> | 2021-08-11 15:54:59 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-08-11 16:35:28 +0200 |
| commit | 373e7ac4f9d510d3a58fcdbe9ec2d67eb426336b (patch) | |
| tree | 5f8b69cfa8b7a458fd7f13f50a771e1ec306f855 /tests | |
| parent | 168d107abf5608e6a1bfb37ee3448c4087856602 (diff) | |
| download | guix-373e7ac4f9d510d3a58fcdbe9ec2d67eb426336b.tar.gz | |
transformations: 'with-patch' works on non-origin sources.
Fixes <https://issues.guix.gnu.org/49697>.
Reported by Philippe Swartvagher <philippe.swartvagher@inria.fr>.
* guix/transformations.scm (patched-source): New procedure.
(transform-package-patches)[package-with-extra-patches]: Use it
when (package-source p) is not an origin.
* tests/transformations.scm ("options->transformation, with-commit +
with-patch"): New test.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/transformations.scm | 30 |
1 files changed, 29 insertions, 1 deletions
diff --git a/tests/transformations.scm b/tests/transformations.scm index 902bd45a6a..3417c994ec 100644 --- a/tests/transformations.scm +++ b/tests/transformations.scm @@ -29,7 +29,10 @@ #:use-module (guix build-system) #:use-module (guix build-system gnu) #:use-module (guix transformations) - #:use-module ((guix gexp) #:select (local-file? local-file-file)) + #:use-module ((guix gexp) + #:select (local-file? local-file-file + computed-file? computed-file-gexp + gexp-input-thing)) #:use-module (guix ui) #:use-module (guix utils) #:use-module (guix git) @@ -400,6 +403,31 @@ (map local-file-file (origin-patches (package-source dep))))))))) +(test-equal "options->transformation, with-commit + with-patch" + '(#t #t) + (let* ((patch (search-patch "glibc-locales.patch")) + (commit "f8934ec94df5868ee8baf1fb0f8ed0f24e7e91eb") + (t (options->transformation + ;; Note: options are applied in reverse order, so + ;; 'with-patch' comes on top. + `((with-patch . ,(string-append "guile-gcrypt=" patch)) + (with-commit + . ,(string-append "guile-gcrypt=" commit)))))) + (let ((new (t (@ (gnu packages gnupg) guile-gcrypt)))) + (match (package-source new) + ((? computed-file? source) + (let* ((gexp (computed-file-gexp source)) + (inputs (map gexp-input-thing + ((@@ (guix gexp) gexp-inputs) gexp)))) + (list (any (lambda (input) + (and (git-checkout? input) + (string=? commit (git-checkout-commit input)))) + inputs) + (any (lambda (input) + (and (local-file? input) + (string=? (local-file-file input) patch))) + inputs)))))))) + (test-equal "options->transformation, with-latest" "42.0" (mock ((guix upstream) %updaters |