1
0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 13:10:33 +02:00

Merge branch 'staging' into core-updates

This commit is contained in:
Marius Bakke
2019-03-23 23:16:55 +01:00
219 changed files with 9962 additions and 3896 deletions

View File

@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;; Copyright © 2015, 2016, 2017, 2018, 2019 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -191,6 +191,32 @@ edges."
(string=? target (derivation-file-name g)))))
edges)))))))))
(test-assert "reverse bag DAG"
(let-values (((dune bap ocaml-base)
(values (specification->package "dune")
(specification->package "bap")
(specification->package "ocaml-base")))
((backend nodes+edges) (make-recording-backend)))
(run-with-store %store
(export-graph (list dune) 'port
#:node-type %reverse-bag-node-type
#:backend backend))
(run-with-store %store
(mlet %store-monad ((dune-drv (package->derivation dune))
(bap-drv (package->derivation bap))
(ocaml-base-drv (package->derivation ocaml-base)))
;; OCAML-BASE uses 'dune-build-system' so DUNE is a direct dependency.
;; BAP is much higher in the stack but it should be there.
(let-values (((nodes edges) (nodes+edges)))
(return
(and (member `(,(derivation-file-name bap-drv)
,(package-full-name bap))
nodes)
(->bool (member (map derivation-file-name
(list dune-drv ocaml-base-drv))
edges)))))))))
(test-assert "derivation DAG"
(let-values (((backend nodes+edges) (make-recording-backend)))
(run-with-store %store