[PATCH] gnu: scilab: Fix and hardcode script inputs.

[inputs]: Reorder alphabetically. Add coreutils, grep, sed.

[arguments](phases): Add phase hardcode-script-inputs.

---

gnu/packages/maths.scm | 43 ++++++++++++++++++++++++++++++------------

1 file changed, 31 insertions(+), 12 deletions(-)

merge 65853 65856 65857

--

Best regards,

Nicolas Graves

On 2023-09-28 19:36, Efraim Flashner wrote:

Will change it.

Fine for me.

Yes I indeed noticed it too, probably forgot to resubmit a patch but my

local version works well.

I don't use more than that for a CLI usage. The thing is that we already

build without the GUI (so without java). Maybe valgrind could be useful

for debugging, docbook for documentation...

I'll take a look in the coming weeks, but I can guarantee it works for

me, so I propose we should process with this one, and add other patches

on top when someone needs them. But we should be mindful that all

possible paths / binaries are not reachable when the script is run

(IIRC, they also depend on the OS and options).

--

Best regards,

Nicolas Graves

[inputs]: Reorder alphabetically. Add coreutils-minimal, grep, sed.

[arguments](phases): Add phase hardcode-script-inputs.

---

gnu/packages/maths.scm | 46 +++++++++++++++++++++++++++---------------

1 file changed, 30 insertions(+), 16 deletions(-)

merge 65857 65856 65853

Hi,

Nicolas Graves <ngraves@ngraves.fr> skribis:

I’ll contradict Efraim, but hopefully they’ll pardon me: I’d write it

like so:

(lambda* (#:key inputs #:allow-other-keys)

(substitute* …

(("grep")

(search-input-file inputs "/bin/grep"))))

That way it’ll DTRT even when creating a variant of this package.

(The code above had a typo too, with “inputs” as plural.)

Could you send one last updated patch?

Thanks,

Ludo’.

On 2023-10-05 16:51, Ludovic Courtès wrote:

Yes, it also has to be rebased now that scilab is version 2023.

--

Best regards,

Nicolas Graves

This patch series now introduces several changes to the scilab package:

1) non-failing tests are included. failing tests are harder to fix,

but it identifies these places quite well.

2) I've read the scilab-cli script to understand that it basically only serves to properly define a few environment variables. We don't need 40ko for this, so I've rewrapped the script to have a clean 110 lines guix-defined scilab-cli. We loose some low-level debugging functionality, but we didn't set the right inputs for this low-level debugging anyway, and I don't expect Scilab developpers to be using guix right now, so that's fine for now. Later we can wrap the script or hardcode inputs if someone needs it.

3) Updated the version to 2024.0.0. We don't need the hdf5 patch anymore.

4) Set the version so that the welcoming message is up-to-date (not the timestamp though).

5) Set a SCIHOME default value that matches XDG base dirs specification, and doesn't override user-set -scihome (since it happens after when scilab-cli -scihome is called). Now SCIHOME doesn't seem to be read from the user environment at all, so the only way is through -scihome.

Nicolas Graves (8):

gnu: scilab: Remove uneeded code.

gnu: scilab: Activate tests and disable failing tests.

gnu: scilab: Use gexp for tcl and tk libraries.

gnu: scilab: Add phase rewrap-scilab-cli.

gnu: scilab: Reindent.

gnu: scilab: Update to 2024.0.0.

gnu: scilab: Add phase set-version.

gnu: scilab: Set default SCIHOME value.

gnu/packages/maths.scm | 236 +++++++++++-------

.../patches/scilab-hdf5-1.8-api.patch | 71 ------

2 files changed, 141 insertions(+), 166 deletions(-)

delete mode 100644 gnu/packages/patches/scilab-hdf5-1.8-api.patch

--

2.41.0

[arguments]:

(tests?): Activate tests.

(phases):

[remove-desktop-files]: Extend and rename to restrain-to-scilab-cli.

[disable-failing-tests]: Add phase.

Change-Id: Icfec349c6efe14e7787ba8d385e5d51f82be82ea

---

gnu/packages/maths.scm | 33 +++++++++++++++++++++++++--------

1 file changed, 25 insertions(+), 8 deletions(-)

[argments](configure-flags): Use gexp for tcl and tk libraries.

Change-Id: I31fe9a9e2afd9b6266a2e7a2c7044b3c9d0dfa4f

---

gnu/packages/maths.scm | 20 +++++++-------------

1 file changed, 7 insertions(+), 13 deletions(-)

Change-Id: Ia3ca5df1a4795c34b6c1cdc8c3b0d7cc2badf0cb

---

gnu/packages/maths.scm | 22 +++++++++++++++++++++-

1 file changed, 21 insertions(+), 1 deletion(-)

Change-Id: I4813863a8ef5cb36de597ed31bcce0b34cfb1160

---

gnu/packages/maths.scm | 139 +++++++++++++++++++++--------------------

1 file changed, 70 insertions(+), 69 deletions(-)

Change-Id: Ie1af4dc620cee644388f6b8acf88ea50c4148b65

---

gnu/packages/maths.scm | 16 +++--

.../patches/scilab-hdf5-1.8-api.patch | 71 -------------------

2 files changed, 11 insertions(+), 76 deletions(-)

delete mode 100644 gnu/packages/patches/scilab-hdf5-1.8-api.patch

[source](snippet): Remove directory Visual-Studio-settings and file Scilab.sln.

[arguments](configure-flags):

Remove uneeded FFLAGS environment variable set.

[arguments](phases):

prebuild: Remove uneeded SCIHOME setting code.

Change-Id: I71c044e19617bf556bbe95e7ba0cdbd716921055

---

gnu/packages/maths.scm | 15 ++++++---------

1 file changed, 6 insertions(+), 9 deletions(-)

[arguments](phases): Add phase set-version.

Change-Id: I0e461a229931d159196cae73d1db584250c579b2

---

gnu/packages/maths.scm | 7 +++++++

1 file changed, 7 insertions(+)

[argmuments](phases)[rewrap-scilab-cli]: Set default -scihome option

to respect XDG base dirs specification.

Change-Id: I9b55758a3ca1fbc523c3e40e891a2462f3246390

---

gnu/packages/maths.scm | 8 ++++++--

1 file changed, 6 insertions(+), 2 deletions(-)

Hi Nicolas,

Nicolas Graves <ngraves@ngraves.fr> skribis:

I added one commit log that was mostly missing and applied the whole

series. Thank you!

Ludo’.