diff options
| author | Guillaume Le Vaillant <glv@posteo.net> | 2020-02-03 16:49:32 +0100 |
|---|---|---|
| committer | Guillaume Le Vaillant <glv@posteo.net> | 2020-02-03 17:12:07 +0100 |
| commit | 17c015c9099b4e57fbcb13a7388c24dfe77df684 (patch) | |
| tree | cf9da82fdefcf28c0b8125f7a220979f108838a6 | |
| parent | 7e23dcc73ec501d857cb649c29172ecaae630f81 (diff) | |
gnu: sbcl-graph: Fix build.
Rename the asd files so that they have the same name as the ASDF
system definitions.
* gnu/packages/lisp-xyz.scm (sbcl-graph)[arguments]: Use 'graph-test.asd'
instead of 'graph.test.asd' for test-asd-file.
(sbcl-graph-dot)[arguments]: Use 'graph-dot.asd' instead of 'graph.dot.asd'
for test-asd-file.
(sbcl-graph-json)[arguments]: Use 'graph-json.asd' instead of
'graph.json.asd' for test-asd-file.
* gnu/packages/patches/sbcl-graph-asdf-definitions.patch: Update accordingly.
| -rw-r--r-- | gnu/packages/lisp-xyz.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/patches/sbcl-graph-asdf-definitions.patch | 12 |
2 files changed, 9 insertions, 9 deletions
diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index ebf0d79882..66085919b1 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -7438,7 +7438,7 @@ interactive development.") ("metabang-bind" ,sbcl-metabang-bind) ("named-readtables" ,sbcl-named-readtables))) (arguments - '(#:test-asd-file "graph.test.asd")) + '(#:test-asd-file "graph-test.asd")) (synopsis "Graph data structure and algorithms for Common Lisp") (description "The GRAPH Common Lisp library provides a data structures to represent @@ -7463,7 +7463,7 @@ path, maximum flow, minimum spanning tree, etc.).") ("named-readtables" ,sbcl-named-readtables))) (arguments (substitute-keyword-arguments (package-arguments sbcl-graph) - ((#:asd-file _ "") "graph.dot.asd") + ((#:asd-file _ "") "graph-dot.asd") ((#:asd-system-name _ #f) "graph-dot"))) (synopsis "Serialize graphs to and from DOT format"))) @@ -7480,7 +7480,7 @@ path, maximum flow, minimum spanning tree, etc.).") ("yason" ,sbcl-yason))) (arguments (substitute-keyword-arguments (package-arguments sbcl-graph) - ((#:asd-file _ "") "graph.json.asd") + ((#:asd-file _ "") "graph-json.asd") ((#:asd-system-name _ #f) "graph-json"))) (synopsis "Serialize graphs to and from JSON format"))) diff --git a/gnu/packages/patches/sbcl-graph-asdf-definitions.patch b/gnu/packages/patches/sbcl-graph-asdf-definitions.patch index a528ccfcc6..ec17949675 100644 --- a/gnu/packages/patches/sbcl-graph-asdf-definitions.patch +++ b/gnu/packages/patches/sbcl-graph-asdf-definitions.patch @@ -24,11 +24,11 @@ index 193b6e3..56afc8f 100644 -(register-system-packages "femlisp-matlisp" '(:fl.matlisp)) + cl-heap) + :components ((:file "graph"))) -diff --git a/graph.dot.asd b/graph.dot.asd +diff --git a/graph-dot.asd b/graph-dot.asd new file mode 100644 index 0000000..12aec7e --- /dev/null -+++ b/graph.dot.asd ++++ b/graph-dot.asd @@ -0,0 +1,8 @@ +(defsystem :graph-dot + :depends-on (alexandria @@ -38,11 +38,11 @@ index 0000000..12aec7e + cl-ppcre + graph) + :components ((:file "dot"))) -diff --git a/graph.json.asd b/graph.json.asd +diff --git a/graph-json.asd b/graph-json.asd new file mode 100644 index 0000000..e7d091f --- /dev/null -+++ b/graph.json.asd ++++ b/graph-json.asd @@ -0,0 +1,8 @@ +(defsystem :graph-json + :depends-on (alexandria @@ -52,11 +52,11 @@ index 0000000..e7d091f + yason + graph) + :components ((:file "json"))) -diff --git a/graph.test.asd b/graph.test.asd +diff --git a/graph-test.asd b/graph-test.asd new file mode 100644 index 0000000..1e811e1 --- /dev/null -+++ b/graph.test.asd ++++ b/graph-test.asd @@ -0,0 +1,10 @@ +(defsystem :graph-test + :depends-on (alexandria |