From ebc348a37addd53bab27ede856e0e4af3aa10b41 Mon Sep 17 00:00:00 2001 From: Eric Bavier Date: Fri, 10 Oct 2014 14:27:20 -0500 Subject: [PATCH] guix: refresh: Use bags. * guix/packages.scm (bag-direct-inputs): New procedure. * gnu/packages.scm (package-dependencies): Use it. --- gnu/packages.scm | 2 +- guix/packages.scm | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/gnu/packages.scm b/gnu/packages.scm index 281d0d2..f82c6b5 100644 --- a/gnu/packages.scm +++ b/gnu/packages.scm @@ -250,7 +250,7 @@ list of packages that depend on that package." (cons package (vhash-refq d in '())) (vhash-delq in d))) dag - (match (package-direct-inputs package) + (match (bag-direct-inputs (package->bag package)) (((labels packages . _) ...) packages) ))) vlist-null)))) diff --git a/guix/packages.scm b/guix/packages.scm index 76e01f3..bdcf299 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -98,6 +98,7 @@ package->bag bag->derivation + bag-direct-inputs bag-transitive-inputs bag-transitive-host-inputs bag-transitive-build-inputs @@ -534,11 +535,15 @@ for the host system (\"native inputs\"), and not target inputs." recursively." (transitive-inputs (package-propagated-inputs package))) +(define (bag-direct-inputs bag) + "Same as 'package-direct-inputs', but applied to a bag." + (append (bag-build-inputs bag) + (bag-host-inputs bag) + (bag-target-inputs bag))) + (define (bag-transitive-inputs bag) "Same as 'package-transitive-inputs', but applied to a bag." - (transitive-inputs (append (bag-build-inputs bag) - (bag-host-inputs bag) - (bag-target-inputs bag)))) + (transitive-inputs (bag-direct-inputs bag))) (define (bag-transitive-build-inputs bag) "Same as 'package-transitive-native-inputs', but applied to a bag." -- 1.7.9.5