diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-01-03 14:53:03 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-01-03 14:53:03 +0100 |
| commit | 53334dd6e9e296e17110ebcd2b1f93f117ffe36a (patch) | |
| tree | 2653db2eab9a204dab892ea8b6812cadf7209e84 /guix/scripts/graph.scm | |
| parent | 1575dcd134f4fae7255787293f4988bbd043de95 (diff) | |
| parent | 51385362f76e2f823ac8d8cf720d06c386504069 (diff) | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/scripts/graph.scm')
| -rw-r--r-- | guix/scripts/graph.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/guix/scripts/graph.scm b/guix/scripts/graph.scm index 9255f0018a..dcc4701779 100644 --- a/guix/scripts/graph.scm +++ b/guix/scripts/graph.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2015 Ludovic Courtès <ludo@gnu.org> +;;; Copyright © 2015, 2016 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -113,7 +113,7 @@ Dependencies may include packages, origin, and file names." (((labels things . outputs) ...) things))) ((origin? thing) - (cons (origin-patch-guile thing) + (cons (or (origin-patch-guile thing) (default-guile)) (if (or (pair? (origin-patches thing)) (origin-snippet thing)) (match (origin-patch-inputs thing) @@ -171,7 +171,9 @@ GNU-BUILD-SYSTEM have zero dependencies." (description "same as 'bag', but without the bootstrap nodes") (identifier bag-node-identifier) (label node-full-name) - (edges (lift1 bag-node-edges-sans-bootstrap %store-monad)))) + (edges (lift1 (compose (cut filter package? <>) + bag-node-edges-sans-bootstrap) + %store-monad)))) ;;; |