unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Herman Rimm via Guix-patches via <guix-patches@gnu.org>
To: 70087@debbugs.gnu.org
Cc: Herman Rimm <herman@rimm.ee>, Andreas Enge <andreas@enge.fr>,
	Eric Bavier <bavier@posteo.net>,
	Sharlatan Hellseher <sharlatanus@gmail.com>
Subject: [bug#70087] [PATCH 3/4] gnu: minizinc: Add chuffed backend.
Date: Sat, 30 Mar 2024 12:42:40 +0100	[thread overview]
Message-ID: <1f8b3e870c43629a1b35ecb532a1cffc19146315.1711794209.git.herman@rimm.ee> (raw)
In-Reply-To: <f5a006def8b65680ffe79602658825e2b25bfb56.1711794209.git.herman@rimm.ee>

* 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





  parent reply	other threads:[~2024-03-30 11:44 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-30 11:40 [bug#70087] [PATCH 1/4] gnu: gecode: Update to development version 6.3.0 Herman Rimm via Guix-patches via
2024-03-30 11:42 ` [bug#70087] [PATCH 2/4] gnu: Add chuffed Herman Rimm via Guix-patches via
2024-03-30 11:42 ` Herman Rimm via Guix-patches via [this message]
2024-03-30 11:42 ` [bug#70087] [PATCH 4/4] gnu: minizinc: Update to 2.8.3 Herman Rimm via Guix-patches via
2024-05-12 19:08 ` [bug#70087] [PATCH 1/4] gnu: gecode: Update to development version 6.3.0 Andreas Enge
2024-05-14  7:31   ` Herman Rimm via Guix-patches via
2024-05-14 11:44     ` Andreas Enge
2024-05-15 10:12     ` Andreas Enge
2024-05-15 12:06       ` Andreas Enge
2024-05-15 12:39         ` Andreas Enge
2024-05-15 13:08           ` bug#70087: " Andreas Enge
2024-05-15 15:51 ` [bug#70087] [PATCH v2 1/4] gnu: gecode: Update to 6.2.0-1.f7f0d7c Herman Rimm via Guix-patches via
2024-05-15 15:51   ` [bug#70087] [PATCH v2 2/4] gnu: Add chuffed Herman Rimm via Guix-patches via
2024-05-15 15:51   ` [bug#70087] [PATCH v2 3/4] gnu: minizinc: Add chuffed backend Herman Rimm via Guix-patches via
2024-05-15 15:51   ` [bug#70087] [PATCH v2 4/4] gnu: minizinc: Update to 2.8.4 Herman Rimm via Guix-patches via
2024-05-15 17:08   ` [bug#70087] [PATCH v2 1/4] gnu: gecode: Update to 6.2.0-1.f7f0d7c Andreas Enge
2024-05-15 18:01 ` [bug#70087] [PATCH 0/3] Update minizinc and solvers Herman Rimm via Guix-patches via
2024-05-15 18:01   ` [bug#70087] [PATCH 1/3] gnu: gecode: Update to 6.2.0-1.f7f0d7c Herman Rimm via Guix-patches via
2024-05-15 18:01   ` [bug#70087] [PATCH 2/3] gnu: chuffed: Update to 0.13.2 Herman Rimm via Guix-patches via
2024-05-15 18:02   ` [bug#70087] [PATCH 3/3] gnu: minizinc: Update to 2.8.4 Herman Rimm via Guix-patches via
2024-05-15 19:03   ` [bug#70087] [PATCH 0/3] Update minizinc and solvers Andreas Enge
2024-05-22 15:12     ` Andreas Enge

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1f8b3e870c43629a1b35ecb532a1cffc19146315.1711794209.git.herman@rimm.ee \
    --to=guix-patches@gnu.org \
    --cc=70087@debbugs.gnu.org \
    --cc=andreas@enge.fr \
    --cc=bavier@posteo.net \
    --cc=herman@rimm.ee \
    --cc=sharlatanus@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).