From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id +IEcLRf7B2b2vgAA62LTzQ:P1 (envelope-from ) for ; Sat, 30 Mar 2024 12:44:23 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id +IEcLRf7B2b2vgAA62LTzQ (envelope-from ) for ; Sat, 30 Mar 2024 12:44:23 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=AsQNzP0V; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1711799063; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=9abtWu/rQXYQL8b4pZ/OFkWzcdnwmJU36bnR32VSpSg=; b=fKc43m+AFMlRoeAkebg8K6Kgbf7gfl+qvPlbnJjZoP7hEcKrQg2xtBtsK34SXWu8SdDzy2 cZnd3Xio1FHrBAEYYcO9HHgyL1+rTy9QnqSdZgtyNcDuhfM4s+ZkWC/QZdVI7BEn9HXQ8d 0wkL+G35TlPytJnrMlnP8FmFlhZQyVsjBirSNtV/TDV84IEdHx7srp+j9lfsBhZRv+lRiz vhmJ3GmngGQ8S/xJV6bqnzlE54YTlQ1gdiGyS6say7+v/ZZ5qqNZBHjmhkwi+zBBpaw/GF 3786iOb0VucjZtdIQwSi8XbrL/t6OXppKaBpcsDgQaBVRRz1B2bUxYSlrRQHuw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=rimm.ee header.s=herman header.b=AsQNzP0V; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1711799063; a=rsa-sha256; cv=none; b=JlwhIVC5YKsiBmxC2Fh0b8TZ1P62WipAvBt+K/eOR22JzXb3B0xqYLCSULq4B8UkN3rDCT FJvqvQIdSUdykE+2Mz9MRS/Q05qGTic+CUm1SEKu8gT/6Djng+JGjizXKjk7XJzYEowOOf 0/uCmRjMlu3SEO//zJkWj2QT08mHcioMZtHDJFf55ERa9VqS1zuyjaMC3y07f5zXaQDQs3 l1WokIIclpWVg8sbcfaaleORf84WJCY6U7Y5Be5Gi0XFZFAIgm6GhWq7DzpXbats5kEjCO 3lRgE2CQY66KbrNrPeJrge1y84K9cbemzd9SDfgtrUleSXnT9VlKJQtjdqj9RA== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 982266A268 for ; Sat, 30 Mar 2024 12:44:23 +0100 (CET) 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 Content-Transfer-Encoding: 8bit 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 From: Herman Rimm via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Queue-Id: 982266A268 X-Spam-Score: -6.35 X-Migadu-Spam-Score: -6.35 X-Migadu-Scanner: mx10.migadu.com X-TUID: D1FfWXq5KBvH * 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 -- 2.41.0