unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#59799] [PATCH 1/2] gnu: swi-prolog: Update to 9.1.0.
  2022-12-03  9:23 [bug#59799] [PATCH 0/2] Add scasp Liliana Marie Prikler
@ 2022-12-03  9:15 ` Liliana Marie Prikler
  2022-12-03  9:18 ` [bug#59799] [PATCH v2 2/2] gnu: Add scasp Liliana Marie Prikler
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 7+ messages in thread
From: Liliana Marie Prikler @ 2022-12-03  9:15 UTC (permalink / raw)
  To: 59799

* gnu/packages/prolog.scm (swi-prolog): Update to 9.1.0.
---
 gnu/packages/prolog.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm
index 6aa01ce871..9291da617d 100644
--- a/gnu/packages/prolog.scm
+++ b/gnu/packages/prolog.scm
@@ -87,7 +87,7 @@ (define-public gprolog
 (define-public swi-prolog
   (package
     (name "swi-prolog")
-    (version "8.3.20")
+    (version "9.1.0")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -97,7 +97,7 @@ (define-public swi-prolog
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1g0v9cmz8zvzc1n0si7sn6522xwzbhj2b8967ibs6prinrpjc8d6"))))
+                "0an3wgiapr1h2ifjpm59snqx1vd2m9hnn9hawl3xdc2ch4lml2i0"))))
     (build-system cmake-build-system)
     (arguments
      `(#:parallel-build? #t
-- 
2.38.1





^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [bug#59799] [PATCH 2/2] gnu: Add scasp.
  2022-12-03  9:23 [bug#59799] [PATCH 0/2] Add scasp Liliana Marie Prikler
  2022-12-03  9:15 ` [bug#59799] [PATCH 1/2] gnu: swi-prolog: Update to 9.1.0 Liliana Marie Prikler
  2022-12-03  9:18 ` [bug#59799] [PATCH v2 2/2] gnu: Add scasp Liliana Marie Prikler
@ 2022-12-03  9:18 ` Liliana Marie Prikler
  2023-02-27 20:13 ` [bug#59799] [PATCH v2 1/2] gnu: swi-prolog: Update to 8.5.20 Liliana Marie Prikler
  3 siblings, 0 replies; 7+ messages in thread
From: Liliana Marie Prikler @ 2022-12-03  9:18 UTC (permalink / raw)
  To: 59799

* gnu/packages/maths.scm (scasp): New variable.
---
 gnu/packages/maths.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index c0bc07977b..dd41072b5d 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -86,6 +86,7 @@ (define-module (gnu packages maths)
   #:use-module (guix utils)
   #:use-module ((guix build utils) #:select (alist-replace))
   #:use-module (guix build-system cmake)
+  #:use-module (guix build-system copy)
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system meson)
@@ -147,6 +148,7 @@ (define-module (gnu packages maths)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages popt)
   #:use-module (gnu packages perl)
+  #:use-module (gnu packages prolog)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
@@ -2686,6 +2688,41 @@ (define-public clingo
     (description "Clingo computes answer sets for a given logic program.")
     (license license:expat)))
 
+(define-public scasp
+  (let ((commit "89a427aa04ec6346425a40111c99b310901ffe51")
+        (revision "1"))
+    (package
+      (name "scasp")
+      (version (git-version "0.21.11.26" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/SWI-Prolog/sCASP")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "1ijqv9xr3imrdmz6nq7zqwsmmaxn638icig19m8900m7mjfpizs4"))))
+      (build-system copy-build-system)
+      (arguments
+       (list
+        #:install-plan #~`(("scasp" "bin/")
+                           ("prolog" "lib/swipl/library"))
+        #:modules `((guix build copy-build-system)
+                    ((guix build gnu-build-system) #:prefix gnu:)
+                    (guix build utils)
+                    (ice-9 regex))
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-before 'install 'build (assoc-ref gnu:%standard-phases 'build))
+            (add-after 'build 'check (assoc-ref gnu:%standard-phases 'check)))))
+      (native-inputs (list swi-prolog))
+      (home-page "https://github.com/SWI-Prolog/sCASP")
+      (synopsis "Interpreter for ASP programs with constraints")
+      (description "@code{s(CASP)} is a top-down interpreter for ASP programs
+with constraints.")
+      (license license:asl2.0))))
+
 (define-public ceres
   (package
     (name "ceres-solver")
-- 
2.38.1





^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [bug#59799] [PATCH v2 2/2] gnu: Add scasp.
  2022-12-03  9:23 [bug#59799] [PATCH 0/2] Add scasp Liliana Marie Prikler
  2022-12-03  9:15 ` [bug#59799] [PATCH 1/2] gnu: swi-prolog: Update to 9.1.0 Liliana Marie Prikler
@ 2022-12-03  9:18 ` Liliana Marie Prikler
  2023-03-12  8:15   ` Liliana Marie Prikler
  2022-12-03  9:18 ` [bug#59799] [PATCH " Liliana Marie Prikler
  2023-02-27 20:13 ` [bug#59799] [PATCH v2 1/2] gnu: swi-prolog: Update to 8.5.20 Liliana Marie Prikler
  3 siblings, 1 reply; 7+ messages in thread
From: Liliana Marie Prikler @ 2022-12-03  9:18 UTC (permalink / raw)
  To: 59799

* gnu/packages/maths.scm (scasp): New variable.
---
 gnu/packages/maths.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index a7497f1d2f..238352f278 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -89,6 +89,7 @@ (define-module (gnu packages maths)
   #:use-module ((guix build utils) #:select (alist-replace))
   #:use-module (guix build-system ant)
   #:use-module (guix build-system cmake)
+  #:use-module (guix build-system copy)
   #:use-module (guix build-system glib-or-gtk)
   #:use-module (guix build-system gnu)
   #:use-module (guix build-system meson)
@@ -153,6 +154,7 @@ (define-module (gnu packages maths)
   #:use-module (gnu packages pcre)
   #:use-module (gnu packages popt)
   #:use-module (gnu packages perl)
+  #:use-module (gnu packages prolog)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pulseaudio)
   #:use-module (gnu packages python)
@@ -2804,6 +2806,41 @@ (define-public python-telingo
 logic programs based on clingo.")
     (license license:expat)))
 
+(define-public scasp
+  (let ((commit "89a427aa04ec6346425a40111c99b310901ffe51")
+        (revision "1"))
+    (package
+      (name "scasp")
+      (version (git-version "0.21.11.26" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/SWI-Prolog/sCASP")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "1ijqv9xr3imrdmz6nq7zqwsmmaxn638icig19m8900m7mjfpizs4"))))
+      (build-system copy-build-system)
+      (arguments
+       (list
+        #:install-plan #~`(("scasp" "bin/")
+                           ("prolog" "lib/swipl/library"))
+        #:modules `((guix build copy-build-system)
+                    ((guix build gnu-build-system) #:prefix gnu:)
+                    (guix build utils)
+                    (ice-9 regex))
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-before 'install 'build (assoc-ref gnu:%standard-phases 'build))
+            (add-after 'build 'check (assoc-ref gnu:%standard-phases 'check)))))
+      (native-inputs (list swi-prolog))
+      (home-page "https://github.com/SWI-Prolog/sCASP")
+      (synopsis "Interpreter for ASP programs with constraints")
+      (description "@code{s(CASP)} is a top-down interpreter for ASP programs
+with constraints.")
+      (license license:asl2.0))))
+
 (define-public ceres
   (package
     (name "ceres-solver")
-- 
2.39.1





^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [bug#59799] [PATCH 0/2] Add scasp
@ 2022-12-03  9:23 Liliana Marie Prikler
  2022-12-03  9:15 ` [bug#59799] [PATCH 1/2] gnu: swi-prolog: Update to 9.1.0 Liliana Marie Prikler
                   ` (3 more replies)
  0 siblings, 4 replies; 7+ messages in thread
From: Liliana Marie Prikler @ 2022-12-03  9:23 UTC (permalink / raw)
  To: 59799

Hi Guix,

this series adds scasp (the SWI Prolog implementation anyway), a
prolog-based ASP interpreter/solver.

Cheers

Liliana Marie Prikler (2):
  gnu: swi-prolog: Update to 9.1.0.
  gnu: Add scasp.

 gnu/packages/maths.scm  | 37 +++++++++++++++++++++++++++++++++++++
 gnu/packages/prolog.scm |  4 ++--
 2 files changed, 39 insertions(+), 2 deletions(-)


base-commit: 9e9204958d3e0ecfe8fd024d8f06068b84f52ba1
-- 
2.38.1





^ permalink raw reply	[flat|nested] 7+ messages in thread

* [bug#59799] [PATCH v2 1/2] gnu: swi-prolog: Update to 8.5.20.
  2022-12-03  9:23 [bug#59799] [PATCH 0/2] Add scasp Liliana Marie Prikler
                   ` (2 preceding siblings ...)
  2022-12-03  9:18 ` [bug#59799] [PATCH " Liliana Marie Prikler
@ 2023-02-27 20:13 ` Liliana Marie Prikler
  3 siblings, 0 replies; 7+ messages in thread
From: Liliana Marie Prikler @ 2023-02-27 20:13 UTC (permalink / raw)
  To: 59799

* gnu/packages/prolog.scm (swi-prolog): Update to 8.5.20.
---
Since Prolog 9 failed on CI way back when, let's try an earlier version.

 gnu/packages/prolog.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/prolog.scm b/gnu/packages/prolog.scm
index 6aa01ce871..0f2ad25a49 100644
--- a/gnu/packages/prolog.scm
+++ b/gnu/packages/prolog.scm
@@ -87,7 +87,7 @@ (define-public gprolog
 (define-public swi-prolog
   (package
     (name "swi-prolog")
-    (version "8.3.20")
+    (version "8.5.20")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -97,7 +97,7 @@ (define-public swi-prolog
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1g0v9cmz8zvzc1n0si7sn6522xwzbhj2b8967ibs6prinrpjc8d6"))))
+                "0vwxk5fy2mxj6538knkqvqhwy1674xh2zkdqdmbzkxf6mj969d7m"))))
     (build-system cmake-build-system)
     (arguments
      `(#:parallel-build? #t
-- 
2.39.1





^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [bug#59799] [PATCH v2 2/2] gnu: Add scasp.
  2022-12-03  9:18 ` [bug#59799] [PATCH v2 2/2] gnu: Add scasp Liliana Marie Prikler
@ 2023-03-12  8:15   ` Liliana Marie Prikler
  2023-03-12 13:09     ` bug#59799: " Liliana Marie Prikler
  0 siblings, 1 reply; 7+ messages in thread
From: Liliana Marie Prikler @ 2023-03-12  8:15 UTC (permalink / raw)
  To: 59799

Am Samstag, dem 03.12.2022 um 10:18 +0100 schrieb Liliana Marie
Prikler:
> * gnu/packages/maths.scm (scasp): New variable.
> ---
Pushed, but I'm leaving this open to get CI gears turning and actually
report errors.




^ permalink raw reply	[flat|nested] 7+ messages in thread

* bug#59799: [PATCH v2 2/2] gnu: Add scasp.
  2023-03-12  8:15   ` Liliana Marie Prikler
@ 2023-03-12 13:09     ` Liliana Marie Prikler
  0 siblings, 0 replies; 7+ messages in thread
From: Liliana Marie Prikler @ 2023-03-12 13:09 UTC (permalink / raw)
  To: 59799-done

Am Sonntag, dem 12.03.2023 um 09:15 +0100 schrieb Liliana Marie
Prikler:
> Am Samstag, dem 03.12.2022 um 10:18 +0100 schrieb Liliana Marie
> Prikler:
> > * gnu/packages/maths.scm (scasp): New variable.
> > ---
> Pushed, but I'm leaving this open to get CI gears turning and
> actually report errors.
CI hath spoken: swi-prolog fails for i686, but so it does on staging
where it's still on an older version.  The other builds seem to
succeed.

Cheers




^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2023-03-12 13:10 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-12-03  9:23 [bug#59799] [PATCH 0/2] Add scasp Liliana Marie Prikler
2022-12-03  9:15 ` [bug#59799] [PATCH 1/2] gnu: swi-prolog: Update to 9.1.0 Liliana Marie Prikler
2022-12-03  9:18 ` [bug#59799] [PATCH v2 2/2] gnu: Add scasp Liliana Marie Prikler
2023-03-12  8:15   ` Liliana Marie Prikler
2023-03-12 13:09     ` bug#59799: " Liliana Marie Prikler
2022-12-03  9:18 ` [bug#59799] [PATCH " Liliana Marie Prikler
2023-02-27 20:13 ` [bug#59799] [PATCH v2 1/2] gnu: swi-prolog: Update to 8.5.20 Liliana Marie Prikler

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).