Package: guix-patches;
Reported by: Karl Hallsby <karl <at> hallsby.com>
Date: Wed, 2 Apr 2025 05:20:07 UTC
Severity: normal
Tags: patch
To reply to this bug, email your comments to 77448 AT debbugs.gnu.org.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#77448; Package guix-patches.
(Wed, 02 Apr 2025 05:20:07 GMT) Full text and rfc822 format available.Karl Hallsby <karl <at> hallsby.com>:guix-patches <at> gnu.org.
(Wed, 02 Apr 2025 05:20:08 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Karl Hallsby <karl <at> hallsby.com> To: guix-patches <at> gnu.org Cc: Raven Hallsby <karl <at> hallsby.com> Subject: [PATCH 0/2] gnu: Add Souffle. Date: Wed, 2 Apr 2025 00:18:25 -0500
From: Raven Hallsby <karl <at> hallsby.com> Souffle[1] is a Logic-based programming language based on Datalog. It is possible to both interpret and compile. Further, SOuffle can be used *natively* with C++ projects and offers Swig-generated FFI interfaces for Java and Python. I have tested this package by using the simple example steps at [2] and the more scalable features of using SQLite to store and represent facts about your logic's domain space[3]. In the future, I would like the test script I created to be merged into Guix so that a package's usage can be tested alongside its definition (after being built). Particularly because Souffle relies on a significant amount of wrapping and has an embedded JSON configuration file as a runner script for Souffle's compiler. I have brought this topic up on IRC in the past[4], and the community has thought about them before. This package is an example of one whose long-term maintenance in Guix would greatly benefit from this infrastructure. [1] https://souffle-lang.github.io/ [2] https://souffle-lang.github.io/simple [3] https://souffle-lang.github.io/tutorial#io-directives [4] https://logs.guix.gnu.org/guix/2025-03-19.log#175226 Raven Hallsby (2): licenses: Add UPL 1.0. gnu: Add souffle gnu/local.mk | 1 + gnu/packages/datalog.scm | 235 +++++++++++++++++++++++++++++++++++++++ guix/import/utils.scm | 1 + guix/licenses.scm | 6 + 4 files changed, 243 insertions(+) create mode 100644 gnu/packages/datalog.scm base-commit: 97523d50017f2cc5c190c9a2aa50f620b33b6318 -- 2.49.0
guix <at> cbaines.net, dev <at> jpoiret.xyz, ludo <at> gnu.org, othacehe <at> gnu.org, zimon.toutoune <at> gmail.com, me <at> tobias.gr, guix-patches <at> gnu.org:bug#77448; Package guix-patches.
(Wed, 02 Apr 2025 05:26:07 GMT) Full text and rfc822 format available.Message #8 received at 77448 <at> debbugs.gnu.org (full text, mbox):
From: Raven Hallsby <karl <at> hallsby.com> To: 77448 <at> debbugs.gnu.org Cc: Raven Hallsby <karl <at> hallsby.com> Subject: [PATCH 1/2] licenses: Add UPL 1.0. Date: Wed, 2 Apr 2025 00:25:14 -0500
From: Karl Hallsby <karl <at> hallsby.com>
* guix/licenses.scm (upl1.0): New variable.
* guix/import/utils.scm (%spdx-license-identifiers): Add license upl1.0.
Change-Id: I15c864755b4a5f7afffdcabd182f957faf7bbe43
---
guix/import/utils.scm | 1 +
guix/licenses.scm | 6 ++++++
2 files changed, 7 insertions(+)
diff --git a/guix/import/utils.scm b/guix/import/utils.scm
index 38c986b4d5a..d9b9b3275d5 100644
--- a/guix/import/utils.scm
+++ b/guix/import/utils.scm
@@ -284,6 +284,7 @@ (define %spdx-license-identifiers
("Sleepycat" . license:sleepycat)
("TCL" . license:tcl/tk)
("Unlicense" . license:unlicense)
+ ("UPL-1.0" . license:upl1.0)
("Vim" . license:vim)
("W3C" . license:w3c)
("WTFPL" . license:wtfpl2)
diff --git a/guix/licenses.scm b/guix/licenses.scm
index 8fd4f363929..c86c333bd9c 100644
--- a/guix/licenses.scm
+++ b/guix/licenses.scm
@@ -103,6 +103,7 @@ (define-module (guix licenses)
tcl/tk
unicode
unlicense
+ upl1.0
vim
w3c
x11 x11-style
@@ -731,6 +732,11 @@ (define unlicense
"https://unlicense.org/"
"https://www.gnu.org/licenses/license-list.html#Unlicense"))
+(define upl1.0
+ (license "UPL-1.0"
+ "https://directory.fsf.org/wiki/License:UPL-1.0"
+ "https://www.gnu.org/licenses/license-list#UPL"))
+
(define w3c
(license "W3C Software Notice and License"
"https://directory.fsf.org/wiki/License:W3C_31Dec2002"
--
2.49.0
guix-patches <at> gnu.org:bug#77448; Package guix-patches.
(Wed, 02 Apr 2025 05:27:05 GMT) Full text and rfc822 format available.Message #11 received at 77448 <at> debbugs.gnu.org (full text, mbox):
From: Raven Hallsby <karl <at> hallsby.com> To: 77448 <at> debbugs.gnu.org Cc: Raven Hallsby <karl <at> hallsby.com> Subject: [PATCH 2/2] gnu: Add souffle Date: Wed, 2 Apr 2025 00:25:15 -0500
From: Karl Hallsby <karl <at> hallsby.com>
* gnu/packages/datalog.scm: New file.
* gnu/local.mk: Register it.
* gnu/packages/datalog.scm (souffle): New variable.
Change-Id: I5ac1a2ed943a79f50a85794585804522fddf0bdc
---
gnu/local.mk | 1 +
gnu/packages/datalog.scm | 235 +++++++++++++++++++++++++++++++++++++++
2 files changed, 236 insertions(+)
create mode 100644 gnu/packages/datalog.scm
diff --git a/gnu/local.mk b/gnu/local.mk
index a96ca42532d..b6791eb0c26 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -240,6 +240,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/data-language.scm \
%D%/packages/databases.scm \
%D%/packages/datamash.scm \
+ %D%/packages/datalog.scm \
%D%/packages/datastructures.scm \
%D%/packages/dav.scm \
%D%/packages/dbm.scm \
diff --git a/gnu/packages/datalog.scm b/gnu/packages/datalog.scm
new file mode 100644
index 00000000000..89fd6583acb
--- /dev/null
+++ b/gnu/packages/datalog.scm
@@ -0,0 +1,235 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2025 Raven Hallsby <karl <at> hallsby.com>
+;;;
+;;; 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 datalog)
+ #:use-module (guix download)
+ #:use-module (guix gexp)
+ #:use-module (guix git-download)
+ #:use-module ((guix licenses) #:prefix license:)
+ #:use-module (guix packages)
+ #:use-module (guix build-system cmake)
+ #:use-module (guix utils)
+ #:use-module (gnu packages bash)
+ #:use-module (gnu packages bison)
+ #:use-module (gnu packages commencement)
+ #:use-module (gnu packages compression)
+ #:use-module (gnu packages cpp)
+ #:use-module (gnu packages documentation)
+ #:use-module (gnu packages flex)
+ #:use-module (gnu packages fontutils)
+ #:use-module (gnu packages ghostscript)
+ #:use-module (gnu packages graphviz)
+ #:use-module (gnu packages java)
+ #:use-module (gnu packages libffi)
+ #:use-module (gnu packages ncurses)
+ #:use-module (gnu packages pkg-config)
+ #:use-module (gnu packages python)
+ #:use-module (gnu packages sqlite)
+ #:use-module (gnu packages swig)
+ #:use-module (gnu packages version-control))
+
+(define-public souffle
+ ;; 2.4.1 is the most recent tagged commit, but is from 2023. A commit from
+ ;; 2024 (040a962f) fixes the last 2 unit test failures that 2.4.1 experienced.
+ ;; So we use a more recent commit hash instead.
+ (let ((commit "94ccab0127d78a2c295730e8c8f560aabc82ea0f")
+ (revision "0"))
+ (package
+ (name "souffle")
+ (version (string-append "2.4.1-" revision "."
+ (string-take commit 7)))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/souffle-lang/souffle")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0k27cf1h6bl6rwkk4zkwpsfk2n4814fda2v7mcin0r9wkx1pdrxi"))))
+ (native-inputs
+ (list bison flex
+ ;; Only needed for building documentation
+ doxygen fontconfig font-ghostscript graphviz-minimal))
+ (inputs
+ (list gcc-toolchain
+ mcpp
+ python-minimal
+ bash-minimal
+ libffi
+ ncurses
+ sqlite
+ swig
+ `(,openjdk "jdk")
+ zlib))
+ (build-system cmake-build-system)
+ (arguments
+ (list
+ #:configure-flags
+ #~(list
+ ;; Prevent souffle from calling out to git for a version number
+ "-DSOUFFLE_GIT=OFF"
+ ;; Use larger representation values.
+ "-DSOUFFLE_DOMAIN_64BIT=ON"
+ ;; Allow Java/Python/others to use libffi to interop with souffle.
+ "-DSOUFFLE_SWIG=ON"
+ ;; By default Souffle only runs tests on evaluation examples. We
+ ;; force it to also test its code examples.
+ "-DSOUFFLE_ENABLE_TESTING=ON"
+ "-DSOUFFLE_TEST_EXAMPLES=ON"
+ "-DSOUFFLE_TEST_EVALUATION=ON"
+ ;; Enable documentation target
+ "-DSOUFFLE_GENERATE_DOXYGEN=man"
+ ;; Generate Bash completions
+ "-DSOUFFLE_BASH_COMPLETION=on"
+ (string-append "-DBASH_COMPLETION_COMPLETIONSDIR="
+ #$output "/etc/bash_completion.d"))
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Allow for parallel testing. The -j in the "make check" command does
+ ;; not propagate to ctest. With 4500+ tests, and some taking multiple
+ ;; minutes to finish, parallelism really helps.
+ (replace 'check
+ (lambda* (#:key tests? parallel-tests? #:allow-other-keys)
+ (setenv "CTEST_OUTPUT_ON_FAILURE" "1")
+ (when tests? (invoke "ctest" "--output-on-failure" "-j"
+ (if parallel-tests?
+ (number->string (parallel-job-count))
+ "1")))))
+ (add-after 'check 'build-docs
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Already in build/ directory
+ ;; Set a cache directory for fontconfig
+ (setenv "XDG_CACHE_HOME" (mkdtemp "/tmp/cache-XXXXXX"))
+ (invoke "make" "doxygen")))
+ (add-after 'install 'install-docs
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ ;; Still currently in build/
+ (format #t "~a~%" (getcwd))
+ (with-directory-excursion "../source"
+ (format #t "excursion: ~a~%" (getcwd))
+ (mkdir-p (string-append out "/share/man/man1/"))
+ (copy-recursively "man/"
+ (string-append out "/share/man/man1/"))
+ (mkdir-p (string-append out "/share/man/man3/"))
+ (install-file "doc/man/man3/souffle.3"
+ (string-append out "/share/man/man3/"))))))
+ ;; Clean up various files and wrap binaries.
+ ;; The compiler wrapper script takes many of its values from an
+ ;; embedded JSON string rather than environment variables, which
+ ;; makes some of our wrapping ineffective.
+ (add-after 'install 'wrap-programs
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Wrap the compiled binaries that point to the libraries
+ ;; souffle needs at runtime.
+ (wrap-program (string-append #$output "/bin/souffle")
+ `("PATH" ":" prefix
+ ;; Souffle has a "build system" that will run the souffle
+ ;; compiler to produce a C++ program and then run g++ to
+ ;; build the final binary.
+ ,(list (string-append (assoc-ref inputs "swig") "/bin")
+ (string-append (assoc-ref inputs "python-minimal")
+ "/bin")
+ (string-append (assoc-ref inputs "mcpp") "/bin")
+ (string-append (assoc-ref inputs "gcc-toolchain")
+ "/bin")))
+ `("C_INCLUDE_PATH" ":" prefix
+ ,(list (string-append #$output "/include")
+ (string-append (assoc-ref inputs "gcc-toolchain")
+ "/include")
+ (string-append (assoc-ref inputs "zlib") "/include")
+ (string-append (assoc-ref inputs "ncurses") "/include")
+ (string-append (assoc-ref inputs "sqlite") "/include")
+ (string-append (assoc-ref inputs "libffi") "/include")))
+ `("CPLUS_INCLUDE_PATH" ":" prefix
+ ;; Souffle needs to know where its own headers are.
+ ,(list (string-append #$output "/include")
+ (string-append (assoc-ref inputs "gcc-toolchain") "/include/c++")
+ (string-append (assoc-ref inputs "gcc-toolchain") "/include")
+ (string-append (assoc-ref inputs "zlib") "/include")
+ (string-append (assoc-ref inputs "ncurses") "/include")
+ (string-append (assoc-ref inputs "sqlite") "/include")
+ (string-append (assoc-ref inputs "libffi") "/include")))
+ ;; Make sure g++ and co. can find necessary files when
+ ;; compiling the souffle-generated C++ program. In particular,
+ ;; crt1.o and crti.o need to be found.
+ ;; The final compiled program has rpaths set to libraries by
+ ;; the compiler script. So no LD_LIBRARY_PATH changes are
+ ;; needed.
+ `("LIBRARY_PATH" ":" prefix
+ ,(list (string-append #$output "/lib") ; Technically Souffle has no /lib
+ (string-append (assoc-ref inputs "gcc-toolchain") "/lib")
+ (string-append (assoc-ref inputs "zlib") "/lib")
+ (string-append (assoc-ref inputs "ncurses") "/lib")
+ (string-append (assoc-ref inputs "sqlite") "/lib")
+ (string-append (assoc-ref inputs "libffi") "/lib"))))
+ ;; And now we must "wrap" souffle's compiler wrapper script's
+ ;; internal JSON config file, so the invoked g++ can find
+ ;; everything it needs.
+ (with-directory-excursion #$output
+ (let ((includes (list (string-append #$output "/include")
+ (string-append (assoc-ref inputs "gcc-toolchain") "/include/c++")
+ (string-append (assoc-ref inputs "gcc-toolchain") "/include")
+ (string-append (assoc-ref inputs "zlib") "/include")
+ (string-append (assoc-ref inputs "ncurses") "/include")
+ (string-append (assoc-ref inputs "sqlite") "/include")
+ (string-append (assoc-ref inputs "libffi") "/include")
+ (string-append (assoc-ref inputs "libc") "/lib")
+ ;; Need an explicit path to <linux/errno.h>?
+ (string-append (assoc-ref inputs "kernel-headers") "/include")))
+ (libs (list (string-append (assoc-ref inputs "gcc-toolchain") "/lib")
+ (string-append (assoc-ref inputs "zlib") "/lib")
+ (string-append (assoc-ref inputs "ncurses") "/lib")
+ (string-append (assoc-ref inputs "sqlite") "/lib")
+ (string-append (assoc-ref inputs "libffi") "/lib")
+ (string-append (assoc-ref inputs "libc") "/lib"))))
+ (substitute* "bin/souffle-compile.py"
+ ;; Make C++ includes & linking work and remove embedded build path
+ (("(\"includes\"): \"([[[[:alnum:] -_.]+)\"," all option prev-vals)
+ (string-append option ": \""
+ (string-join includes " -I" 'prefix) " "
+ "\","))
+ (("(\"link_options\"): \"([[:alnum:] -_.]+)\"," all option prev-options)
+ (string-append option ": \""
+ (string-join libs " -L" 'prefix) " "
+ prev-options
+ "\","))
+ ;; Remove embedded build path
+ (("(\"source_include_dir\"): \".*\"," all option)
+ (string-append option ": \"\","))))))))))
+ ;; (native-search-paths
+ ;; (list (search-path-specification
+ ;; (variable "C_INCLUDE_PATH")
+ ;; (files '("include")))
+ ;; (search-path-specification
+ ;; (variable "CPLUS_INCLUDE_PATH")
+ ;; (files '("include")))
+ ;; (search-path-specification
+ ;; (variable "LIBRARY_PATH")
+ ;; (files '("lib")))))
+ (home-page "https://souffle-lang.github.io")
+ (synopsis "Compiler for a variant of Datalog using Horn clauses")
+ (description
+ "Souffle is a logic programming language inspired by Datalog by
+crafting analyses in Horn clauses. It overcomes some of the limitations in
+classical Datalog. For example, programmers are not restricted to finite
+domains, and the usage of functors (intrinsic, user-defined,
+records/constructors, etc.) is permitted. Souffle has a component model so
+that large logic projects can be expressed.")
+ (license license:upl1.0))))
--
2.49.0
guix-patches <at> gnu.org:bug#77448; Package guix-patches.
(Wed, 02 Apr 2025 05:27:06 GMT) Full text and rfc822 format available.Message #14 received at 77448 <at> debbugs.gnu.org (full text, mbox):
From: Raven Hallsby <karl <at> hallsby.com> To: 77448 <at> debbugs.gnu.org Cc: Raven Hallsby <karl <at> hallsby.com> Subject: [PATCH 0/2] gnu: Add Souffle. Date: Wed, 2 Apr 2025 00:25:16 -0500
Souffle[1] is a Logic-based programming language based on Datalog. It is possible to both interpret and compile. Further, SOuffle can be used *natively* with C++ projects and offers Swig-generated FFI interfaces for Java and Python. I have tested this package by using the simple example steps at [2] and the more scalable features of using SQLite to store and represent facts about your logic's domain space[3]. In the future, I would like the test script I created to be merged into Guix so that a package's usage can be tested alongside its definition (after being built). Particularly because Souffle relies on a significant amount of wrapping and has an embedded JSON configuration file as a runner script for Souffle's compiler. I have brought this topic up on IRC in the past[4], and the community has thought about them before. This package is an example of one whose long-term maintenance in Guix would greatly benefit from this infrastructure. [1] https://souffle-lang.github.io/ [2] https://souffle-lang.github.io/simple [3] https://souffle-lang.github.io/tutorial#io-directives [4] https://logs.guix.gnu.org/guix/2025-03-19.log#175226 Karl Hallsby (2): licenses: Add UPL 1.0. gnu: Add souffle gnu/local.mk | 1 + gnu/packages/datalog.scm | 220 +++++++++++++++++++++++++++++++++++++++ guix/import/utils.scm | 1 + guix/licenses.scm | 6 ++ 4 files changed, 228 insertions(+) create mode 100644 gnu/packages/datalog.scm base-commit: 97523d50017f2cc5c190c9a2aa50f620b33b6318 -- 2.49.0
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.