unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Guillaume Le Vaillant <glv@posteo.net>
To: 37817@debbugs.gnu.org
Cc: Guillaume Le Vaillant <glv@posteo.net>
Subject: [bug#37817] [PATCH v2 7/9] gnu: Add graph.
Date: Mon, 21 Oct 2019 14:03:01 +0200	[thread overview]
Message-ID: <20191021120303.18735-7-glv@posteo.net> (raw)
In-Reply-To: <20191021120303.18735-1-glv@posteo.net>

* gnu/packages/lisp.scm (cl-graph, sbcl-graph): New variables.
* gnu/packages/patches/sbcl-graph-asdf-definitions.patch: New file.
* gnu/local.mk (dist_patch_DATA): Add it.
---
 gnu/local.mk                                  |  1 +
 gnu/packages/lisp.scm                         | 40 +++++++++++
 .../patches/sbcl-graph-asdf-definitions.patch | 70 +++++++++++++++++++
 3 files changed, 111 insertions(+)
 create mode 100644 gnu/packages/patches/sbcl-graph-asdf-definitions.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 4292e6f415..2568d75c1a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1319,6 +1319,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/rust-coresimd-doctest.patch		\
   %D%/packages/patches/rust-reproducible-builds.patch		 \
   %D%/packages/patches/rxvt-unicode-escape-sequences.patch	\
+  %D%/packages/patches/sbcl-graph-asdf-definitions.patch	\
   %D%/packages/patches/scalapack-blacs-mpi-deprecations.patch	\
   %D%/packages/patches/scheme48-tests.patch			\
   %D%/packages/patches/scotch-build-parallelism.patch		\
diff --git a/gnu/packages/lisp.scm b/gnu/packages/lisp.scm
index 4abc0f7790..38fc35744e 100644
--- a/gnu/packages/lisp.scm
+++ b/gnu/packages/lisp.scm
@@ -8009,3 +8009,43 @@ interactive development.")
 
 (define-public cl-stefil
   (sbcl-package->cl-source-package sbcl-stefil))
+
+(define-public sbcl-graph
+  (let ((commit "78bf9ec930d8eae4f0861b5be76765fb1e45e24f")
+        (revision "0"))
+    (package
+      (name "sbcl-graph")
+      (version (git-version "0.0.0" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri
+          (git-reference
+           (url "https://github.com/eschulte/graph.git")
+           (commit commit)))
+         (file-name (git-file-name name version))
+         (sha256
+          (base32
+           "1qpij4xh8bqwc2myahpilcbh916v7vg0acz2fij14d3y0jm02h0g"))
+         (patches (search-patches "sbcl-graph-asdf-definitions.patch"))))
+      (build-system asdf-build-system/sbcl)
+      (native-inputs
+       `(("stefil" ,sbcl-stefil)))
+      (inputs
+       `(("alexandria" ,sbcl-alexandria)
+         ("cl-heap" ,sbcl-cl-heap)
+         ("curry-compose-reader-macros" ,sbcl-curry-compose-reader-macros)
+         ("metabang-bind" ,sbcl-metabang-bind)
+         ("named-readtables" ,sbcl-named-readtables)))
+      (arguments
+       '(#: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
+graphs, as well as some graph manipulation and analysis algorithms (shortest
+path, maximum flow, minimum spanning tree, etc.).")
+      (home-page "https://eschulte.github.io/graph/")
+      (license license:gpl3+))))
+
+(define-public cl-graph
+  (sbcl-package->cl-source-package sbcl-graph))
diff --git a/gnu/packages/patches/sbcl-graph-asdf-definitions.patch b/gnu/packages/patches/sbcl-graph-asdf-definitions.patch
new file mode 100644
index 0000000000..a528ccfcc6
--- /dev/null
+++ b/gnu/packages/patches/sbcl-graph-asdf-definitions.patch
@@ -0,0 +1,70 @@
+commit 52ebece1243ae6900e414b6248b5145a28348eef
+Author: Guillaume Le Vaillant <glv@posteo.net>
+Date:   Fri Oct 18 15:41:23 2019 +0200
+
+    Use basic ASDF system definitions instead of package-inferred-system
+
+diff --git a/graph.asd b/graph.asd
+index 193b6e3..56afc8f 100644
+--- a/graph.asd
++++ b/graph.asd
+@@ -3,12 +3,10 @@
+   :version "0.0.0"
+   :author ("Eric Schulte <schulte.eric@gmail.com>" "Thomas Dye")
+   :licence "GPL V3"
+-  :class :package-inferred-system
+-  :defsystem-depends-on (:asdf-package-system)
++  :in-order-to ((test-op (test-op graph-test)))
+   :depends-on (alexandria
+                metabang-bind
+                named-readtables
+                curry-compose-reader-macros
+-               graph/graph))
+-
+-(register-system-packages "femlisp-matlisp" '(:fl.matlisp))
++               cl-heap)
++  :components ((:file "graph")))
+diff --git a/graph.dot.asd b/graph.dot.asd
+new file mode 100644
+index 0000000..12aec7e
+--- /dev/null
++++ b/graph.dot.asd
+@@ -0,0 +1,8 @@
++(defsystem :graph-dot
++  :depends-on (alexandria
++               metabang-bind
++               named-readtables
++               curry-compose-reader-macros
++               cl-ppcre
++               graph)
++  :components ((:file "dot")))
+diff --git a/graph.json.asd b/graph.json.asd
+new file mode 100644
+index 0000000..e7d091f
+--- /dev/null
++++ b/graph.json.asd
+@@ -0,0 +1,8 @@
++(defsystem :graph-json
++  :depends-on (alexandria
++               metabang-bind
++               named-readtables
++               curry-compose-reader-macros
++               yason
++               graph)
++  :components ((:file "json")))
+diff --git a/graph.test.asd b/graph.test.asd
+new file mode 100644
+index 0000000..1e811e1
+--- /dev/null
++++ b/graph.test.asd
+@@ -0,0 +1,10 @@
++(defsystem :graph-test
++  :depends-on (alexandria
++               metabang-bind
++               named-readtables
++               curry-compose-reader-macros
++               graph
++               stefil)
++  :perform (test-op (o s)
++             (uiop:symbol-call :graph/test 'test))
++  :components ((:file "test")))
-- 
2.23.0

  parent reply	other threads:[~2019-10-21 12:05 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-18 20:38 [bug#37817] [PATCH 0/7] Add graph Common Lisp library and dependencies Guillaume Le Vaillant
2019-10-18 20:42 ` [bug#37817] [PATCH 1/7] gnu: Add cl-heap Guillaume Le Vaillant
2019-10-18 20:42   ` [bug#37817] [PATCH 2/7] gnu: Add curry-compose-reader-macros Guillaume Le Vaillant
2019-10-18 20:42   ` [bug#37817] [PATCH 3/7] gnu: Add yason Guillaume Le Vaillant
2019-10-18 20:42   ` [bug#37817] [PATCH 4/7] gnu: sbcl-iterate: Add missing native input Guillaume Le Vaillant
2019-10-18 20:42   ` [bug#37817] [PATCH 5/7] gnu: Add ecl-iterate Guillaume Le Vaillant
2019-10-18 20:42   ` [bug#37817] [PATCH 6/7] gnu: Add stefil Guillaume Le Vaillant
2019-10-18 20:42   ` [bug#37817] [PATCH 7/7] gnu: Add graph Guillaume Le Vaillant
2019-10-21  9:16   ` [bug#37817] [PATCH 1/7] gnu: Add cl-heap., [bug#37817] [PATCH 2/7] gnu: Add curry-compose-reader-macros., [bug#37817] [PATCH 3/7] gnu: Add yason., [bug#37817] [PATCH 4/7] gnu: sbcl-iterate: Add missing native input., [bug#37817] [PATCH 5/7] gnu: Add ecl-iterate., [bug#37817] [PATCH 6/7] gnu: Add stefil., " Pierre Neidhardt
2019-10-21 10:05     ` Guillaume Le Vaillant
2019-10-21 10:16       ` Pierre Neidhardt
2019-10-21 12:02         ` [bug#37817] [PATCH v2 1/9] gnu: Add cl-heap Guillaume Le Vaillant
2019-10-21 12:02           ` [bug#37817] [PATCH v2 2/9] gnu: Add curry-compose-reader-macros Guillaume Le Vaillant
2019-10-21 12:02           ` [bug#37817] [PATCH v2 3/9] gnu: Add yason Guillaume Le Vaillant
2019-10-21 12:02           ` [bug#37817] [PATCH v2 4/9] gnu: sbcl-iterate: Add missing native input Guillaume Le Vaillant
2019-10-21 12:02           ` [bug#37817] [PATCH v2 5/9] gnu: Add ecl-iterate Guillaume Le Vaillant
2019-10-21 12:03           ` [bug#37817] [PATCH v2 6/9] gnu: Add stefil Guillaume Le Vaillant
2019-10-21 12:03           ` Guillaume Le Vaillant [this message]
2019-10-21 12:03           ` [bug#37817] [PATCH v2 8/9] gnu: Add sbcl-graph-dot Guillaume Le Vaillant
2019-10-21 12:03           ` [bug#37817] [PATCH v2 9/9] gnu: Add sbcl-graph-json Guillaume Le Vaillant
2019-10-22  8:50         ` [bug#37817] [PATCH 1/7] gnu: Add cl-heap., [bug#37817] [PATCH 2/7] gnu: Add curry-compose-reader-macros., [bug#37817] [PATCH 3/7] gnu: Add yason., [bug#37817] [PATCH 4/7] gnu: sbcl-iterate: Add missing native input., [bug#37817] [PATCH 5/7] gnu: Add ecl-iterate., [bug#37817] [PATCH 6/7] gnu: Add stefil., [bug#37817] [PATCH 7/7] gnu: Add graph Pierre Neidhardt

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191021120303.18735-7-glv@posteo.net \
    --to=glv@posteo.net \
    --cc=37817@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).