Browse Source

packages: Ensure bags are insensitive to '%current-system'.

Fixes <https://bugs.gnu.org/42327>.
Reported by Jan Nieuwenhuizen <janneke@gnu.org>.

This is a followup to f52fbf7094.

* guix/packages.scm (bag-transitive-inputs, bag-transitive-build-inputs)
(bag-transitive-host-inputs, bag-transitive-target-inputs): Parameterize
%CURRENT-SYSTEM in addition to %CURRENT-TARGET-SYSTEM.
* tests/packages.scm ("package->bag, sensitivity to %current-system"):
New test.
wip-haskell-updates-2
Ludovic Courtès 1 year ago
parent
commit
efb10f175f
No known key found for this signature in database GPG Key ID: 90B11993D9AEBB5
  1. 12
      guix/packages.scm
  2. 14
      tests/packages.scm

12
guix/packages.scm

@ -923,22 +923,26 @@ dependencies are known to build on SYSTEM."
(define (bag-transitive-inputs bag)
"Same as 'package-transitive-inputs', but applied to a bag."
(parameterize ((%current-target-system #f))
(parameterize ((%current-target-system #f)
(%current-system (bag-system bag)))
(transitive-inputs (bag-direct-inputs bag))))
(define (bag-transitive-build-inputs bag)
"Same as 'package-transitive-native-inputs', but applied to a bag."
(parameterize ((%current-target-system #f))
(parameterize ((%current-target-system #f)
(%current-system (bag-system bag)))
(transitive-inputs (bag-build-inputs bag))))
(define (bag-transitive-host-inputs bag)
"Same as 'package-transitive-target-inputs', but applied to a bag."
(parameterize ((%current-target-system (bag-target bag)))
(parameterize ((%current-target-system (bag-target bag))
(%current-system (bag-system bag)))
(transitive-inputs (bag-host-inputs bag))))
(define (bag-transitive-target-inputs bag)
"Return the \"target inputs\" of BAG, recursively."
(parameterize ((%current-target-system (bag-target bag)))
(parameterize ((%current-target-system (bag-target bag))
(%current-system (bag-system bag)))
(transitive-inputs (bag-target-inputs bag))))
(define* (package-closure packages #:key (system (%current-system)))

14
tests/packages.scm

@ -1110,6 +1110,20 @@
(("dep" package)
(eq? package dep)))))
(test-assert "package->bag, sensitivity to %current-system"
(let* ((dep (dummy-package "dep"
(propagated-inputs (if (string=? (%current-system)
"i586-gnu")
`(("libxml2" ,libxml2))
'()))))
(pkg (dummy-package "foo"
(native-inputs `(("dep" ,dep)))))
(bag (package->bag pkg (%current-system) "i586-gnu")))
(equal? (parameterize ((%current-system "x86_64-linux"))
(bag-transitive-inputs bag))
(parameterize ((%current-system "i586-gnu"))
(bag-transitive-inputs bag)))))
(test-assert "package->bag, sensitivity to %current-target-system"
(let* ((dep (dummy-package "dep"
(propagated-inputs (if (%current-target-system)

Loading…
Cancel
Save