From 00dfff84c66c5c6aa4853684419a92befe55d4b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 15 Mar 2022 15:17:49 +0100 Subject: [PATCH] packages: 'modify-inputs' preserves outputs in 'replace' clauses. Fixes . Reported by Gordon Quad . * guix/packages.scm (replace-input): Preserve the outputs of INPUT by default. * tests/packages.scm ("modify-inputs, replace, extra output"): New test. --- guix/packages.scm | 4 ++-- tests/packages.scm | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/guix/packages.scm b/guix/packages.scm index 3f0262602d..288ae37523 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -1091,11 +1091,11 @@ (define (replace-input name replacement inputs) "Replace input NAME by REPLACEMENT within INPUTS." (map (lambda (input) (match input - (((? string? label) . _) + (((? string? label) _ . outputs) (if (string=? label name) (match replacement ;does REPLACEMENT specify an output? ((_ _) (cons label replacement)) - (_ (list label replacement))) + (_ (cons* label replacement outputs))) input)))) inputs)) diff --git a/tests/packages.scm b/tests/packages.scm index 2cb90d3145..710eace6dc 100644 --- a/tests/packages.scm +++ b/tests/packages.scm @@ -1982,6 +1982,21 @@ (define (list->set* lst) ((("coreutils" input "out")) input)))) +(test-eq "modify-inputs, replace, extra output" + guile-3.0 + ;; Replace an input; notice that its output is preserved. + ;; See . + (let* ((p1 (dummy-package "p" + (inputs (list `(,coreutils "debug"))))) + (p2 (package + (inherit p1) + (version "1") + (inputs (modify-inputs (package-inputs p1) + (replace "coreutils" guile-3.0)))))) + (match (package-inputs p2) + ((("coreutils" input "debug")) + input)))) + (test-end "packages") ;;; Local Variables: