From patchwork Sat Mar 30 11:40:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 62370 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 D8AF227BBE2; Sat, 30 Mar 2024 11:41:19 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 9C5B827BBE9 for ; Sat, 30 Mar 2024 11:41:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqX55-0003MC-UI; Sat, 30 Mar 2024 07:41:03 -0400 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 1rqX54-0003Ln-Eg for guix-patches@gnu.org; Sat, 30 Mar 2024 07:41:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqX54-0005ur-0z for guix-patches@gnu.org; Sat, 30 Mar 2024 07:41:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rqX54-0002X9-3w; Sat, 30 Mar 2024 07:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70087] [PATCH 1/4] gnu: gecode: Update to development version 6.3.0. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 30 Mar 2024 11:41:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 70087 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70087@debbugs.gnu.org Cc: Herman Rimm , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by submit@debbugs.gnu.org id=B.17117988539715 (code B ref -1); Sat, 30 Mar 2024 11:41:01 +0000 Received: (at submit) by debbugs.gnu.org; 30 Mar 2024 11:40:53 +0000 Received: from localhost ([127.0.0.1]:44085 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqX4u-0002Wd-Js for submit@debbugs.gnu.org; Sat, 30 Mar 2024 07:40:52 -0400 Received: from lists.gnu.org ([2001:470:142::17]:38994) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqX4p-0002Vx-PV for submit@debbugs.gnu.org; Sat, 30 Mar 2024 07:40:51 -0400 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 1rqX4h-0003CP-F7 for guix-patches@gnu.org; Sat, 30 Mar 2024 07:40:39 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117] helo=email.rimm.ee) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1rqX4e-0005s5-2P for guix-patches@gnu.org; Sat, 30 Mar 2024 07:40:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1711798829; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=y/adxjp6nXKv+nhlxgQwIAdvA6exyA/kLROzef4rwy0=; b=oAjz8/bnotLYMfTwLZAx83fZX72pfDZ5qRJpYY93FQ+CQQ/ZOz5iQJ9BLmIz9dTiLMTM9Y WlEJJDcdQx5eVZKMds/rRMMjGNljhpOLiQ0LebLvQSx2Gnc3WtxTH+kNvb7x9v+74m/AhC hKlnONEl0mY/XSrO1+KT3OMVTPPQua4nVN1ss7PZ8CeR15pUkeu2ya3+smcjC9J30D5Bbk zBFNGOkjokRVLWcSHxav6z1UNY3GquucojoV3KtSPTbVxeN0jcyv4UB5e8AIPs2EJ2hGPa iUrY3SPJkK8EDl/xSzVUC2nldmQD3LxjrtlsCV2bjxxWNkJOcBkflIXoddSWEQ== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 09ea5533 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 30 Mar 2024 11:40:29 +0000 (UTC) Date: Sat, 30 Mar 2024 12:40:05 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Received-SPF: pass client-ip=81.205.150.117; envelope-from=herman@rimm.ee; helo=email.rimm.ee X-Spam_score_int: 12 X-Spam_score: 1.2 X-Spam_bar: + X-Spam_report: (1.2 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_PBL=3.335, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, TVD_RCVD_IP=0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm 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 (gecode): Update. Change-Id: I5e89105f3fef61d6aa677a4a118225679220ce5d --- gnu/packages/maths.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) base-commit: 350cdbe83819233b6db9fb1cfc797eaf80b0d168 diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 479591889f..6c23aa3562 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -63,6 +63,7 @@ ;;; Copyright © 2023 Jake Leporte ;;; Copyright © 2023 Camilo Q.S. (Distopico) ;;; Copyright © 2023 David Elsing +;;; Copyright © 2024 Herman Rimm ;;; ;;; This file is part of GNU Guix. ;;; @@ -2615,16 +2616,16 @@ (define-public clp (define-public gecode (package (name "gecode") - (version "6.2.0") + (version "6.3.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/Gecode/gecode") - (commit (string-append "release-" version)))) + (commit "2d20e88cae176584b6e09d909aca3eb72ae76829"))) (file-name (git-file-name name version)) (sha256 (base32 - "0b1cq0c810j1xr2x9y9996p894571sdxng5h74py17c6nr8c6dmk")) + "0hf7hd7m5p26xwn8f561f0gn2a6q33xz818jg3ivmvp2ysmmmm4r")) (modules '((guix build utils))) (snippet '(begin From patchwork Sat Mar 30 11:42:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 62373 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 57F9327BBEA; Sat, 30 Mar 2024 11:44:41 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 ABC6F27BBE2 for ; Sat, 30 Mar 2024 11:44:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqX7z-0003mi-PW; Sat, 30 Mar 2024 07:44:03 -0400 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 1rqX7y-0003ld-IM for guix-patches@gnu.org; Sat, 30 Mar 2024 07:44:02 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqX7y-0006kS-AO for guix-patches@gnu.org; Sat, 30 Mar 2024 07:44:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rqX7y-0002hV-66; Sat, 30 Mar 2024 07:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70087] [PATCH 2/4] gnu: Add chuffed. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 30 Mar 2024 11:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70087 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70087@debbugs.gnu.org Cc: Herman Rimm , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by 70087-submit@debbugs.gnu.org id=B70087.171179900410263 (code B ref 70087); Sat, 30 Mar 2024 11:44:02 +0000 Received: (at 70087) by debbugs.gnu.org; 30 Mar 2024 11:43:24 +0000 Received: from localhost ([127.0.0.1]:44098 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqX7L-0002fO-OJ for submit@debbugs.gnu.org; Sat, 30 Mar 2024 07:43:24 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:54339 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqX7J-0002ed-9i for 70087@debbugs.gnu.org; Sat, 30 Mar 2024 07:43:22 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1711798992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yJaMu0Ly3BsRSBTQZb66VHrLC/FAKoZPbGok7yybOT4=; b=CRQVa2V4M0Ug9bnBEs22Mhxe3pZwss3M390Rf309H3LOXiM8fNyXrn+Jd0hYURGlMgRVfE nSrNMYthjpw3bMH4FZzJUscnQcUMBLShQ/z9Jz5cVAYPy5X6UPscb4CbHizatyfpSeXKpb OvfPKGFlyHrzt/M3gyc9anktN2m6vlBwu5Tp+hpaYR6sMHMbh4cOuu0BmrrPRUl8DyRcLh +c8rcCotVIOCsuBzGWrHSaKgpDzns/hJM4OQoZnPz+7BZ7UDG6SGh7tnWchJqCbLtZjTKN vsSIeieRjkm0WKanwgj+WnzG+piEGqK3iUiTVD9fy+RXuo+O6/KAeimI1bEM5A== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id 1cbf64af (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 30 Mar 2024 11:43:12 +0000 (UTC) Date: Sat, 30 Mar 2024 12:42:39 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm 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 (chuffed): Add variable. Change-Id: I77fc1ceb9caa42833689fba771010aeb38443e5e --- gnu/packages/maths.scm | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 6c23aa3562..0c08851616 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -306,6 +306,43 @@ (define-public calc (home-page "http://www.isthe.com/chongo/tech/comp/calc/") (license license:lgpl2.1))) +(define-public chuffed + (package + (name "chuffed") + (version "0.13.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/chuffed/chuffed") + (commit version))) + (sha256 + (base32 + "1c28q166qh84q4i5wz77fqvw7kld3fmhd245sgdvyxcbjpi2wr0m")))) + (build-system cmake-build-system) + (synopsis "Lazy clause generation solver") + (arguments '(#:tests? #f ; no 'check' target + #:modules ((guix build cmake-build-system) + (guix build utils)) + #:phases + (modify-phases %standard-phases + (add-before 'build 'patch-msc + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out"))) + (substitute* "chuffed.msc" + ;; TODO: Replace fzn-chuffed and chuffed path + ;; before build. + (("\\.\\./../..") out) + (("\\.\\.") + (string-append + out "/share/minizinc"))))))))) + (description + "Chuffed is a state of the art lazy clause solver designed from the +ground up with lazy clause generation in mind. Lazy clause generation +is a hybrid approach to constraint solving that combines features of +finite domain propagation and Boolean satisfiability.") + (home-page "https://github.com/chuffed/chuffed") + (license license:expat))) + (define-public coda (package (name "coda") From patchwork Sat Mar 30 11:42:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 62371 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 D9E6127BBE9; Sat, 30 Mar 2024 11:44:24 +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=-2.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A 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 8C52927BBE2 for ; Sat, 30 Mar 2024 11:44:23 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqX7z-0003mS-1A; Sat, 30 Mar 2024 07:44:03 -0400 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 1rqX7x-0003lO-5n for guix-patches@gnu.org; Sat, 30 Mar 2024 07:44:01 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqX7w-0006jx-TW for guix-patches@gnu.org; Sat, 30 Mar 2024 07:44:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rqX7y-0002hc-N9; Sat, 30 Mar 2024 07:44:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70087] [PATCH 3/4] gnu: minizinc: Add chuffed backend. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 30 Mar 2024 11:44:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70087 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70087@debbugs.gnu.org Cc: Herman Rimm , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by 70087-submit@debbugs.gnu.org id=B70087.171179900910284 (code B ref 70087); Sat, 30 Mar 2024 11:44:02 +0000 Received: (at 70087) by debbugs.gnu.org; 30 Mar 2024 11:43:29 +0000 Received: from localhost ([127.0.0.1]:44101 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqX7R-0002fn-4M for submit@debbugs.gnu.org; Sat, 30 Mar 2024 07:43:29 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:54339 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqX7K-0002ed-Sb for 70087@debbugs.gnu.org; Sat, 30 Mar 2024 07:43:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1711798993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9abtWu/rQXYQL8b4pZ/OFkWzcdnwmJU36bnR32VSpSg=; b=AsQNzP0VVczHSoAh0g3ZIRbDvyljKMRpw+SBS6gWHwdxU8hB70b6IHQqUFipzcWqbYhnX4 amsbMAK6SLulvoOHMD3hRSWY0WEKJwOM/IZ1EaqJNZ/KqpkfuwRQpcLlCyiUc0VFcWfn7a 60IR/94wT1fkVm0gwzVHVQN6uf8sQAA1K8znyAiB6Yv462+cGL+V+Z/k034333gXxYG++b xO381MBhmhT7pSYWBEnuSoPlU2qATpYejQFFav97A2A+Rf649tZOEV1prZqN0KWnQh5Qk9 uBNn+I9qFDQ9wpct7zaIS+Wk7iJjVkXjJe6TfE8PEp+UlYZD1nVOCDK4TJkYEQ== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id a72b465b (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 30 Mar 2024 11:43:13 +0000 (UTC) Date: Sat, 30 Mar 2024 12:42:40 +0100 Message-ID: <1f8b3e870c43629a1b35ecb532a1cffc19146315.1711794209.git.herman@rimm.ee> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm 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 (minizinc): Add backend. Change-Id: If178a7585d70eb4b6f3223f5f6b2f34d9d2f2257 --- gnu/packages/maths.scm | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 0c08851616..fd44f1f985 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4065,9 +4065,9 @@ (define-public minizinc (lambda (file) (member file (cons* "." ".." targets))) (scandir "."))) - (substitute* "libmzn.cmake" - (("include\\(cmake/targets/(.*)\\)" all target) - (if (member target targets) all ""))))) + (substitute* "libmzn.cmake" + (("include\\(cmake/targets/(.*)\\)" all target) + (if (member target targets) all ""))))) (with-directory-excursion "include/minizinc/solvers/MIP" (for-each delete-file (remove @@ -4106,9 +4106,10 @@ (define-public minizinc (modify-phases %standard-phases (add-after 'install 'install-solver-configs (lambda* (#:key inputs outputs #:allow-other-keys) - (let ((gecode (assoc-ref inputs "gecode")) + (let ((chuffed (assoc-ref inputs "chuffed")) + (gecode (assoc-ref inputs "gecode")) (pkgdatadir (string-append (assoc-ref outputs "out") - "/share/minizinc"))) + "/share/minizinc"))) (call-with-output-file (string-append pkgdatadir "/Preferences.json") (lambda (port) @@ -4123,7 +4124,9 @@ (define-public minizinc port) (newline port))) - (mkdir-p (string-append pkgdatadir "/solvers")) + (copy-recursively + (string-append chuffed "/share/minizinc/solvers") + (string-append pkgdatadir "/solvers")) (call-with-output-file (string-append pkgdatadir "/solvers/gecode.msc") (lambda (port) @@ -4150,7 +4153,7 @@ (define-public minizinc (native-inputs (list bison flex)) (inputs - (list cbc gecode zlib)) + (list cbc chuffed gecode zlib)) (home-page "https://www.minizinc.org") (synopsis "High-level constraint modeling language") (description "MiniZinc is a high-level modeling language for constraint From patchwork Sat Mar 30 11:42:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Herman Rimm X-Patchwork-Id: 62372 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 E4A8A27BBEA; Sat, 30 Mar 2024 11:44:31 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 4C3D327BBE2 for ; Sat, 30 Mar 2024 11:44:31 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rqX80-0003my-Ot; Sat, 30 Mar 2024 07:44:04 -0400 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 1rqX7z-0003mY-BR for guix-patches@gnu.org; Sat, 30 Mar 2024 07:44:03 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rqX7y-0006kY-TI for guix-patches@gnu.org; Sat, 30 Mar 2024 07:44:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rqX7z-0002hn-8h; Sat, 30 Mar 2024 07:44:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70087] [PATCH 4/4] gnu: minizinc: Update to 2.8.3. Resent-From: Herman Rimm Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, bavier@posteo.net, sharlatanus@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 30 Mar 2024 11:44:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70087 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70087@debbugs.gnu.org Cc: Herman Rimm , Andreas Enge , Eric Bavier , Sharlatan Hellseher X-Debbugs-Original-Xcc: Andreas Enge , Eric Bavier , Sharlatan Hellseher Received: via spool by 70087-submit@debbugs.gnu.org id=B70087.171179901010290 (code B ref 70087); Sat, 30 Mar 2024 11:44:03 +0000 Received: (at 70087) by debbugs.gnu.org; 30 Mar 2024 11:43:30 +0000 Received: from localhost ([127.0.0.1]:44103 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqX7R-0002fp-Kr for submit@debbugs.gnu.org; Sat, 30 Mar 2024 07:43:29 -0400 Received: from 81-205-150-117.fixed.kpn.net ([81.205.150.117]:54339 helo=email.rimm.ee) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rqX7M-0002ed-8J for 70087@debbugs.gnu.org; Sat, 30 Mar 2024 07:43:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rimm.ee; s=herman; t=1711798993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=SfFWW89TEECW7kiRztkFHNZxt7bSFUz/EtOJyAgToCE=; b=Kg25UCLQ7WT66itQozInHQ7dDIpT27ofJIkkgYD3hTUbBt7hKKZhADhY838sO7dDsKqybd SLGP1stq16euK0fQgEzvffbVhcn+4SckvMGkvdXe/fpXRIBk93oF1dT3gG2Bu/Sb7r7Lik uKIxTx5sDw6cZYAxFvaSC85h2efrVfun+Qi7lcVxLztEw3vmC1N4eUO4wSDIEQKevsx8UG Zbq60HVFvKEZOpXC59nbnMf3LbDRUTJHimj+IhqtSGqOQTahQLUlLsiNya84OeL94FpBq5 OgbtcrhHUhIhlpzxtNc1tT7CfoXfPqf+7k7bfNn2IiLn65jXHWl/UKkhZBLh0w== Received: by 81-205-150-117.fixed.kpn.net (OpenSMTPD) with ESMTPSA id e4a63f6e (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sat, 30 Mar 2024 11:43:13 +0000 (UTC) Date: Sat, 30 Mar 2024 12:42:41 +0100 Message-ID: <5345bf947c546c7a9c1a581e9d22d33b953158ec.1711794209.git.herman@rimm.ee> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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: , Reply-to: Herman Rimm X-ACL-Warn: , Herman Rimm via Guix-patches X-Patchwork-Original-From: Herman Rimm via Guix-patches via From: Herman Rimm 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 (minizinc): Update. Change-Id: I503fd004b38abaac8829a2cb94c182b001d83763 --- gnu/packages/maths.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index fd44f1f985..5a58696858 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -4034,7 +4034,7 @@ (define-public metamath (define-public minizinc (package (name "minizinc") - (version "2.5.5") + (version "2.8.3") (source (origin (method git-fetch) (uri (git-reference @@ -4043,7 +4043,7 @@ (define-public minizinc (file-name (git-file-name name version)) (sha256 (base32 - "10b2hsl1fx9psh0iagmp8ki3f60f3qg5hmvra5aczjlfmbl88ggp")) + "1h3pc92m7ypvmhrrhk2263ib5rqc4fv4n6lai0p8dwiidjpcqnpz")) (modules '((guix build utils) (ice-9 ftw) (srfi srfi-1))) @@ -4089,6 +4089,9 @@ (define-public minizinc "MIP_solverinstance.cpp" "MIP_wrap.cpp"))) (scandir ".")))) + ;; Gecode 6.3 does not yet support new interface. + (substitute* "solvers/gecode/gecode_solverinstance.cpp" + (("600300") "600400")) (substitute* "CMakeLists.txt" (("find_package\\(([^ ]*).*\\)" all pkg) (if (member pkg '("Gecode" "OsiCBC" "Threads"))