GNU bug report logs - #65857
[PATCH v2 2/2] gnu: scilab: Set SCIHOME default to respect XDG base dirs.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 65857 in the body.
You can then email your comments to 65857 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: guix-patches <at> gnu.org
Cc: ngraves <at> ngraves.fr
Subject: [PATCH v2 2/2] gnu: scilab: Set SCIHOME default to respect XDG base
 dirs.
Date: Sun, 10 Sep 2023 19:43:41 +0200

* gnu/packages/maths.scm (scilab): Set SCIHOME default to respect XDG base dirs.
[arguments](phases): Add phase respect-xdg-base-dirs.
---
 gnu/packages/maths.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 900a9f0fac..8162ab95d1 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -8553,7 +8553,14 @@ (define-public scilab
                                   "/bin/dirname"))
                   (("basename")
                    #$(file-append (this-package-input "coreutils")
-                                  "/bin/basename"))))))))
+                                  "/bin/basename")))))
+            (add-after 'hardcode-script-inputs 'respect-xdg-base-dirs
+              (lambda _
+                (substitute* (string-append #$output "/bin/scilab")
+                  (("IS_SCILAB_BINARY=0" all)
+                   (string-append all
+                                  "\n[ -n \"$SCIHOME\" ] &&\
+ SCIHOME=\"${XDG_STATE_HOME}/scilab\""))))))))
     (home-page "https://scilab.org")
     (synopsis "Software for engineers and scientists")
     (description "This package provides the non-graphical version of the Scilab
-- 
2.41.0

Message #10 received at 65857 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: 65857 <at> debbugs.gnu.org
Cc: ngraves <at> ngraves.fr
Subject: [PATCH v2] gnu: scilab: Set SCIHOME default to respect XDG base dirs.
Date: Thu, 28 Sep 2023 21:05:06 +0200

* gnu/packages/maths.scm (scilab): Set SCIHOME default to respect XDG base dirs.
[arguments](phases): Add phase respect-xdg-base-dirs.
---
 gnu/packages/maths.scm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index f7e1de41f3..580d98417c 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -8533,7 +8533,14 @@ (define-public scilab
                   (("dirname")
                    (search-inputs-file #$inputs "/bin/dirname"))
                   (("basename")
-                   (search-inputs-file #$inputs "/bin/basename"))))))))
+                   (search-inputs-file #$inputs "/bin/basename")))))
+            (add-after 'hardcode-script-inputs 'respect-xdg-base-dirs
+              (lambda _
+                (substitute* (string-append #$output "/bin/scilab")
+                  (("IS_SCILAB_BINARY=0" all)
+                   (string-append all
+                                  "\n[ -n \"$SCIHOME\" ] &&\
+ SCIHOME=\"${XDG_STATE_HOME:$HOME/.local/state}/scilab\""))))))))
     (home-page "https://scilab.org")
     (synopsis "Software for engineers and scientists")
     (description "This package provides the non-graphical version of the Scilab

base-commit: f9784991eb6c7ec1a20f76d080873a3319be0908
prerequisite-patch-id: 5ec00d550739652cba67dc8663fbde73ff268491
-- 
2.41.0

Message #15 received at 65857 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Nicolas Graves <ngraves <at> ngraves.fr>
Cc: 65853 <at> debbugs.gnu.org, Eric Bavier <bavier <at> posteo.net>,
 Andreas Enge <andreas <at> enge.fr>, 65857 <at> debbugs.gnu.org,
 Efraim Flashner <efraim <at> flashner.co.il>
Subject: Re: bug#65857: [PATCH v2 2/2] gnu: scilab: Set SCIHOME default to
 respect XDG base dirs.
Date: Thu, 05 Oct 2023 16:51:27 +0200

Hi,

Nicolas Graves <ngraves <at> ngraves.fr> skribis:

> +            (add-after 'install 'hardcode-script-inputs
> +              (lambda _
> +                (substitute* (string-append #$output "/bin/scilab")
> +                  (("grep")
> +                   (search-inputs-file #$inputs "/bin/grep"))

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’.

Message #18 received at 65857 <at> debbugs.gnu.org (full text, mbox):

From: Nicolas Graves <ngraves <at> ngraves.fr>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: 65853 <at> debbugs.gnu.org, Eric Bavier <bavier <at> posteo.net>,
 Andreas Enge <andreas <at> enge.fr>, 65857 <at> debbugs.gnu.org,
 Efraim Flashner <efraim <at> flashner.co.il>
Subject: Re: bug#65857: [PATCH v2 2/2] gnu: scilab: Set SCIHOME default to
 respect XDG base dirs.
Date: Thu, 05 Oct 2023 17:09:20 +0200

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

> Hi,
>
> Nicolas Graves <ngraves <at> ngraves.fr> skribis:
>
>> +            (add-after 'install 'hardcode-script-inputs
>> +              (lambda _
>> +                (substitute* (string-append #$output "/bin/scilab")
>> +                  (("grep")
>> +                   (search-inputs-file #$inputs "/bin/grep"))
>
> 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?

Yes, it also has to be rebased now that scilab is version 2023. 
>
> Thanks,
> Ludo’.

-- 
Best regards,
Nicolas Graves

Message #21 received at 65857-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Nicolas Graves <ngraves <at> ngraves.fr>
Cc: 65853-done <at> debbugs.gnu.org, 65857-done <at> debbugs.gnu.org
Subject: Re: bug#65857: [PATCH v2 2/2] gnu: scilab: Set SCIHOME default to
 respect XDG base dirs.
Date: Thu, 23 Nov 2023 11:30:42 +0100

Hi Nicolas,

Nicolas Graves <ngraves <at> ngraves.fr> skribis:

>   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.

I added one commit log that was mostly missing and applied the whole
series.  Thank you!

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.