mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2026-04-06 13:10:33 +02:00
Merge branch 'master' into core-updates
This commit is contained in:
@@ -44,9 +44,6 @@
|
||||
(define %mkdir
|
||||
(bootstrap-binary "mkdir"))
|
||||
|
||||
(define make-derivation-input
|
||||
(@@ (guix derivations) make-derivation-input))
|
||||
|
||||
|
||||
(test-begin "grafts")
|
||||
|
||||
@@ -355,16 +352,11 @@
|
||||
(p1r-inputs (filter (match-input p1r) inputs))
|
||||
(p2-inputs (filter (match-input p2) inputs)))
|
||||
(and (equal? p1-inputs
|
||||
(list (make-derivation-input (derivation-file-name p1)
|
||||
'("one"))))
|
||||
(list (derivation-input p1 '("one"))))
|
||||
(equal? p1r-inputs
|
||||
(list
|
||||
(make-derivation-input (derivation-file-name p1r)
|
||||
'("ONE"))))
|
||||
(list (derivation-input p1r '("ONE"))))
|
||||
(equal? p2-inputs
|
||||
(list
|
||||
(make-derivation-input (derivation-file-name p2)
|
||||
'("aaa"))))
|
||||
(list (derivation-input p2 '("aaa"))))
|
||||
(derivation-output-names p2g))))))
|
||||
|
||||
(test-assert "graft-derivation, renaming" ;<http://bugs.gnu.org/23132>
|
||||
|
||||
Reference in New Issue
Block a user