unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Nicolas Graves via Guix-patches via <guix-patches@gnu.org>
To: 70158@debbugs.gnu.org
Cc: ngraves@ngraves.fr
Subject: [bug#70158] [PATCH v2 1/3] gnu: scilab: Cleanup.
Date: Wed, 10 Apr 2024 09:15:13 +0200	[thread overview]
Message-ID: <20240410071517.30074-1-ngraves@ngraves.fr> (raw)
In-Reply-To: <20240403062146.1652-1-ngraves@ngraves.fr>

* gnu/packages/maths.scm (scilab):
  [arguments]<#:phases>: In pre-build phase, remove unecessary
  code, due to the former introduction of the rewrap-scilab-cli
  phase. More robust version setting in the set-version phase. It
  anticipates for the next release which will not use "main" anymore.
  [source]<origin>(snippet) Sort dynamic_link deleted files.
  [inputs]: Add bash-minimal.

Change-Id: I49b17886405e1ed8161e71b51655fa393ff7f10b
---
 gnu/packages/maths.scm | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 03760f3f3e..00b3ed213b 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -9759,9 +9759,9 @@ (define-public scilab
                "compile"
                "config.guess"
                "config.sub"
-               "ltmain.sh"
                "depcomp"
                "install-sh"
+               "ltmain.sh"
                "missing"))
             (delete-file-recursively "modules/dynamic_link/src/scripts/m4")
             (for-each delete-file
@@ -9785,6 +9785,7 @@ (define-public scilab
     (inputs (list `(,pcre "bin")
                   `(,pcre "out")
                   arpack-ng
+                  bash-minimal
                   curl
                   fftw
                   gettext-minimal
@@ -9842,10 +9843,8 @@ (define-public scilab
             (add-after 'unpack 'set-version
               (lambda _
                 (substitute* "modules/core/includes/version.h.in"
-                  (("scilab-branch-main")  ; version
-                   (string-append
-                    "scilab-"
-                    #$(version-major+minor (package-version this-package)))))))
+                  (("branch-[a-z0-9\\.]*")  ; version
+                   #$(version-major+minor (package-version this-package))))))
             (add-after 'unpack 'restrain-to-scilab-cli
               (lambda _
                 ;; Install only scilab-cli.desktop
@@ -9879,10 +9878,6 @@ (define-public scilab
                   ((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")
-- 
2.41.0





  parent reply	other threads:[~2024-04-10  7:17 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-03  6:21 [bug#70158] [PATCH 0/6] Scilab: Fixup install of local Scilab packages Nicolas Graves via Guix-patches via
2024-04-03  6:25 ` [bug#70158] [PATCH 1/6] gnu: scilab: Remove unecessary code Nicolas Graves via Guix-patches via
2024-04-03  6:25   ` [bug#70158] [PATCH 2/6] gnu: scilab: Sort dynamic_link deleted files Nicolas Graves via Guix-patches via
2024-04-03  6:25   ` [bug#70158] [PATCH 3/6] gnu: scilab: Fixup badly-written compilerDetection.sh script Nicolas Graves via Guix-patches via
2024-04-03  6:25   ` [bug#70158] [PATCH 4/6] gnu: scilab: Simpler and more robust version setting Nicolas Graves via Guix-patches via
2024-04-03  6:25   ` [bug#70158] [PATCH 5/6] gnu: scilab: Improve compilerDetection.sh Nicolas Graves via Guix-patches via
2024-04-03  6:25   ` [bug#70158] [PATCH 6/6] gnu: scilab: Improve package management robustness in scilab-cli Nicolas Graves via Guix-patches via
2024-04-10  7:15 ` Nicolas Graves via Guix-patches via [this message]
2024-04-10  7:15   ` [bug#70158] [PATCH v2 2/3] gnu: scilab: Fixup and improve compilerDetection.sh script Nicolas Graves via Guix-patches via
2024-04-23 21:40     ` Nicolas Graves via Guix-patches via
2024-04-10  7:15   ` [bug#70158] [PATCH v2 3/3] gnu: scilab: Improve package management robustness in scilab-cli Nicolas Graves via Guix-patches via
2024-05-01 21:46   ` bug#70158: [PATCH v2 1/3] gnu: scilab: Cleanup 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

  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=20240410071517.30074-1-ngraves@ngraves.fr \
    --to=guix-patches@gnu.org \
    --cc=70158@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 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).