From patchwork Thu Dec 8 08:31:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 45117 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A5C1A27BBEB; Thu, 8 Dec 2022 10:14:17 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id E75F227BBE9 for ; Thu, 8 Dec 2022 10:14:13 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p3Duo-0004wO-6j; Thu, 08 Dec 2022 05:14:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p3Dul-0004vS-Ub for guix-patches@gnu.org; Thu, 08 Dec 2022 05:14:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p3Dul-0000o6-Ax for guix-patches@gnu.org; Thu, 08 Dec 2022 05:14:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p3Dul-0008FY-6E for guix-patches@gnu.org; Thu, 08 Dec 2022 05:14:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59896] [PATCH 1/5] gnu: Add catch2-3.1. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Dec 2022 10:14:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59896 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59896@debbugs.gnu.org Received: via spool by 59896-submit@debbugs.gnu.org id=B59896.167049442231668 (code B ref 59896); Thu, 08 Dec 2022 10:14:03 +0000 Received: (at 59896) by debbugs.gnu.org; 8 Dec 2022 10:13:42 +0000 Received: from localhost ([127.0.0.1]:55803 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3DuP-0008Ec-So for submit@debbugs.gnu.org; Thu, 08 Dec 2022 05:13:42 -0500 Received: from mail-ej1-f67.google.com ([209.85.218.67]:41857) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3DuK-0008Dw-KU for 59896@debbugs.gnu.org; Thu, 08 Dec 2022 05:13:39 -0500 Received: by mail-ej1-f67.google.com with SMTP id vp12so2694497ejc.8 for <59896@debbugs.gnu.org>; Thu, 08 Dec 2022 02:13:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:from:to:cc:subject:date:message-id:reply-to; bh=PTcaoQhcqWKEfr4d34Wo/Mb3WFy3jjUnSdKvmFlD6Xo=; b=oWB3LiYu1nqD1Euw8CHUOFqicJ2m72l/sN6dbFTxm8XK/EDFXQA4U9xjOKwzcl8W9+ jj7CNhcqkQZys0uxMDo+E2683ELHKW6KHYb69swi3ODI9Q9qNeu1FWc0dFIXWMCcHo23 tHdxIHfSNirINHppbirp2kMtkXWnzUww9dVs46lr8Q/WzNo6fgq4I0qN/rIqHeV4WTaL BqTSIgdQlFdDZtzhwfARBp9PZX00F+UByJ4NqvSYmsKilIy5e4ikFix22w4881pJic9E xRMuargYIIlx6fvHE+TBiCGZq6BT1ELpTfg3mljc+cJITfZ8TN5c+CQO+5r69huPeILy sXzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=PTcaoQhcqWKEfr4d34Wo/Mb3WFy3jjUnSdKvmFlD6Xo=; b=Fm0JQzhQRD4uyfzGU70wTHUDbmIlQW8HGVb7XCOiU9//NvsxYgUJXm/SXDRbub8qZi 0+DnB9lxFoyc2x/O1j58Qc5LYfrVz11/yyr2ejuXcdIGR35i0ACRhOlyRX517argSYJr KzBuRHQ2S3go/aZXbBIosRzSvY6c6m8kt40djuF7IAGfzG+YoCppA7TkqshMKqp7B0TD 28B6Cc2sNcICmZiq/Poy6QsyvnKa4q+vhLwwrtffrBeoubV0BnUEz66LhEH7TBvqc+Tr W0YiUPCT6ewpUHfGSHY5cO/WJ3YwepUQusYj/+a9h0zsR1tShlU8iq7Ng3mYX5HXgVag 2pFg== X-Gm-Message-State: ANoB5pn+a2wHdmdpAYzPbMIHAmFABaEctg0gGTk+WnnX9xTrjeAWj5fj 0LFAFPupcqP6sffW7AhalhKDNoBE9qM= X-Google-Smtp-Source: AA0mqf4bVjogDWxyJk9lnTDKsOQVeMtjgk5d5mSOJn7fKWoWaMOPWpNC9cqTUf/BPYf+hQHQzqeU6g== X-Received: by 2002:a17:906:d963:b0:7c1:98f:be57 with SMTP id rp3-20020a170906d96300b007c1098fbe57mr8557176ejb.97.1670494410708; Thu, 08 Dec 2022 02:13:30 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id q3-20020aa7da83000000b0046c91fa5a4asm3207309eds.70.2022.12.08.02.13.29 for <59896@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Dec 2022 02:13:30 -0800 (PST) From: Liliana Marie Prikler Date: Thu, 8 Dec 2022 09:31:42 +0100 Message-ID: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/check.scm (catch2-3.1): New variable. --- gnu/packages/check.scm | 79 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm index c900a055d5..af48ae91be 100644 --- a/gnu/packages/check.scm +++ b/gnu/packages/check.scm @@ -580,6 +580,85 @@ (define-public cbehave pattern.") (license license:apsl2)))) +(define-public catch2-3.1 + (package + (name "catch2") + (version "3.1.1") + (home-page "https://github.com/catchorg/Catch2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/catchorg/Catch2") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1qnr5b3zq8brh43f924rgnw5gmmjf9ax7kbq2crz1mlwgmdymxlp")))) + (outputs (list "out" "static")) + (build-system meson-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-meson + (lambda _ + (substitute* "src/catch2/meson.build" + (("static_library") "both_libraries")))) + (add-after 'install 'install-cmake-config + (lambda* (#:key outputs #:allow-other-keys) + (define prefix (string-append (assoc-ref outputs "out") + "/lib/cmake/Catch2/")) + (mkdir-p prefix) + (call-with-output-file (string-append + prefix + "catch2-config-version.cmake") + (lambda (port) + (format + port + "set(PACKAGE_VERSION ~s)~@ + if(PACKAGE_FIND_VERSION STREQUAL PACKAGE_VERSION)~@ + set(PACKAGE_VERSION_EXACT TRUE)~@ + set(PACKAGE_VERSION_COMPATIBLE TRUE)~@ + elseif(PACKAGE_FIND_VERSION VERSION_LESS_EQUAL ~ + PACKAGE_VERSION)~@ + set(PACKAGE_VERSION_COMPATIBLE TRUE)~@ + else()~@ + set(PACKAGE_VERSION_COMPATIBLE FALSE)~@ + endif()" + #$version))) + (call-with-output-file (string-append prefix + "catch2-config.cmake") + (lambda (port) + (format + port + "include(FindPkgConfig)~@ + pkg_check_modules(CATCH2 IMPORTED_TARGET GLOBAL catch2)~@ + pkg_check_modules(CATCH2MAIN ~ + IMPORTED_TARGET GLOBAL ~ + catch2 catch2-with-main)~@ + if(CATCH2_FOUND)~@ + add_library(Catch2::Catch2 ALIAS PkgConfig::CATCH2)~@ + endif()~@ + if(CATCH2MAIN_FOUND)~@ + add_library(Catch2::Catch2WithMain ~ + ALIAS PkgConfig::CATCH2MAIN)~@ + endif()"))))) + (add-after 'install 'move-static-libraries + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (static (assoc-ref outputs "static"))) + (for-each + (lambda (file) + (install-file file (string-append static "/lib")) + (delete-file file)) + (find-files (string-append out "/lib") + "\\.a$")))))))) + (inputs (list python-wrapper)) + (synopsis "Automated test framework for C++ and Objective-C") + (description "Catch2 stands for C++ Automated Test Cases in Headers and is +a multi-paradigm automated test framework for C++ and Objective-C.") + (license license:boost1.0))) + (define-public cmdtest (package (name "cmdtest") From patchwork Thu Dec 8 08:33:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 45121 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id AC52027BBEE; Thu, 8 Dec 2022 10:15:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DB4F627BBE9 for ; Thu, 8 Dec 2022 10:15:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p3Dup-0004wp-4U; Thu, 08 Dec 2022 05:14:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p3Dul-0004vQ-Tu for guix-patches@gnu.org; Thu, 08 Dec 2022 05:14:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p3Duk-0000o2-CL for guix-patches@gnu.org; Thu, 08 Dec 2022 05:14:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p3Duk-0008FK-7Q for guix-patches@gnu.org; Thu, 08 Dec 2022 05:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59896] [PATCH 2/5] gnu: clingo: Update to 5.6.2. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Dec 2022 10:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59896 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59896@debbugs.gnu.org Received: via spool by 59896-submit@debbugs.gnu.org id=B59896.167049441931643 (code B ref 59896); Thu, 08 Dec 2022 10:14:02 +0000 Received: (at 59896) by debbugs.gnu.org; 8 Dec 2022 10:13:39 +0000 Received: from localhost ([127.0.0.1]:55798 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3DuN-0008EE-0P for submit@debbugs.gnu.org; Thu, 08 Dec 2022 05:13:39 -0500 Received: from mail-ed1-f67.google.com ([209.85.208.67]:37783) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3DuL-0008Dx-3t for 59896@debbugs.gnu.org; Thu, 08 Dec 2022 05:13:38 -0500 Received: by mail-ed1-f67.google.com with SMTP id l11so1432194edb.4 for <59896@debbugs.gnu.org>; Thu, 08 Dec 2022 02:13:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:content-transfer-encoding:to:mime-version:subject:date :from:from:to:cc:subject:date:message-id:reply-to; bh=Hx9S5E254BrOWZHQArgzdEXzZq/8Dufi/ZNrg6Hhxwo=; b=dag0wmRFj+bQatxTMfvK0So1FJQnF9mb7GBlobzFA8y/ZZMI99w1s7Npoa76kkoilw 2/cJcO6gMsLiv8UpxrWNZPzpbp90TKkKqLcwm1yO1VSEbX5w8eUeptFOL5gv+q6sya9e GxssUvVcIwRHDd92pHiScxH4z16eRVNdSDwwX4UMAgbr+BQeeP5WR0n9K0Oe9ITUs6o1 f0VViNF9mOF+Y/2GsLm90adR4+uXEojWkqcoB3W+ZHdmI2UP2kv09C9K/hGceSy8ghNH whRPoG64OlUU8ZTKfmN1CyTv0CKj5H+Q69rLp4TFhvP7MQY1VQ78OhWFjXvNw/xN+fOR 6AGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=message-id:content-transfer-encoding:to:mime-version:subject:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Hx9S5E254BrOWZHQArgzdEXzZq/8Dufi/ZNrg6Hhxwo=; b=qhspDpKeVhGVO5waJjppJIo5Xrh7ZZjqsCI7NnaWggq1X5Y8bHlail16lv8UOeWBD8 sNo0vXQFSAPoNeGJ1u2TzyiF1YmczoLQCkYBLxFgpE/c+3dQCd3Xb8bOZLLWfYqTLCHI mat3Nk1P+vv2yCPJ0bRWqSv8OnVu8Nt1OmyiXiizOTSpBOCta8N5yEMQsEQog1Yg6xd4 mUMkfQw/on3cJaMjuMNdmB/fNEZ8lR5cFWZtCjwOP8cmgTKWZtJn9+W/Q8hWcyjSTZuD 482Q/kDSU5Ewz3whakTpzlt0JMDVfUSJI67TSViGFF0Pthmxtl3Hv4juDMl9KCkb0xjG HltA== X-Gm-Message-State: ANoB5plj8YUZjd+PoFkHTCmxrwHjDaf12mercUEqncVLM9MmWIphFN9Y 8GfoWnqS8W3ZNPUn3DQJ53i/Ba5AkJQ= X-Google-Smtp-Source: AA0mqf7A8UiLaUzQiDTYonPTBTGuPoFBwjaoxcZ9L0wwcv8k2/eJt3YDSAi2fa+l5TmZ+swF3OXG9g== X-Received: by 2002:aa7:c585:0:b0:46b:635a:ed8f with SMTP id g5-20020aa7c585000000b0046b635aed8fmr36308845edq.406.1670494411319; Thu, 08 Dec 2022 02:13:31 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id q3-20020aa7da83000000b0046c91fa5a4asm3207309eds.70.2022.12.08.02.13.30 for <59896@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Dec 2022 02:13:31 -0800 (PST) From: Liliana Marie Prikler Date: Thu, 8 Dec 2022 09:33:05 +0100 MIME-Version: 1.0 Message-ID: X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (clingo): Update to 5.6.2. [source]: Unbundle clasp and catch. [arguments]<#:configure-flags>: Add “-DCLINGO_USE_LOCAL_CLASP=off” and “-DCLINGO_USE_LOCAL_CATCH=off”. [inputs]: Add catch2-3.1. [native-inputs]: Add pkg-config. --- gnu/packages/maths.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index c0bc07977b..6a55284308 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2625,27 +2625,30 @@ (define-public clasp (define-public clingo (package (name "clingo") - (version "5.5.0") + (version "5.6.2") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/potassco/clingo") (commit (string-append "v" version)))) (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet + #~(begin + (delete-file-recursively "clasp") + ;; TODO: Unvendor other third-party stuff + (delete-file-recursively "third_party/catch"))) (sha256 (base32 - "0rfjwkcwm0mmf3r4i7asyjwb6cia4i7px7fn2kdbi9j85qvas4pb")))) + "19s59ndcm2yj0kxlikfxnx2bmp6b7n31wq1zvwc7hyk37rqarwys")))) (build-system cmake-build-system) (arguments `(#:configure-flags `("-DCLINGO_BUILD_TESTS=on" "-DCLINGO_INSTALL_LIB=on" "-DCLINGO_BUILD_STATIC=off" "-DCLINGO_BUILD_SHARED=on" - ;; XXX: Clingo requries private headers and - ;; sources from clasp - ,(string-append - "-DCLASP_SOURCE_DIR=" - (assoc-ref %build-inputs "clasp-src"))) + "-DCLINGO_USE_LOCAL_CLASP=off" + "-DCLINGO_USE_LOCAL_CATCH=off") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-cmake @@ -2677,10 +2680,8 @@ (define-public clingo "unpool-ast-v2" "parse_term" "propagator" "propgator-sequence-mining" "symbol" "visitor")))))))))) - (inputs - (list clasp libpotassco)) - (native-inputs - `(("clasp-src" ,(package-source clasp)))) + (inputs (list catch2-3.1 clasp libpotassco)) + (native-inputs (list pkg-config)) (home-page "https://potassco.org/") (synopsis "Grounder and solver for logic programs") (description "Clingo computes answer sets for a given logic program.") From patchwork Thu Dec 8 08:47:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 45120 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9AB9C27BBEB; Thu, 8 Dec 2022 10:14:57 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 9747327BBE9 for ; Thu, 8 Dec 2022 10:14:55 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p3Dup-0004x8-He; Thu, 08 Dec 2022 05:14:07 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p3Dul-0004vR-Ty for guix-patches@gnu.org; Thu, 08 Dec 2022 05:14:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p3Duk-0000o4-Rb for guix-patches@gnu.org; Thu, 08 Dec 2022 05:14:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p3Duk-0008FR-Mu for guix-patches@gnu.org; Thu, 08 Dec 2022 05:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59896] [PATCH 3/5] gnu: clingo: Use G-Expressions. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Dec 2022 10:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59896 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59896@debbugs.gnu.org Received: via spool by 59896-submit@debbugs.gnu.org id=B59896.167049442231661 (code B ref 59896); Thu, 08 Dec 2022 10:14:02 +0000 Received: (at 59896) by debbugs.gnu.org; 8 Dec 2022 10:13:42 +0000 Received: from localhost ([127.0.0.1]:55801 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3DuP-0008Ea-Bk for submit@debbugs.gnu.org; Thu, 08 Dec 2022 05:13:41 -0500 Received: from mail-ej1-f66.google.com ([209.85.218.66]:40763) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3DuL-0008Dy-K4 for 59896@debbugs.gnu.org; Thu, 08 Dec 2022 05:13:38 -0500 Received: by mail-ej1-f66.google.com with SMTP id b2so2702203eja.7 for <59896@debbugs.gnu.org>; Thu, 08 Dec 2022 02:13:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:from:to:cc:subject:date:message-id:reply-to; bh=4W66XryIEdzAYbrbLaPpgIqFooqgsQW1nGZ5orHL1OQ=; b=k6QA1jDT6FvKAaOwMskHoIzBI0WroIzAT3RpLGW5n+qT2U4NiDvZOgCn9GxVrHGsoS oZTE3VvQMNdyyNg17omgBe49Ws3Hdr9WVUYrfdEI6qeZX6j9m6B8AWK74MpGFQh+6m/N SFGrH0LmTY1Q743hKwPJBpuEUAcz2N01Yn6Vj06xWExyiOnDX3pNjTnAbSLPrPACEFhw bveQwtTMy8NGfqWjb448HTx0xl98FL1aY3dc7RQWoxmfUlz/R/RKqI85cXI0NTz90cXN 4qIrQmr/ecJL7e4ZEQMWxypCv87qHEst1UD5K7uN9SHNN7W43xZ32nowVGWjSkTtwezj 5PpQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=4W66XryIEdzAYbrbLaPpgIqFooqgsQW1nGZ5orHL1OQ=; b=awYUi6aTLhsg1JX8qjUEzNZWNwzS1vVJXW8iJMfHpk72bbVveAcBUA77kZaQdOuevS +vqn3isoVUQf0Gf3czVsPGPJbjNAW14bx0CK6PmdPRso9T+58XN9IPFE+aDRwX9MxBTC orUzJXecQapnwiBciYKKtV14d6tLEmFPPmGapBpGABgrglxYGmNi0bXDP/db3cbkNLS0 cWgCs+rroPNjYreU0ws+amhYXMcG6PTJHEInOUGGo7JSMYE0rcdKfQ7667gMOzCgXZRp 1mBnZrUTrl7umRszP8f8ZdzCeKDnYj0lnpL8koa0y2xbt5lzZX7TwnfHKqPELm2qkfwJ Zm4w== X-Gm-Message-State: ANoB5pk9GxE+xf8pmclh1Ov/GgDcqEljF5NgQJQYJd9ZDFAOnMtE4p3N 1J/dL8t4p79yAZx5iXCRkrhhzcseSkY= X-Google-Smtp-Source: AA0mqf725xUOWUtWcG5GHX02TenWE08ScbFJMyYz7JxFWJQZNNouRyHt03ScF0Wlxd5tAFinDm4ZMA== X-Received: by 2002:a17:906:3ad8:b0:7a8:dddc:7ec6 with SMTP id z24-20020a1709063ad800b007a8dddc7ec6mr29001750ejd.734.1670494412004; Thu, 08 Dec 2022 02:13:32 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id q3-20020aa7da83000000b0046c91fa5a4asm3207309eds.70.2022.12.08.02.13.31 for <59896@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Dec 2022 02:13:31 -0800 (PST) From: Liliana Marie Prikler Date: Thu, 8 Dec 2022 09:47:52 +0100 Message-ID: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (clingo)[arguments]: Convert to list of G-Expressions. --- gnu/packages/maths.scm | 75 +++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 37 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6a55284308..2215be9dad 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -2643,43 +2643,44 @@ (define-public clingo "19s59ndcm2yj0kxlikfxnx2bmp6b7n31wq1zvwc7hyk37rqarwys")))) (build-system cmake-build-system) (arguments - `(#:configure-flags `("-DCLINGO_BUILD_TESTS=on" - "-DCLINGO_INSTALL_LIB=on" - "-DCLINGO_BUILD_STATIC=off" - "-DCLINGO_BUILD_SHARED=on" - "-DCLINGO_USE_LOCAL_CLASP=off" - "-DCLINGO_USE_LOCAL_CATCH=off") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-cmake - (lambda _ - (substitute* "CMakeLists.txt" - (("add_subdirectory\\(clasp\\)") - "find_package(clasp REQUIRED)")) - (substitute* "libclingo/CMakeLists.txt" - (("\"cmake/Clingo\"") "\"cmake/clingo\"") - (("ClingoConfig\\.cmake") "clingo-config.cmake") - (("ClingoConfigVersion\\.cmake") - "clingo-config-version.cmake")) - (substitute* "cmake/ClingoConfig.cmake.in" - (("find_package\\(Clasp") "find_package(clasp")) - (rename-file "cmake/ClingoConfig.cmake.in" - "cmake/clingo-config.cmake.in"))) - (add-after 'unpack 'skip-failing-tests - (lambda _ - (with-directory-excursion "libclingo/tests" - (substitute* "CMakeLists.txt" - (("COMMAND test_clingo" all) - (string-append all - " -f " - "\"${CMAKE_CURRENT_SOURCE_DIR}/good.txt\""))) - (call-with-output-file "good.txt" - (lambda (port) - (for-each (lambda (test) (format port "~s~%" test)) - '("parse-ast-v2" "add-ast-v2" "build-ast-v2" - "unpool-ast-v2" "parse_term" - "propagator" "propgator-sequence-mining" - "symbol" "visitor")))))))))) + (list + #:configure-flags #~`("-DCLINGO_BUILD_TESTS=on" + "-DCLINGO_INSTALL_LIB=on" + "-DCLINGO_BUILD_STATIC=off" + "-DCLINGO_BUILD_SHARED=on" + "-DCLINGO_USE_LOCAL_CLASP=off" + "-DCLINGO_USE_LOCAL_CATCH=off") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-cmake + (lambda _ + (substitute* "CMakeLists.txt" + (("add_subdirectory\\(clasp\\)") + "find_package(clasp REQUIRED)")) + (substitute* "libclingo/CMakeLists.txt" + (("\"cmake/Clingo\"") "\"cmake/clingo\"") + (("ClingoConfig\\.cmake") "clingo-config.cmake") + (("ClingoConfigVersion\\.cmake") + "clingo-config-version.cmake")) + (substitute* "cmake/ClingoConfig.cmake.in" + (("find_package\\(Clasp") "find_package(clasp")) + (rename-file "cmake/ClingoConfig.cmake.in" + "cmake/clingo-config.cmake.in"))) + (add-after 'unpack 'skip-failing-tests + (lambda _ + (with-directory-excursion "libclingo/tests" + (substitute* "CMakeLists.txt" + (("COMMAND test_clingo" all) + (string-append all + " -f " + "\"${CMAKE_CURRENT_SOURCE_DIR}/good.txt\""))) + (call-with-output-file "good.txt" + (lambda (port) + (for-each (lambda (test) (format port "~s~%" test)) + '("parse-ast-v2" "add-ast-v2" "build-ast-v2" + "unpool-ast-v2" "parse_term" + "propagator" "propgator-sequence-mining" + "symbol" "visitor")))))))))) (inputs (list catch2-3.1 clasp libpotassco)) (native-inputs (list pkg-config)) (home-page "https://potassco.org/") From patchwork Thu Dec 8 08:48:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 45119 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 127F327BBEE; Thu, 8 Dec 2022 10:14:51 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8E47527BBE9 for ; Thu, 8 Dec 2022 10:14:50 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p3Duo-0004wo-Rv; Thu, 08 Dec 2022 05:14:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p3Dum-0004vr-Em for guix-patches@gnu.org; Thu, 08 Dec 2022 05:14:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p3Dum-0000oK-61 for guix-patches@gnu.org; Thu, 08 Dec 2022 05:14:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p3Dum-0008Fm-0u for guix-patches@gnu.org; Thu, 08 Dec 2022 05:14:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59896] [PATCH 4/5] gnu: Add python-clingo. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Dec 2022 10:14:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59896 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59896@debbugs.gnu.org Received: via spool by 59896-submit@debbugs.gnu.org id=B59896.167049442331681 (code B ref 59896); Thu, 08 Dec 2022 10:14:03 +0000 Received: (at 59896) by debbugs.gnu.org; 8 Dec 2022 10:13:43 +0000 Received: from localhost ([127.0.0.1]:55807 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3DuQ-0008Eq-Rb for submit@debbugs.gnu.org; Thu, 08 Dec 2022 05:13:43 -0500 Received: from mail-ej1-f68.google.com ([209.85.218.68]:39711) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3DuM-0008Dz-6B for 59896@debbugs.gnu.org; Thu, 08 Dec 2022 05:13:40 -0500 Received: by mail-ej1-f68.google.com with SMTP id gh17so2712717ejb.6 for <59896@debbugs.gnu.org>; Thu, 08 Dec 2022 02:13:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:from:to:cc:subject:date:message-id:reply-to; bh=6ZPZwL1osMED4Ibfm0PLMyGZmUEu+EaFn5v/1/5M+NA=; b=ONSbLMNWNVZchzLOLdFTf7fuaJ4EJin7Ko0U323tgQngymAWQarMgj6CG5Z/lhsAVE dtXi2eiTSJ6v+jF+ZqBZf33Gw8Qefy3ClYMQcsBZ3YMXOn38zeGbc+AGGE4KRdSXpJrr qe/kyBDrqRBQCqHkwHdwCxhFLI6xRCdsvr6zJflRwIymt1c4X8CqKBZX8FQc4GuvA6uC 5PYg8gmUtiX7qd++JftewqzIe1NYNBUVX4RbVWdi8HrPIWd9D3HMLI5+iyJv1McwjKhM 3/XsdhE6MALfW2yoXaO6s2qCppHq4nNkHhqHeOvLoqGyJLZTUqoWQqW0yDpDboxWfPIr eiOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=6ZPZwL1osMED4Ibfm0PLMyGZmUEu+EaFn5v/1/5M+NA=; b=j9RxKpvuAQElo3gM3gOqiyLCx7ifMlkdGQrrmLTJWaYFLlTqYy+IdBjkHryjhLbmu3 4vHYXd4IPA4OkbWfCSumtfCc7fu1DBSqe1PUM5F5wM6VkgoKEpu3t3/pRGn8VjI/BIFF OMU7YSanLBJ98rmdJHObIGRgnuXk3of7FahTYPbLAsE1k1nWifsLlD98JLRz06CogfTc WIwC5kPXwVKVoIcHRczeSn0R0LVl0qX7qlUw5amoJNct4mSQwVDw2UjWS/13Wirf66M/ G8YHHaeHzJVFfqVkAwjvaCLOibZw+YQqN8bFnJJCy3Rdf0+MML8EaZUKbI2ACuC6k+4V Ix7w== X-Gm-Message-State: ANoB5pn+/QYRP/zTXmdGXc/W8JwGgGEc099i+TX/GMJ0svB+h8/JIE1q fZqYClnpgDirWM0CNvrv+Jy3UXcRksc= X-Google-Smtp-Source: AA0mqf7LqPWpAutXu5SCrA8aJ84wGgR7C7qZHKtwwxzcmPYFNCWaCB+cLUBrOODuN+CVxqY0GSNbrQ== X-Received: by 2002:a17:906:3413:b0:7c0:e6d7:92ad with SMTP id c19-20020a170906341300b007c0e6d792admr14461417ejb.419.1670494412653; Thu, 08 Dec 2022 02:13:32 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id q3-20020aa7da83000000b0046c91fa5a4asm3207309eds.70.2022.12.08.02.13.32 for <59896@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Dec 2022 02:13:32 -0800 (PST) From: Liliana Marie Prikler Date: Thu, 8 Dec 2022 09:48:53 +0100 Message-ID: <118732f45017240e251ddcc41b307d8326a4d272.camel@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/maths.scm (python-clingo): New variable. --- gnu/packages/maths.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 2215be9dad..4f057820f0 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -126,6 +126,7 @@ (define-module (gnu packages maths) #:use-module (gnu packages image) #:use-module (gnu packages java) #:use-module (gnu packages less) + #:use-module (gnu packages libffi) #:use-module (gnu packages lisp) #:use-module (gnu packages linux) #:use-module (gnu packages llvm) @@ -2688,6 +2689,34 @@ (define-public clingo (description "Clingo computes answer sets for a given logic program.") (license license:expat))) +(define-public python-clingo + (package + (inherit clingo) + (name "python-clingo") + (arguments + (substitute-keyword-arguments (package-arguments clingo) + ((#:configure-flags flags #~'()) + #~(cons* "-DCLINGO_BUILD_WITH_PYTHON=pip" + "-DCLINGO_USE_LIB=yes" + #$flags)) + ((#:phases phases #~%standard-phases) + #~(modify-phases #$phases + (add-after 'unpack 'fix-failing-tests + (lambda _ + (substitute* "libpyclingo/clingo/tests/test_conf.py" + (("ctl\\.solve\\(on_statistics=on_statistics\\)" all) + (string-append + all + "; self.skipTest(\"You shall not fail.\")"))))))))) + (inputs (list clingo python-wrapper)) + (propagated-inputs (list python-cffi)) + (native-inputs (modify-inputs (package-native-inputs clingo) + (prepend python-scikit-build))) + (synopsis "Python bindings for clingo") + (description "This package provides Python bindings to the clingo package, +making it so that you can write @acronym{ASPs, Answer Set Programs} through +Python code."))) + (define-public ceres (package (name "ceres-solver") From patchwork Thu Dec 8 08:49:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liliana Marie Prikler X-Patchwork-Id: 45118 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 6018627BBEB; Thu, 8 Dec 2022 10:14:48 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6A0E327BBE9 for ; Thu, 8 Dec 2022 10:14:46 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p3Duo-0004wl-HF; Thu, 08 Dec 2022 05:14:06 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p3Dum-0004vp-CK for guix-patches@gnu.org; Thu, 08 Dec 2022 05:14:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p3Dul-0000o7-RA for guix-patches@gnu.org; Thu, 08 Dec 2022 05:14:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p3Dul-0008Ff-IV for guix-patches@gnu.org; Thu, 08 Dec 2022 05:14:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59896] [PATCH 5/5] gnu: Add python-telingo. References: In-Reply-To: Resent-From: Liliana Marie Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 08 Dec 2022 10:14:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59896 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 59896@debbugs.gnu.org Received: via spool by 59896-submit@debbugs.gnu.org id=B59896.167049442231675 (code B ref 59896); Thu, 08 Dec 2022 10:14:03 +0000 Received: (at 59896) by debbugs.gnu.org; 8 Dec 2022 10:13:42 +0000 Received: from localhost ([127.0.0.1]:55805 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3DuQ-0008Ej-Ay for submit@debbugs.gnu.org; Thu, 08 Dec 2022 05:13:42 -0500 Received: from mail-ej1-f67.google.com ([209.85.218.67]:41862) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p3DuM-0008E0-Q7 for 59896@debbugs.gnu.org; Thu, 08 Dec 2022 05:13:40 -0500 Received: by mail-ej1-f67.google.com with SMTP id vp12so2694727ejc.8 for <59896@debbugs.gnu.org>; Thu, 08 Dec 2022 02:13:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:from:to:cc:subject:date:message-id:reply-to; bh=CVxKfHdgb5tFLX16f/BsGJZAUWIeRVxZyK/VcgoqDhw=; b=VDdbZc/A97aU1OzOlPvNP5tieYuYAy9TKxsepoJdStmdVnyP6Vik3p2R+SIqxaX3QR noV9MoU64CafLNAZ6bk1y0fj8drR6RREJgQF3zmhclsiuvaDXDqJ+ilX2Br6kwQZiRjS hMMgOainLF0oGqOS9cfPJCWJs7+u/pP4oEDjIb4YGX6ys0mycYtl81JTXLNfEpmXJAi+ DP7qUTv2jcy5GtYT49NS3zuUnYe34FDRZhRi+J92tPpvsllBR6tVSrj2ehxGNCGcBZdl ld79hK6SUr5XKdlc41ZiJpD5O+s59MDA7ZziPvZC4t8EfseswkqfNstlOmOe3WurewcI 0eVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=mime-version:message-id:content-transfer-encoding:to:subject:date :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=CVxKfHdgb5tFLX16f/BsGJZAUWIeRVxZyK/VcgoqDhw=; b=jU7816yiCnL3ix1gV+5qhzvUDSGTGNh89hOo392V/DB8GBF6EtB+uTTWxGByoeZtwC 8XGLkRNwS72+OnWX3xPlhLOeAYjudDNyUGbgiiKANmxjNQqAixNtJ43azilspd0yTESI SP0nYFUvG+9LiV5Ki/mCiStJ7EadJEnQg1BacSfoiIYK1AFWw4ccAXByXdd6adLvPRUW Ztpr9+N5X09CcZ3O7ZKXw2N8X3iPR4tDXL9nB/zPdALWDa5TWYrUJIVNkPOE2GavF62G J++jnTPmVEu1d1D/9k2UZV2/IHw3uoem82L21dyITbJxCi6PclKO3hoPJ3ThgSOm0344 Dqmw== X-Gm-Message-State: ANoB5plW60EiuDPEXH0DTz8g2CYdhojg5ae22BAS+D3C6j5OORi0I7b0 fbzaV4te06d40/CO06ACA1hfRzrWHAg= X-Google-Smtp-Source: AA0mqf44q/Uym8WlNdoIJj1DrSLpOu0EcRJKnc8AyYtouWTa0+PHSPEzAxeWrTksEZB1e+/PNm7LIg== X-Received: by 2002:a17:906:a157:b0:7a5:7e25:5b11 with SMTP id bu23-20020a170906a15700b007a57e255b11mr12948004ejb.254.1670494413241; Thu, 08 Dec 2022 02:13:33 -0800 (PST) Received: from lumine.fritz.box (85-127-52-93.dsl.dynamic.surfer.at. [85.127.52.93]) by smtp.gmail.com with ESMTPSA id q3-20020aa7da83000000b0046c91fa5a4asm3207309eds.70.2022.12.08.02.13.32 for <59896@debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 08 Dec 2022 02:13:32 -0800 (PST) From: Liliana Marie Prikler Date: Thu, 8 Dec 2022 09:49:07 +0100 Message-ID: <1da46d86f9d5850afe7f8f14070a3c025dbae3f7.camel@gmail.com> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/python-telingo-fix-comparison.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/maths.scm (python-telingo): New variable. --- gnu/local.mk | 1 + gnu/packages/maths.scm | 23 +++++++++++++++++++ .../python-telingo-fix-comparison.patch | 19 +++++++++++++++ 3 files changed, 43 insertions(+) create mode 100644 gnu/packages/patches/python-telingo-fix-comparison.patch diff --git a/gnu/local.mk b/gnu/local.mk index 3329801fa6..0ada842407 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1644,6 +1644,7 @@ dist_patch_DATA = \ %D%/packages/patches/python-louvain-fix-test.patch \ %D%/packages/patches/python-random2-getrandbits-test.patch \ %D%/packages/patches/python-poppler-qt5-fix-build.patch \ + %D%/packages/patches/python-telingo-fix-comparison.patch \ %D%/packages/patches/python-w3lib-fix-test-failure.patch \ %D%/packages/patches/sdcc-disable-non-free-code.patch \ %D%/packages/patches/sdl-pango-api_additions.patch \ diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 4f057820f0..23c886dfdb 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -92,6 +92,7 @@ (define-module (gnu packages maths) #:use-module (guix build-system ocaml) #:use-module (guix build-system perl) #:use-module (guix build-system python) + #:use-module (guix build-system pyproject) #:use-module (guix build-system ruby) #:use-module (gnu packages algebra) #:use-module (gnu packages audio) @@ -2717,6 +2718,28 @@ (define-public python-clingo making it so that you can write @acronym{ASPs, Answer Set Programs} through Python code."))) +(define-public python-telingo + (package + (name "python-telingo") + (version "2.1.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/potassco/telingo") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (patches (search-patches "python-telingo-fix-comparison.patch")) + (sha256 + (base32 + "0g3khxfdzc2hc7dkiyyqhb399h6h21m5wkp6wy8w71n0m32fiy53")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-clingo)) + (home-page "https://potassco.org/") + (synopsis "Solve dynamic temporal logic programs") + (description "This package provides a system to solve dynamic temporal +logic programs based on clingo.") + (license license:expat))) + (define-public ceres (package (name "ceres-solver") diff --git a/gnu/packages/patches/python-telingo-fix-comparison.patch b/gnu/packages/patches/python-telingo-fix-comparison.patch new file mode 100644 index 0000000000..6d05048dcb --- /dev/null +++ b/gnu/packages/patches/python-telingo-fix-comparison.patch @@ -0,0 +1,19 @@ +Index: source/telingo/transformers/head.py +=================================================================== +--- source.orig/telingo/transformers/head.py ++++ source/telingo/transformers/head.py +@@ -564,10 +564,12 @@ class HeadTransformer: + cond = [] + diff = _ast.BinaryOperation(loc, _ast.BinaryOperator.Minus, param, shift) + if lhs.ast_type != _ast.ASTType.SymbolicTerm or lhs.symbol.type != _clingo.SymbolType.Number or lhs.symbol.number > 0: +- cond.append(_ast.Literal(loc, _ast.Sign.NoSign, _ast.Comparison(_ast.ComparisonOperator.LessEqual, lhs, diff))) ++ cond.append(_ast.Literal(loc, _ast.Sign.NoSign, ++ _ast.Comparison(lhs, [_ast.Guard(_ast.ComparisonOperator.LessEqual, diff)]))) + + if rhs.ast_type != _ast.ASTType.SymbolicTerm or rhs.symbol.type != _clingo.SymbolType.Supremum: +- cond.append(_ast.Literal(loc, _ast.Sign.NoSign, _ast.Comparison(_ast.ComparisonOperator.LessEqual, diff, rhs))) ++ cond.append(_ast.Literal(loc, _ast.Sign.NoSign, ++ _ast.Comparison(diff, [_ast.Guard(_ast.ComparisonOperator.LessEqual, rhs)]))) + + elems.extend([_ast.ConditionalLiteral(loc, _ast.Literal(loc, _ast.Sign.NoSign, head), cond) for head in heads]) +