Tobias Geerinckx-Rice <me@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.
Received: (at 65853) by debbugs.gnu.org; 28 Sep 2023 19:03:40 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 28 15:03:40 2023
Received: from localhost ([127.0.0.1]:54505 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qlwIW-0007qi-8m
for submit <at> debbugs.gnu.org; Thu, 28 Sep 2023 15:03:40 -0400
Received: from 10.mo584.mail-out.ovh.net ([188.165.33.109]:46023)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1qlwIS-0007qS-A1
for 65853 <at> debbugs.gnu.org; Thu, 28 Sep 2023 15:03:38 -0400
Received: from director11.ghost.mail-out.ovh.net (unknown [10.108.16.251])
by mo584.mail-out.ovh.net (Postfix) with ESMTP id 1AD5224EB9
for <65853 <at> debbugs.gnu.org>; Thu, 28 Sep 2023 19:03:20 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-9zv2q (unknown [10.110.171.110])
by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id C63EA1FE8C;
Thu, 28 Sep 2023 19:03:19 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.109])
by ghost-submission-6684bf9d7b-9zv2q with ESMTPSA
id paSJLPfNFWWDIwAAAUoqFQ
(envelope-from <ngraves@HIDDEN>); Thu, 28 Sep 2023 19:03:19 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-109S003a3e2bc48-cdc5-49bb-8a5c-ba45762f52fb,
57906430550E741FE59AD178AEB9473F26373A74) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.140.142
From: Nicolas Graves <ngraves@HIDDEN>
To: 65853 <at> debbugs.gnu.org
Subject: [PATCH v2] gnu: scilab: Fix and hardcode script inputs.
Date: Thu, 28 Sep 2023 21:03:10 +0200
Message-ID: <0dd0a7387a8232abd43f484b87f183c9340497b0.1695927790.git.ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
X-Debbugs-Cc: Andreas Enge <andreas@HIDDEN>,
Efraim Flashner <efraim@HIDDEN>, Eric Bavier <bavier@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 14841612575221801698
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrtddtgddutddvucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepfeehgeehleffleejhefhgeefkeektdetvdevhfdvudfggeehueffffdthfduleelnecuffhomhgrihhnpehstghilhgrsgdrohhrghenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegtddrudegvddpfeejrdehledrudegvddruddtleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehkeehfeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekgedpmhhouggvpehsmhhtphhouhht
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65853
Cc: ngraves@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/maths.scm (scilab): Fix script inputs.
[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(-)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 62d4adfbd1..f7e1de41f3 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -8433,22 +8433,25 @@ (define-public scilab
(base32 "0phg9pn24yw98hbh475ik84dnikf1225b2knh7qbhdbdx6fm2d57"))))
(build-system gnu-build-system)
(native-inputs (list pkg-config gfortran))
- (inputs (list libxml2
+ (inputs (list arpack-ng
+ coreutils-minimal
+ curl
+ fftw
+ gettext-minimal
+ grep
+ hdf5-1.8
+ lapack
+ libxml2
+ libx11
+ matio
+ openblas
`(,pcre "bin")
`(,pcre "out")
readline
- hdf5-1.8
- curl
- openblas
- lapack
- arpack-ng
- fftw
- gettext-minimal
+ sed
suitesparse-3
tcl
- tk
- libx11
- matio))
+ tk))
(arguments
`(#:tests? #f
#:configure-flags
@@ -8484,10 +8487,6 @@ (define-public scilab
,#~(modify-phases %standard-phases
(add-before 'build 'pre-build
(lambda _
- ;; Fix scilab script.
- (substitute* "bin/scilab"
- (("\\/bin\\/ls")
- (which "ls")))
;; Fix core.start.
(substitute* "modules/core/etc/core.start"
(("'SCI/modules")
@@ -8519,7 +8518,22 @@ (define-public scilab
(("if \\(array_size > 0\\)")
"if (*array_size > 0)"))
;; Set SCIHOME to /tmp before macros compilation.
- (setenv "SCIHOME" "/tmp"))))))
+ (setenv "SCIHOME" "/tmp")))
+ (add-after 'install 'hardcode-script-inputs
+ (lambda _
+ (substitute* (string-append #$output "/bin/scilab")
+ (("grep")
+ (search-inputs-file #$inputs "/bin/grep"))
+ ((" sed ") ; some "sed" strings are not binaries invocations
+ (string-append " " (search-inputs-file #$inputs "/bin/sed") " "))
+ (("/bin/ls")
+ (search-inputs-file #$inputs "/bin/ls"))
+ (("uname")
+ (search-inputs-file #$inputs "/bin/uname"))
+ (("dirname")
+ (search-inputs-file #$inputs "/bin/dirname"))
+ (("basename")
+ (search-inputs-file #$inputs "/bin/basename"))))))))
(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
--
2.41.0
andreas@HIDDEN, efraim@HIDDEN, bavier@HIDDEN, guix-patches@HIDDEN:bug#65853; Package guix-patches.
Full text available.
Received: (at 65853) by debbugs.gnu.org; 28 Sep 2023 18:31:26 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 28 14:31:26 2023
Received: from localhost ([127.0.0.1]:54484 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qlvnF-0006sY-S3
for submit <at> debbugs.gnu.org; Thu, 28 Sep 2023 14:31:26 -0400
Received: from 11.mo550.mail-out.ovh.net ([188.165.48.29]:52655)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1qlvnA-0006sF-4A
for 65853 <at> debbugs.gnu.org; Thu, 28 Sep 2023 14:31:20 -0400
Received: from director10.ghost.mail-out.ovh.net (unknown [10.108.20.113])
by mo550.mail-out.ovh.net (Postfix) with ESMTP id 2608F275EE
for <65853 <at> debbugs.gnu.org>; Thu, 28 Sep 2023 18:31:00 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-z9cc4 (unknown [10.110.208.79])
by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id BE3951FE89;
Thu, 28 Sep 2023 18:30:59 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.98])
by ghost-submission-6684bf9d7b-z9cc4 with ESMTPSA
id fkwuAGPGFWW1XQIA1FwEXQ
(envelope-from <ngraves@HIDDEN>); Thu, 28 Sep 2023 18:30:58 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-98R002006b10d5-297c-4cf8-a1d2-132440051496,
57906430550E741FE59AD178AEB9473F26373A74) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 81.67.140.142
From: Nicolas Graves <ngraves@HIDDEN>
To: Efraim Flashner <efraim@HIDDEN>
Subject: Re: [bug#65853] [PATCH] gnu: scilab: Fix and hardcode script inputs.
In-Reply-To: <ZRWrh5B6M7acbiZj@3900XT>
References: <0852115dc8e706b80b05d57cfbfae64de79fdac5.1694362722.git.ngraves@HIDDEN>
<ZRWrh5B6M7acbiZj@3900XT>
Date: Thu, 28 Sep 2023 20:30:58 +0200
Message-ID: <87cyy2gnfh.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Ovh-Tracer-Id: 14295551118034264624
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: -100
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrtddtgdelhecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvfevufgjfhffkfggtgesthdtredttddttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeevkeelueejtdehgfffkeelkefhhffftefgvdehkeeluefhheeuleejtdejhfdvgfenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegtddrudegvddpfeejrdehledrudegvddrleeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeiheekheefseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtpdhmohguvgepshhmthhpohhuth
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65853
Cc: 65853 <at> debbugs.gnu.org, Andreas Enge <andreas@HIDDEN>,
Eric Bavier <bavier@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
On 2023-09-28 19:36, Efraim Flashner wrote:
> A couple of things I noticed:
>
> On Sun, Sep 10, 2023 at 06:18:42PM +0200, Nicolas Graves wrote:
>> + coreutils
>
> This can be coreutils-minimal
>
Will change it.
>> + (("grep")
>> + #$(file-append (this-package-input "grep") "/bin/grep"))
>
> These can be (search-input-file #$inputs "/bin/grep") to make it easier
> to swap out the packages for something else if people want.
>
Fine for me.
>> + (("sed")
>
> I checked the script, it should be ((" sed ") since there are a couple
> of instances of 'sed' in the script which aren't invocations of sed.
Yes I indeed noticed it too, probably forgot to resubmit a patch but my
local version works well.
>
>> + #$(file-append (this-package-input "sed") "/bin/sed"))
>> + (("uname")
>> + #$(file-append (this-package-input "coreutils")
>> + "/bin/uname"))
>> + (("dirname")
>> + #$(file-append (this-package-input "coreutils")
>> + "/bin/dirname"))
>> + (("basename")
>> + #$(file-append (this-package-input "coreutils")
>> + "/bin/basename"))))))))
>
> Are there more binaries which should be substituted? I saw glxgears,
> chcon, a couple instances of java, pwd, valgrind, docbook paths. And
> then there's a couple of other scripts and binaries in the bin/ folder.
> I think it'd be better to use wrap-script or wrap-program and then use
> substitute* to strip the leading /usr/bin/ from the different calls to
> the different binaries.
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
guix-patches@HIDDEN:bug#65853; Package guix-patches.
Full text available.
Received: (at 65853) by debbugs.gnu.org; 28 Sep 2023 16:37:05 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Thu Sep 28 12:37:05 2023
Received: from localhost ([127.0.0.1]:54415 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qlu0e-0003Ds-7h
for submit <at> debbugs.gnu.org; Thu, 28 Sep 2023 12:37:04 -0400
Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:44157)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <efraim.flashner@HIDDEN>) id 1qlu0L-0003C5-Qz
for 65853 <at> debbugs.gnu.org; Thu, 28 Sep 2023 12:36:58 -0400
Received: by mail-wm1-x32c.google.com with SMTP id
5b1f17b1804b1-405621baba7so104178025e9.0
for <65853 <at> debbugs.gnu.org>; Thu, 28 Sep 2023 09:36:31 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20230601; t=1695918986; x=1696523786; darn=debbugs.gnu.org;
h=in-reply-to:content-disposition:mime-version:references
:mail-followup-to:message-id:subject:cc:to:from:date:sender:from:to
:cc:subject:date:message-id:reply-to;
bh=VdHj83ljXObjrqeI2Ovudrhj8JUvAuxNcynyVZynAWU=;
b=LLezD0WA21tnkMH+57se61VZItTKCGCVooGzZgnYND33mAzaZ2uvtWBARCk1s5Vc/J
g7s4RWQzwO1UI5ljShaQ44PCzEnspBTW0TE1BHQ9xbN5wg/F0LvFaXll+YaZkDfCSQoY
Hwnm+zUPdiyZzFKIEFvHiWoe5NRPE2xg2wWVD/9OK0GuijDTYAqVcYw8ZHhKSpkxzWeh
7TfI41dDTulNmDBC5BpGVK1Q+EOb60fHC0FYr+obDonrnASASFVjYzcYBHI2uKbCebE6
AUAb0clqfFZ7Upr+Qbl00m+IbS+03oidYzXTHKsYOFPay5dUlPRUfvaXwDJEB0mZ2h//
b7hA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1695918986; x=1696523786;
h=in-reply-to:content-disposition:mime-version:references
:mail-followup-to:message-id:subject:cc:to:from:date:sender
:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to;
bh=VdHj83ljXObjrqeI2Ovudrhj8JUvAuxNcynyVZynAWU=;
b=SaBYMskBhYBbX3IjngmH+sxy+kEM8Rmt53gN/im5s7a3xO5ZPZPgobyzwJsun5rsSU
rd4TRKL6684q2+wDUpLoiNZ7adO14SlyRMv/vmiPnuXeMWAqtrIsTVfgwBREtf1gY3NA
kYYlYx0kSnG6lT6sn9ejq1o5VPs/frUGa/BFj3A4d7SL2f0hNLK3c8ZimOCgOOMHpYgy
2M6o6RgwmqeDcKGcZEkPxa1PJp6a1VpmKl6rbjJWm1HKELjw5Gz71bpKJ4qMZPiLUGhs
c7gvgsjxuCohVoE0RfvLc1eYOSNXA2mmotSPscYK8iWhaqj+a411vekYbgwl+eHiosUi
GP6w==
X-Gm-Message-State: AOJu0Yyisq+P8VFni8JA4ejHuAAELIM5jTBfo/YnnbOJnOkLSqhvIXDU
+5w/Hmhf0LNE7oUPcs82PeA=
X-Google-Smtp-Source: AGHT+IGNOdWi8F8sBRhrmTEI4jbtEW10UB12QPOPwL/ZVjLkjigRzQD8yaju4GpTF41CHKtmUQMBTA==
X-Received: by 2002:a05:600c:21ca:b0:405:3b1f:9691 with SMTP id
x10-20020a05600c21ca00b004053b1f9691mr1791828wmj.11.1695918985403;
Thu, 28 Sep 2023 09:36:25 -0700 (PDT)
Received: from localhost ([2a02:ed3:916:6300:c3db:b80e:a694:a54f])
by smtp.gmail.com with ESMTPSA id
h17-20020a05600c261100b0040642a1df1csm4638304wma.25.2023.09.28.09.36.24
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Thu, 28 Sep 2023 09:36:25 -0700 (PDT)
Date: Thu, 28 Sep 2023 19:36:23 +0300
From: Efraim Flashner <efraim@HIDDEN>
To: Nicolas Graves <ngraves@HIDDEN>
Subject: Re: [bug#65853] [PATCH] gnu: scilab: Fix and hardcode script inputs.
Message-ID: <ZRWrh5B6M7acbiZj@3900XT>
Mail-Followup-To: Efraim Flashner <efraim@HIDDEN>,
Nicolas Graves <ngraves@HIDDEN>, 65853 <at> debbugs.gnu.org,
Andreas Enge <andreas@HIDDEN>, Eric Bavier <bavier@HIDDEN>
References: <0852115dc8e706b80b05d57cfbfae64de79fdac5.1694362722.git.ngraves@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
protocol="application/pgp-signature"; boundary="6ZT+OmuJDgJ9uoeU"
Content-Disposition: inline
In-Reply-To: <0852115dc8e706b80b05d57cfbfae64de79fdac5.1694362722.git.ngraves@HIDDEN>
X-PGP-Key-ID: 0x41AAE7DCCA3D8351
X-PGP-Key: https://flashner.co.il/~efraim/efraim_flashner.asc
X-PGP-Fingerprint: A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
X-Spam-Score: 0.5 (/)
X-Debbugs-Envelope-To: 65853
Cc: 65853 <at> debbugs.gnu.org, Andreas Enge <andreas@HIDDEN>,
Eric Bavier <bavier@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.5 (/)
--6ZT+OmuJDgJ9uoeU
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
A couple of things I noticed:
On Sun, Sep 10, 2023 at 06:18:42PM +0200, Nicolas Graves wrote:
> * gnu/packages/maths.scm (scilab): Fix 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(-)
>=20
> diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
> index 38e71e18f8..40883d71c1 100644
> --- a/gnu/packages/maths.scm
> +++ b/gnu/packages/maths.scm
> @@ -8448,22 +8448,25 @@ (define-public scilab
> (base32 "0phg9pn24yw98hbh475ik84dnikf1225b2knh7qbhdbdx6fm2d57"))=
))
> (build-system gnu-build-system)
> (native-inputs (list pkg-config gfortran))
> - (inputs (list libxml2
> + (inputs (list arpack-ng
> + coreutils
This can be coreutils-minimal
> + curl
> + fftw
> + gettext-minimal
> + grep
> + hdf5-1.8
> + lapack
> + libxml2
> + libx11
> + matio
> + openblas
> `(,pcre "bin")
> `(,pcre "out")
> readline
> - hdf5-1.8
> - curl
> - openblas
> - lapack
> - arpack-ng
> - fftw
> - gettext-minimal
> + sed
> suitesparse-3
> tcl
> - tk
> - libx11
> - matio))
> + tk))
> (arguments
> `(#:tests? #f
> #:configure-flags
> @@ -8534,7 +8537,23 @@ (define-public scilab
> (("if \\(array_size > 0\\)")
> "if (*array_size > 0)"))
> ;; Set SCIHOME to /tmp before macros compilation.
> - (setenv "SCIHOME" "/tmp"))))))
> + (setenv "SCIHOME" "/tmp")))
> + (add-after 'install 'hardcode-script-inputs
> + (lambda _
> + (substitute* (string-append #$output "/bin/scilab")
> + (("grep")
> + #$(file-append (this-package-input "grep") "/bin/grep=
"))
These can be (search-input-file #$inputs "/bin/grep") to make it easier
to swap out the packages for something else if people want.
> + (("sed")
I checked the script, it should be ((" sed ") since there are a couple
of instances of 'sed' in the script which aren't invocations of sed.
> + #$(file-append (this-package-input "sed") "/bin/sed"))
> + (("uname")
> + #$(file-append (this-package-input "coreutils")
> + "/bin/uname"))
> + (("dirname")
> + #$(file-append (this-package-input "coreutils")
> + "/bin/dirname"))
> + (("basename")
> + #$(file-append (this-package-input "coreutils")
> + "/bin/basename"))))))))
Are there more binaries which should be substituted? I saw glxgears,
chcon, a couple instances of java, pwd, valgrind, docbook paths. And
then there's a couple of other scripts and binaries in the bin/ folder.
I think it'd be better to use wrap-script or wrap-program and then use
substitute* to strip the leading /usr/bin/ from the different calls to
the different binaries.
> (home-page "https://scilab.org")
> (synopsis "Software for engineers and scientists")
> (description "This package provides the non-graphical version of the=
Scilab
>=20
> base-commit: 2eb6df537c36da8bf8e81ff698421f6fb1bfd1ab
> prerequisite-patch-id: eb618ab7b10483d917c308a38792af98baa517e2
> prerequisite-patch-id: 40b6c9f09f27833367a71ec25d77afae4d2a835e
> prerequisite-patch-id: c12968d02d99c253f858586a86b16fa32d41f1c1
> prerequisite-patch-id: 09d995d48139f8e61183d5634cda13a01cdb50f7
> prerequisite-patch-id: 86baa45ec2aad977c8c8135f7613aa391155de6d
> prerequisite-patch-id: 3425fbbff6a603d60b4e143ea2141aabf4ddc92c
> prerequisite-patch-id: c373c01aab5dcba3503a97d51c62a595147a041c
> prerequisite-patch-id: cda857c790b88c681c4e713c5f71e40291970daf
> prerequisite-patch-id: 8e234d0f4d93d2aad499eec8842be3d28da98707
> prerequisite-patch-id: 5f664cb2fd995a53765c5ffc19a708ac795cc0c4
> prerequisite-patch-id: ed447cba9cf9b7e1a1b47aa27acb14f8f2da0a8e
> prerequisite-patch-id: 9f80c5bbbfb8cd3347951c4d57634e93ffa79924
> prerequisite-patch-id: 1aaa9f0d466e2d6837f75844df48a98beb70ff24
> prerequisite-patch-id: 34502820d8c0355b3ed2638c457084edeaba029d
> prerequisite-patch-id: a96258da9e78cfb9ac9893cdcdeb38b69b75f134
> --=20
> 2.41.0
>=20
>=20
>=20
--=20
Efraim Flashner <efraim@HIDDEN> =D7=A8=D7=A0=D7=A9=D7=9C=D7=A4 =
=D7=9D=D7=99=D7=A8=D7=A4=D7=90
GPG key =3D A28B F40C 3E55 1372 662D 14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted
--6ZT+OmuJDgJ9uoeU
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iQIzBAABCAAdFiEEoov0DD5VE3JmLRT3Qarn3Mo9g1EFAmUVq4cACgkQQarn3Mo9
g1EG4hAAh8ME+50XTo564T8EC73SMtQi7n5FeQhzf16YBIT2ccY7lrOosPE3JnZm
vEnqscq6w84GBsOYrzGc7K/VHri6r0WNnnKuOtMY18rP2rK+a3ktFSytHBKlwUgr
yWnW42aHp1FaNp1Xz4MdscQ5QBhEAZiMaYX42+D+OHbzvWpRm7csy8+GOASOecQN
8HMhNIW7g4g4IFXQhEMqCAT3ehc5B+Ajeb58bqCWn0FVvNk4CEyJMs7fw8efvqA8
riQobkgHgWejTGM1lb7Z0M5cAc/ZPlYhmXBmxT+yKMrqbiepB6IWXew7bK7WOSIM
sGkzxAyIVteFomx54U5z/66l+9Y/muaiarnWwnZLjYN6ts2tQUPtIxM5PjklFgAs
zsXxhMO1S/j0yLzk8n2EwynuAMpnXntZZdItTkIVpGYxN4dsLmrRfunB0D1w4i61
dyEVWfV0mqs+YdnHTXatBdpvkZtPOmH5OwsHJrKnx7wGzA2hR7HgZHSUaolSgpfL
sfVefMKenCm3d2YbX2EIED8f8/bcvyXWMOzdeg5NXAhnpop4m8AND39D0wx2WWmF
2bCuuwdfUQXS2HpIqr/q5qEShhyhF3JnL1a8uC/Iy6Opz8ZqbvAGdkYF9nPdPCjH
znFRBo28MP2U6/5ZdANxb1Auq3WxUq8qek8BgFxTDw7FfEPtDUQ=
=D1b/
-----END PGP SIGNATURE-----
--6ZT+OmuJDgJ9uoeU--
guix-patches@HIDDEN:bug#65853; Package guix-patches.
Full text available.Nicolas Graves <ngraves@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.
Received: (at submit) by debbugs.gnu.org; 10 Sep 2023 16:19:26 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun Sep 10 12:19:26 2023
Received: from localhost ([127.0.0.1]:51162 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qfN9h-0008Te-GZ
for submit <at> debbugs.gnu.org; Sun, 10 Sep 2023 12:19:25 -0400
Received: from lists.gnu.org ([2001:470:142::17]:40940)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <ngraves@HIDDEN>) id 1qfN9e-0008TO-1x
for submit <at> debbugs.gnu.org; Sun, 10 Sep 2023 12:19:24 -0400
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <ngraves@HIDDEN>)
id 1qfN9U-0001G5-7B
for guix-patches@HIDDEN; Sun, 10 Sep 2023 12:19:12 -0400
Received: from 6.mo576.mail-out.ovh.net ([46.105.50.107])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <ngraves@HIDDEN>)
id 1qfN9R-00035n-7s
for guix-patches@HIDDEN; Sun, 10 Sep 2023 12:19:11 -0400
Received: from director7.ghost.mail-out.ovh.net (unknown [10.109.143.24])
by mo576.mail-out.ovh.net (Postfix) with ESMTP id 685701FED7
for <guix-patches@HIDDEN>; Sun, 10 Sep 2023 16:18:53 +0000 (UTC)
Received: from ghost-submission-6684bf9d7b-pf5gp (unknown [10.110.208.180])
by director7.ghost.mail-out.ovh.net (Postfix) with ESMTPS id DD1A11FD6B;
Sun, 10 Sep 2023 16:18:52 +0000 (UTC)
Received: from ngraves.fr ([37.59.142.108])
by ghost-submission-6684bf9d7b-pf5gp with ESMTPSA
id FL5sL2zs/WQNSyMAiQkz4w
(envelope-from <ngraves@HIDDEN>); Sun, 10 Sep 2023 16:18:52 +0000
Authentication-Results: garm.ovh; auth=pass
(GARM-108S0021995a29d-65fa-46f3-81c5-8ec26a588486,
093A30F52D67F1E631810F39359834EEDB6571F2) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 176.179.132.86
From: Nicolas Graves <ngraves@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH] gnu: scilab: Fix and hardcode script inputs.
Date: Sun, 10 Sep 2023 18:18:42 +0200
Message-ID: <0852115dc8e706b80b05d57cfbfae64de79fdac5.1694362722.git.ngraves@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
X-Debbugs-Cc: Andreas Enge <andreas@HIDDEN>,
Efraim Flashner <efraim@HIDDEN>, Eric Bavier <bavier@HIDDEN>
Content-Transfer-Encoding: 8bit
X-Ovh-Tracer-Id: 17036272966845784802
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedviedrudeivddgleekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepfeehgeehleffleejhefhgeefkeektdetvdevhfdvudfggeehueffffdthfduleelnecuffhomhgrihhnpehstghilhgrsgdrohhrghenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudefvddrkeeipdefjedrheelrddugedvrddutdeknecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopehguhhigidqphgrthgthhgvshesghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejiedpmhhouggvpehsmhhtphhouhht
Received-SPF: pass client-ip=46.105.50.107; envelope-from=ngraves@HIDDEN;
helo=6.mo576.mail-out.ovh.net
X-Spam_score_int: -18
X-Spam_score: -1.9
X-Spam_bar: -
X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001,
RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.0 (+)
X-Debbugs-Envelope-To: submit
Cc: ngraves@HIDDEN
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.0 (/)
* gnu/packages/maths.scm (scilab): Fix 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(-)
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm
index 38e71e18f8..40883d71c1 100644
--- a/gnu/packages/maths.scm
+++ b/gnu/packages/maths.scm
@@ -8448,22 +8448,25 @@ (define-public scilab
(base32 "0phg9pn24yw98hbh475ik84dnikf1225b2knh7qbhdbdx6fm2d57"))))
(build-system gnu-build-system)
(native-inputs (list pkg-config gfortran))
- (inputs (list libxml2
+ (inputs (list arpack-ng
+ coreutils
+ curl
+ fftw
+ gettext-minimal
+ grep
+ hdf5-1.8
+ lapack
+ libxml2
+ libx11
+ matio
+ openblas
`(,pcre "bin")
`(,pcre "out")
readline
- hdf5-1.8
- curl
- openblas
- lapack
- arpack-ng
- fftw
- gettext-minimal
+ sed
suitesparse-3
tcl
- tk
- libx11
- matio))
+ tk))
(arguments
`(#:tests? #f
#:configure-flags
@@ -8534,7 +8537,23 @@ (define-public scilab
(("if \\(array_size > 0\\)")
"if (*array_size > 0)"))
;; Set SCIHOME to /tmp before macros compilation.
- (setenv "SCIHOME" "/tmp"))))))
+ (setenv "SCIHOME" "/tmp")))
+ (add-after 'install 'hardcode-script-inputs
+ (lambda _
+ (substitute* (string-append #$output "/bin/scilab")
+ (("grep")
+ #$(file-append (this-package-input "grep") "/bin/grep"))
+ (("sed")
+ #$(file-append (this-package-input "sed") "/bin/sed"))
+ (("uname")
+ #$(file-append (this-package-input "coreutils")
+ "/bin/uname"))
+ (("dirname")
+ #$(file-append (this-package-input "coreutils")
+ "/bin/dirname"))
+ (("basename")
+ #$(file-append (this-package-input "coreutils")
+ "/bin/basename"))))))))
(home-page "https://scilab.org")
(synopsis "Software for engineers and scientists")
(description "This package provides the non-graphical version of the Scilab
base-commit: 2eb6df537c36da8bf8e81ff698421f6fb1bfd1ab
prerequisite-patch-id: eb618ab7b10483d917c308a38792af98baa517e2
prerequisite-patch-id: 40b6c9f09f27833367a71ec25d77afae4d2a835e
prerequisite-patch-id: c12968d02d99c253f858586a86b16fa32d41f1c1
prerequisite-patch-id: 09d995d48139f8e61183d5634cda13a01cdb50f7
prerequisite-patch-id: 86baa45ec2aad977c8c8135f7613aa391155de6d
prerequisite-patch-id: 3425fbbff6a603d60b4e143ea2141aabf4ddc92c
prerequisite-patch-id: c373c01aab5dcba3503a97d51c62a595147a041c
prerequisite-patch-id: cda857c790b88c681c4e713c5f71e40291970daf
prerequisite-patch-id: 8e234d0f4d93d2aad499eec8842be3d28da98707
prerequisite-patch-id: 5f664cb2fd995a53765c5ffc19a708ac795cc0c4
prerequisite-patch-id: ed447cba9cf9b7e1a1b47aa27acb14f8f2da0a8e
prerequisite-patch-id: 9f80c5bbbfb8cd3347951c4d57634e93ffa79924
prerequisite-patch-id: 1aaa9f0d466e2d6837f75844df48a98beb70ff24
prerequisite-patch-id: 34502820d8c0355b3ed2638c457084edeaba029d
prerequisite-patch-id: a96258da9e78cfb9ac9893cdcdeb38b69b75f134
--
2.41.0
Nicolas Graves <ngraves@HIDDEN>:andreas@HIDDEN, efraim@HIDDEN, bavier@HIDDEN, guix-patches@HIDDEN.
Full text available.andreas@HIDDEN, efraim@HIDDEN, bavier@HIDDEN, guix-patches@HIDDEN:bug#65853; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.