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