GNU bug report logs - #30272
[PATCH 1/3] gnu: Add Dashel.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 30272 in the body.
You can then email your comments to 30272 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: guix-patches <at> gnu.org
Cc: Ludovic Courtès <ludovic.courtes <at> inria.fr>
Subject: [PATCH 1/3] gnu: Add Dashel.
Date: Sat, 27 Jan 2018 23:22:59 +0100

From: Ludovic Courtès <ludovic.courtes <at> inria.fr>

* gnu/packages/cpp.scm (dashel): New variable.
---
 gnu/packages/cpp.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm
index 95e82fcb6..3e9c39df6 100644
--- a/gnu/packages/cpp.scm
+++ b/gnu/packages/cpp.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2017 Ethan R. Jones <doubleplusgood23 <at> gmail.com>
 ;;; Copyright © 2018 Tobias Geerinckx-Rice <me <at> tobias.gr>
 ;;; Copyright © 2018 Fis Trivial <ybbs.daans <at> hotmail.com>
+;;; Copyright © 2018 Ludovic Courtès <ludo <at> gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -100,3 +101,26 @@ operating system functions.")
  APIs on top of Standard Template Library (@dfn{STL}) classes.")
       (license (list license:expat        ; cJSON
                      license:bsd-4)))))   ; everything else (LICENSE.txt)
+
+(define-public dashel
+  (package
+    (name "dashel")
+    (version "1.3.3")
+    (home-page "https://github.com/aseba-community/dashel")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append home-page "/archive/" version ".tar.gz"))
+              (sha256
+               (base32
+                "1ckzac1rsw3cxmpdpwcqv46jyp7risk5ybq6jjiizbqn7labf6dw"))
+              (file-name (string-append name "-" version ".tar.gz"))))
+    (build-system cmake-build-system)
+    (arguments '(#:tests? #f))                    ;no tests
+    (native-inputs `(("pkg-config" ,pkg-config)))
+    (synopsis "Data stream helper encapsulation library")
+    (description
+     "Dashel is a data stream helper encapsulation C++ library.  It provides a
+unified access to TCP/UDP sockets, serial ports, console, and files streams.
+It also allows a server application to wait for any activity on any
+combination of these streams.")
+    (license license:bsd-3)))
-- 
2.15.1

Message #8 received at 30272 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: 30272 <at> debbugs.gnu.org
Cc: Ludovic Courtès <ludovic.courtes <at> inria.fr>
Subject: [PATCH 3/3] gnu: Add Aseba.
Date: Sat, 27 Jan 2018 23:28:05 +0100

From: Ludovic Courtès <ludovic.courtes <at> inria.fr>

* gnu/packages/robotics.scm (aseba): New variable.
---
 gnu/packages/robotics.scm | 61 ++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 60 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/robotics.scm b/gnu/packages/robotics.scm
index da6f8856b..9b30b90da 100644
--- a/gnu/packages/robotics.scm
+++ b/gnu/packages/robotics.scm
@@ -22,10 +22,16 @@
   #:use-module (guix git-download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix build-system cmake)
+  #:use-module (gnu packages avahi)
+  #:use-module (gnu packages cpp)
   #:use-module (gnu packages gl)
+  #:use-module (gnu packages linux)
   #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages protobuf)
   #:use-module (gnu packages qt)
-  #:use-module (gnu packages sdl))
+  #:use-module (gnu packages sdl)
+  #:use-module (gnu packages valgrind)
+  #:use-module (gnu packages xml))
 
 (define-public enki
   ;; Previous versions use Qt4 and are unsuitable for Aseba.
@@ -65,3 +71,56 @@ hundred times faster than real-time.")
       ;; citation, but that sentence is written as not being part of the
       ;; license (fortunately).
       (license license:gpl2+))))
+
+(define-public aseba
+  ;; Use the commit that allows us to build with Qt5.
+  (let ((commit "3b35de80d5fdd47592b1c01d57e1f4ef37c5e5ea")
+        (revision "0"))
+    (package
+      (name "aseba")
+      (version (git-version "1.6.0" revision commit))
+      (home-page "https://github.com/aseba-community/aseba")
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference (url home-page) (commit commit)
+                                    (recursive? #t))) ;for Blockly
+                (sha256
+                 (base32
+                  "0j31lmc9f0ksvkh0md2fgsz92hcsrwnrqqcynamizs2ah8iwlqi5"))
+                (file-name (string-append name "-" version "-checkout"))
+                (modules '((guix build utils)))
+                (snippet
+                 ;; Add missing Qt5::Network.
+                 '(substitute* "targets/playground/CMakeLists.txt"
+                    (("target_link_libraries(.*)\\$\\{EXTRA_LIBS\\}" _ middle)
+                     (string-append "target_link_libraries" middle
+                                    " Qt5::Network ${EXTRA_LIBS}"))))))
+      (build-system cmake-build-system)
+      (arguments
+       '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
+      (native-inputs
+       `(("pkg-config" ,pkg-config)
+         ("valgrind" ,valgrind)))                 ;for tests
+      (inputs
+       `(("dashel" ,dashel)
+         ("enki" ,enki)
+         ("protobuf" ,protobuf)                   ;for logging
+         ("qtbase" ,qtbase)
+         ("qtsvg" ,qtsvg)
+         ("qttools" ,qttools)              ;for libQt5Help, needed by "studio"
+         ("qtwebkit" ,qtwebkit)
+         ("qtx11extras" ,qtx11extras)
+         ("eudev" ,eudev)
+         ("libxml2" ,libxml2)
+         ("sdl2" ,sdl2)
+         ("avahi" ,avahi)))            ;XXX: we need the libdnssd compat layer
+      (synopsis "Event-based robot programming tools")
+      (description
+       "Aseba means @dfn{actuator and sensor event-based architecture}.
+It is a set of tools which allow beginners to program robots easily and
+efficiently.  It includes robot simulators, a programming language, and a
+visual programming language (VPL) that is notably used together with the
+Thymio educational robot.")
+
+      ;; Source file headers say "version 3.0" without "or any later version".
+      (license license:lgpl3))))
-- 
2.15.1

Message #11 received at 30272 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: 30272 <at> debbugs.gnu.org
Cc: Ludovic Courtès <ludovic.courtes <at> inria.fr>
Subject: [PATCH 2/3] gnu: Add Enki.
Date: Sat, 27 Jan 2018 23:28:04 +0100

From: Ludovic Courtès <ludovic.courtes <at> inria.fr>

* gnu/packages/robotics.scm: New file.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
---
 gnu/local.mk              |  3 ++-
 gnu/packages/robotics.scm | 67 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 gnu/packages/robotics.scm

diff --git a/gnu/local.mk b/gnu/local.mk
index e96040a4e..2424b8e9f 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1,5 +1,5 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo <at> gnu.org>
+# Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo <at> gnu.org>
 # Copyright © 2013, 2014, 2015, 2016, 2017 Andreas Enge <andreas <at> enge.fr>
 # Copyright © 2016 Mathieu Lirzin <mthl <at> gnu.org>
 # Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Mark H Weaver <mhw <at> netris.org>
@@ -357,6 +357,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/re2c.scm				\
   %D%/packages/readline.scm			\
   %D%/packages/regex.scm				\
+  %D%/packages/robotics.scm			\
   %D%/packages/rrdtool.scm			\
   %D%/packages/rsync.scm			\
   %D%/packages/ruby.scm				\
diff --git a/gnu/packages/robotics.scm b/gnu/packages/robotics.scm
new file mode 100644
index 000000000..da6f8856b
--- /dev/null
+++ b/gnu/packages/robotics.scm
@@ -0,0 +1,67 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2018 Ludovic Courtès <ludo <at> gnu.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages robotics)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix build-system cmake)
+  #:use-module (gnu packages gl)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages qt)
+  #:use-module (gnu packages sdl))
+
+(define-public enki
+  ;; Previous versions use Qt4 and are unsuitable for Aseba.
+  (let ((commit "afd2d8e2f91c095f6745505ca1f32f31ea874200")
+        (revision "0"))
+    (package
+      (name "enki")
+      (version (git-version "2.0pre" revision commit))
+      (home-page "https://github.com/enki-community/enki/")
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference (url home-page) (commit commit)))
+                (sha256
+                 (base32
+                  "1d1901zzsfml97hb4mb3ah3ab1bk4kh7bn6m7xrj1rv0gk9wkhq7"))
+                (file-name (string-append name "-" version "-checkout"))))
+      (build-system cmake-build-system)
+      (arguments
+       '(#:configure-flags '("-DBUILD_SHARED_LIBS=ON")))
+      (native-inputs `(("pkg-config" ,pkg-config)))
+      (inputs
+       ;; Optionally, add Python + Boost for Python bindings.
+       `(("sdl2" ,sdl2)))
+      (propagated-inputs
+       ;; 'Viewer.h' includes 'QGLWidget'.
+       `(("qtbase" ,qtbase)                ;the viewer module needs Qt5 + MESA
+         ("mesa" ,mesa)))
+      (synopsis "Robot simulator")
+      (description
+       "Enki is a robot simulator written in C++.  It provides collision and
+limited physics support for robots evolving on a flat surface.  On a
+contemporary desktop computer, Enki is able to simulate groups of robots
+hundred times faster than real-time.")
+
+      ;; The 'LICENSE' file as well as source file headers says that
+      ;; researchers using the software are "asked" to cite using a given
+      ;; citation, but that sentence is written as not being part of the
+      ;; license (fortunately).
+      (license license:gpl2+))))
-- 
2.15.1

Message #16 received at 30272-done <at> debbugs.gnu.org (full text, mbox):

From: ludovic.courtes <at> inria.fr (Ludovic Courtès)
To: 30272-done <at> debbugs.gnu.org
Subject: Re: [bug#30272] [PATCH 3/3] gnu: Add Aseba.
Date: Tue, 30 Jan 2018 16:56:14 +0100

I went ahead and pushed this series.  Have fun with your Thymio.  :-)

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.