all messages for Guix-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Nicolas Graves via Guix-patches via <guix-patches@gnu.org>
To: 65853@debbugs.gnu.org
Cc: ngraves@ngraves.fr
Subject: [bug#65853] [PATCH v3 5/8] gnu: scilab: Reindent.
Date: Mon,  6 Nov 2023 00:51:48 +0100	[thread overview]
Message-ID: <20231106000354.32423-6-ngraves@ngraves.fr> (raw)
In-Reply-To: <20231106000354.32423-1-ngraves@ngraves.fr>

* gnu/packages/maths.scm (scilab): Reindent.

Change-Id: I4813863a8ef5cb36de597ed31bcce0b34cfb1160
---
 gnu/packages/maths.scm | 139 +++++++++++++++++++++--------------------
 1 file changed, 70 insertions(+), 69 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 68e041c33b..e3045f4fee 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -58,6 +58,7 @@
 ;;; Copyright © 2022, 2023 Liliana Marie Prikler <liliana.prikler@gmail.com>
 ;;; Copyright © 2022 Maximilian Heisinger <mail@maxheisinger.at>
 ;;; Copyright © 2022 Akira Kyle <akira@akirakyle.com>
+;;; Copyright © 2022, 2023 Nicolas Graves <ngraves@ngraves.fr>
 ;;; Copyright © 2022 Roman Scherer <roman.scherer@burningswell.com>
 ;;; Copyright © 2023 Jake Leporte <jakeleporte@outlook.com>
 ;;; Copyright © 2023 Camilo Q.S. (Distopico) <distopico@riseup.net>
@@ -9572,18 +9573,18 @@ (define-public scilab
 
             ;; And finally some files in the modules directory:
             (for-each
-              (lambda (file)
-                (delete-file
-                  (string-append "modules/dynamic_link/src/scripts/" file)))
-              '("aclocal.m4"
-                "configure"
-                "compile"
-                "config.guess"
-                "config.sub"
-                "ltmain.sh"
-                "depcomp"
-                "install-sh"
-                "missing"))
+             (lambda (file)
+               (delete-file
+                (string-append "modules/dynamic_link/src/scripts/" file)))
+             '("aclocal.m4"
+               "configure"
+               "compile"
+               "config.guess"
+               "config.sub"
+               "ltmain.sh"
+               "depcomp"
+               "install-sh"
+               "missing"))
             (delete-file-recursively "modules/dynamic_link/src/scripts/m4")
             (for-each delete-file
                       '("modules/ast/src/cpp/parse/scanscilab.cpp"
@@ -9623,38 +9624,38 @@ (define-public scilab
     (arguments
      (let* ((tcl (this-package-input "tcl"))
             (tk (this-package-input "tk")))
-     (list
-      #:configure-flags
-      #~(list
-         "--enable-relocatable"
-         "--disable-static-system-lib"
-         "--enable-build-parser"
-         ;; Disable all java code.
-         "--without-gui"
-         "--without-javasci"
-         "--disable-build-help"
-         "--with-external-scirenderer"
-         ;; Tcl and Tk library locations.
-         (string-append "--with-tcl-include=" #$tcl "/include")
-         (string-append "--with-tcl-library=" #$tcl "/lib")
-         (string-append "--with-tk-include=" #$tk "/include")
-         (string-append "--with-tk-library=" #$tk "/lib")
-         (string-append "--with-eigen-include="
-                        (search-input-directory %build-inputs "include/eigen3"))
-         ;; Find and link to the OCaml Num package
-         "OCAMLC=ocamlfind ocamlc -package num"
-         "OCAMLOPT=ocamlfind ocamlopt -package num -linkpkg")
-      #:phases
-      #~(modify-phases %standard-phases
-          ;; The Num library is specified with the OCAMLC and
-          ;; OCAMLOPT variables above.
-          (add-after 'unpack 'fix-ocaml-num
-            (lambda _
-              (substitute*
-                '("modules/scicos/Makefile.modelica.am"
-                  "modules/scicos/src/translator/makefile.mak"
-                  "modules/scicos/src/modelica_compiler/makefile.mak")
-                (("nums\\.cmx?a") ""))))
+       (list
+        #:configure-flags
+        #~(list
+           "--enable-relocatable"
+           "--disable-static-system-lib"
+           "--enable-build-parser"
+           ;; Disable all java code.
+           "--without-gui"
+           "--without-javasci"
+           "--disable-build-help"
+           "--with-external-scirenderer"
+           ;; Tcl and Tk library locations.
+           (string-append "--with-tcl-include=" #$tcl "/include")
+           (string-append "--with-tcl-library=" #$tcl "/lib")
+           (string-append "--with-tk-include=" #$tk "/include")
+           (string-append "--with-tk-library=" #$tk "/lib")
+           (string-append "--with-eigen-include="
+                          (search-input-directory %build-inputs "include/eigen3"))
+           ;; Find and link to the OCaml Num package
+           "OCAMLC=ocamlfind ocamlc -package num"
+           "OCAMLOPT=ocamlfind ocamlopt -package num -linkpkg")
+        #:phases
+        #~(modify-phases %standard-phases
+            ;; The Num library is specified with the OCAMLC and
+            ;; OCAMLOPT variables above.
+            (add-after 'unpack 'fix-ocaml-num
+              (lambda _
+                (substitute*
+                    '("modules/scicos/Makefile.modelica.am"
+                      "modules/scicos/src/translator/makefile.mak"
+                      "modules/scicos/src/modelica_compiler/makefile.mak")
+                  (("nums\\.cmx?a") ""))))
             (add-after 'unpack 'restrain-to-scilab-cli
               (lambda _
                 ;; Install only scilab-cli.desktop
@@ -9680,31 +9681,31 @@ (define-public scilab
                 (substitute* "modules/types/Makefile"
                   (("\\$\\(MAKE\\) \\$\\(AM_MAKEFLAGS\\) check-am")
                    ""))))
-          ;; These generated files are assumed to be present during
-          ;; the build.
-          (add-after 'bootstrap 'bootstrap-dynamic_link-scripts
-            (lambda _
-              (with-directory-excursion "modules/dynamic_link/src/scripts"
-                ((assoc-ref %standard-phases 'bootstrap)))))
-          (add-before 'build 'pre-build
-            (lambda* (#:key inputs #:allow-other-keys)
-              ;; Fix scilab script.
-              (substitute* "bin/scilab"
-                (("/bin/ls")
-                 (search-input-file inputs "bin/ls")))
-              ;; Fix core.start.
-              (substitute* "modules/core/etc/core.start"
-                (("'SCI/modules")
-                 "SCI+'/modules"))))
-          ;; Prevent race condition
-          (add-after 'pre-build 'build-parsers
-            (lambda* (#:key (make-flags #~'()) #:allow-other-keys)
-              (with-directory-excursion "modules/ast"
-                (apply invoke "make"
-                       "src/cpp/parse/parsescilab.cpp"
-                       "src/cpp/parse/scanscilab.cpp"
-                       make-flags))))
-          ;; The startup script is mostly there to define the following env
+            ;; These generated files are assumed to be present during
+            ;; the build.
+            (add-after 'bootstrap 'bootstrap-dynamic_link-scripts
+              (lambda _
+                (with-directory-excursion "modules/dynamic_link/src/scripts"
+                  ((assoc-ref %standard-phases 'bootstrap)))))
+            (add-before 'build 'pre-build
+              (lambda* (#:key inputs #:allow-other-keys)
+                ;; Fix scilab script.
+                (substitute* "bin/scilab"
+                  (("/bin/ls")
+                   (search-input-file inputs "bin/ls")))
+                ;; Fix core.start.
+                (substitute* "modules/core/etc/core.start"
+                  (("'SCI/modules")
+                   "SCI+'/modules"))))
+            ;; Prevent race condition
+            (add-after 'pre-build 'build-parsers
+              (lambda* (#:key (make-flags #~'()) #:allow-other-keys)
+                (with-directory-excursion "modules/ast"
+                  (apply invoke "make"
+                         "src/cpp/parse/parsescilab.cpp"
+                         "src/cpp/parse/scanscilab.cpp"
+                         make-flags))))
+            ;; The startup script is mostly there to define the following env
             ;; variables properly. We can do this with guix directly.
             (add-after 'install 'rewrap-scilab-cli
               (lambda _
-- 
2.41.0





  parent reply	other threads:[~2023-11-06  0:05 UTC|newest]

Thread overview: 16+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-09-10 16:18 [bug#65853] [PATCH] gnu: scilab: Fix and hardcode script inputs Nicolas Graves via Guix-patches via
2023-09-28 16:36 ` Efraim Flashner
2023-09-28 18:30   ` Nicolas Graves via Guix-patches via
2023-09-28 19:03 ` [bug#65853] [PATCH v2] " Nicolas Graves via Guix-patches via
2023-10-05 14:51   ` [bug#65853] bug#65857: [PATCH v2 2/2] gnu: scilab: Set SCIHOME default to respect XDG base dirs Ludovic Courtès
2023-10-05 15:09     ` [bug#65857] " Nicolas Graves via Guix-patches via
2023-11-05 23:51 ` [bug#65853] [PATCH v3 0/8] Scilab: Big update Nicolas Graves via Guix-patches via
2023-11-05 23:51   ` [bug#65853] [PATCH v3 1/8] gnu: scilab: Remove uneeded code Nicolas Graves via Guix-patches via
2023-11-05 23:51   ` [bug#65853] [PATCH v3 2/8] gnu: scilab: Activate tests and disable failing tests Nicolas Graves via Guix-patches via
2023-11-05 23:51   ` [bug#65853] [PATCH v3 3/8] gnu: scilab: Use gexp for tcl and tk libraries Nicolas Graves via Guix-patches via
2023-11-05 23:51   ` [bug#65853] [PATCH v3 4/8] gnu: scilab: Add phase rewrap-scilab-cli Nicolas Graves via Guix-patches via
2023-11-05 23:51   ` Nicolas Graves via Guix-patches via [this message]
2023-11-05 23:51   ` [bug#65853] [PATCH v3 6/8] gnu: scilab: Update to 2024.0.0 Nicolas Graves via Guix-patches via
2023-11-05 23:51   ` [bug#65853] [PATCH v3 7/8] gnu: scilab: Add phase set-version Nicolas Graves via Guix-patches via
2023-11-05 23:51   ` [bug#65853] [PATCH v3 8/8] gnu: scilab: Set default SCIHOME value Nicolas Graves via Guix-patches via
2023-11-23 10:30   ` [bug#65857] [PATCH v2 2/2] gnu: scilab: Set SCIHOME default to respect XDG base dirs Ludovic Courtès

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

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

  git send-email \
    --in-reply-to=20231106000354.32423-6-ngraves@ngraves.fr \
    --to=guix-patches@gnu.org \
    --cc=65853@debbugs.gnu.org \
    --cc=ngraves@ngraves.fr \
    /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 external index

	https://git.savannah.gnu.org/cgit/guix.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.