From unknown Sun Jun 22 11:46:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65853] [PATCH] gnu: scilab: Fix and hardcode script inputs. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Sun, 10 Sep 2023 16:20:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 65853 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65853@debbugs.gnu.org Cc: ngraves@ngraves.fr, Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by submit@debbugs.gnu.org id=B.169436276632595 (code B ref -1); Sun, 10 Sep 2023 16:20:02 +0000 Received: (at submit) by debbugs.gnu.org; 10 Sep 2023 16:19:26 +0000 Received: from localhost ([127.0.0.1]:51162 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfN9h-0008Te-GZ for submit@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 ) id 1qfN9e-0008TO-1x for submit@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 ) id 1qfN9U-0001G5-7B for guix-patches@gnu.org; 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 ) id 1qfN9R-00035n-7s for guix-patches@gnu.org; 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 ; 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 ); Sun, 10 Sep 2023 16:18:52 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-108S0021995a29d-65fa-46f3-81c5-8ec26a588486, 093A30F52D67F1E631810F39359834EEDB6571F2) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.132.86 From: Nicolas Graves Date: Sun, 10 Sep 2023 18:18:42 +0200 Message-ID: <0852115dc8e706b80b05d57cfbfae64de79fdac5.1694362722.git.ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 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@ngraves.fr; 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" 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 From debbugs-submit-bounces@debbugs.gnu.org Sun Sep 10 13:49:35 2023 Received: (at control) by debbugs.gnu.org; 10 Sep 2023 17:49:35 +0000 Received: from localhost ([127.0.0.1]:51269 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfOYx-00056w-9X for submit@debbugs.gnu.org; Sun, 10 Sep 2023 13:49:35 -0400 Received: from 19.mo584.mail-out.ovh.net ([87.98.179.66]:40911) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfOYv-00056o-Fi for control@debbugs.gnu.org; Sun, 10 Sep 2023 13:49:34 -0400 Received: from director2.ghost.mail-out.ovh.net (unknown [10.108.16.222]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id BBCD024D1A for ; Sun, 10 Sep 2023 17:49:28 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-t95hk (unknown [10.110.208.213]) by director2.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 7A7F71FD67 for ; Sun, 10 Sep 2023 17:49:28 +0000 (UTC) Received: from ngraves.fr ([37.59.142.110]) by ghost-submission-6684bf9d7b-t95hk with ESMTPSA id DZqJGKgB/mSsIBgAeioZ3w (envelope-from ) for ; Sun, 10 Sep 2023 17:49:28 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-110S0040592c80a-0b2c-4b3f-9042-67c05eea7124, 093A30F52D67F1E631810F39359834EEDB6571F2) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.132.86 From: Nicolas Graves To: control@debbugs.gnu.org Subject: Date: Sun, 10 Sep 2023 19:49:27 +0200 Message-ID: <87wmwxyl3s.fsf@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain X-Ovh-Tracer-Id: 119345393912963685 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 10 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedviedrudeivddgudduiecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecugfhmphhthicushhusghjvggtthculddutddmnecujfgurhephffvufffkfggtgesthdtredttddttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeeujeelieeljeffhfelteejtdeljeehveduffelvefgudefkeehgfdvvdevgeevfeenucfkphepuddvjedrtddrtddruddpudejiedrudejledrudefvddrkeeipdefjedrheelrddugedvrdduuddtnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopegtohhnthhrohhlseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeegpdhmohguvgepshhmthhpohhuth X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: merge 65853 65856 65857 -- Best regards, Nicolas Graves Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [87.98.179.66 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [87.98.179.66 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 2.0 BLANK_SUBJECT Subject is present but empty X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) merge 65853 65856 65857 -- Best regards, Nicolas Graves From unknown Sun Jun 22 11:46:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65853] [PATCH] gnu: scilab: Fix and hardcode script inputs. Resent-From: Efraim Flashner Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Sep 2023 16:38:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65853 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Nicolas Graves Cc: 65853@debbugs.gnu.org, Andreas Enge , Eric Bavier Received: via spool by 65853-submit@debbugs.gnu.org id=B65853.169591902512415 (code B ref 65853); Thu, 28 Sep 2023 16:38:01 +0000 Received: (at 65853) by debbugs.gnu.org; 28 Sep 2023 16:37:05 +0000 Received: from localhost ([127.0.0.1]:54415 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlu0e-0003Ds-7h for submit@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 ) id 1qlu0L-0003C5-Qz for 65853@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@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 Message-ID: Mail-Followup-To: Efraim Flashner , Nicolas Graves , 65853@debbugs.gnu.org, Andreas Enge , Eric Bavier References: <0852115dc8e706b80b05d57cfbfae64de79fdac5.1694362722.git.ngraves@ngraves.fr> 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@ngraves.fr> 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" 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 =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-- From unknown Sun Jun 22 11:46:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65853] [PATCH] gnu: scilab: Fix and hardcode script inputs. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 28 Sep 2023 18:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65853 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Efraim Flashner Cc: 65853@debbugs.gnu.org, Andreas Enge , Eric Bavier Received: via spool by 65853-submit@debbugs.gnu.org id=B65853.169592588626455 (code B ref 65853); Thu, 28 Sep 2023 18:32:02 +0000 Received: (at 65853) by debbugs.gnu.org; 28 Sep 2023 18:31:26 +0000 Received: from localhost ([127.0.0.1]:54484 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlvnF-0006sY-S3 for submit@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 ) id 1qlvnA-0006sF-4A for 65853@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@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 ); Thu, 28 Sep 2023 18:30:58 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-98R002006b10d5-297c-4cf8-a1d2-132440051496, 57906430550E741FE59AD178AEB9473F26373A74) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 From: Nicolas Graves In-Reply-To: References: <0852115dc8e706b80b05d57cfbfae64de79fdac5.1694362722.git.ngraves@ngraves.fr> Date: Thu, 28 Sep 2023 20:30:58 +0200 Message-ID: <87cyy2gnfh.fsf@ngraves.fr> 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" 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 From unknown Sun Jun 22 11:46:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65853] [PATCH v2] gnu: scilab: Fix and hardcode script inputs. References: <0852115dc8e706b80b05d57cfbfae64de79fdac5.1694362722.git.ngraves@ngraves.fr> In-Reply-To: <0852115dc8e706b80b05d57cfbfae64de79fdac5.1694362722.git.ngraves@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: andreas@enge.fr, efraim@flashner.co.il, bavier@posteo.net, guix-patches@gnu.org Resent-Date: Thu, 28 Sep 2023 19:04:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65853 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65853@debbugs.gnu.org Cc: ngraves@ngraves.fr, Andreas Enge , Efraim Flashner , Eric Bavier X-Debbugs-Original-Xcc: Andreas Enge , Efraim Flashner , Eric Bavier Received: via spool by 65853-submit@debbugs.gnu.org id=B65853.169592782030180 (code B ref 65853); Thu, 28 Sep 2023 19:04:01 +0000 Received: (at 65853) by debbugs.gnu.org; 28 Sep 2023 19:03:40 +0000 Received: from localhost ([127.0.0.1]:54505 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlwIW-0007qi-8m for submit@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 ) id 1qlwIS-0007qS-A1 for 65853@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@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 ); Thu, 28 Sep 2023 19:03:19 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-109S003a3e2bc48-cdc5-49bb-8a5c-ba45762f52fb, 57906430550E741FE59AD178AEB9473F26373A74) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 From: Nicolas Graves Date: Thu, 28 Sep 2023 21:03:10 +0200 Message-ID: <0dd0a7387a8232abd43f484b87f183c9340497b0.1695927790.git.ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 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-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" 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 From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 28 15:13:00 2023 Received: (at control) by debbugs.gnu.org; 28 Sep 2023 19:13:00 +0000 Received: from localhost ([127.0.0.1]:54529 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlwRX-00086R-OG for submit@debbugs.gnu.org; Thu, 28 Sep 2023 15:12:59 -0400 Received: from tobias.gr ([80.241.217.52]:47558) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlwRV-00086H-AB for control@debbugs.gnu.org; Thu, 28 Sep 2023 15:12:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=2018; bh=+tijKfbSKwoyJ XCMejNj2IeHutw2iOXqySfmWpxEfA4=; h=to:from:date; d=tobias.gr; b=CoVE7Y GJ7HOMIgHp8Q2xKGDcrS6XmlxLrRkR5nMZR5Zdueq+So3yy1XLgUuIkdBHvkplvA3cKSiH 78Mv1MhRLwoD2zVPQ2E8HFQb1blca+eMACiyu16l9JV32taHA5e3lrud0qhpOOU41agykM B7DFWl50K9yaErswIy0i/oQngZkvGeUYtU1Qv7CJDhCbNxhwrtk9h9hA1TYoNW7vZwPlXp W9sBaKalI0YwZOkDqJucdea17qgcU88PfeUZxdEZ0K1C5eeTRFTi7Y7HuixE0yBEvs1i5d Twuqmb3+5hvl/QaxKd18P3NeYPHd7v7/iQkus5CU9tTt4qUAcQ2cgNYg== Received: by submission.tobias.gr (OpenSMTPD) with ESMTP id 11fb7089 for ; Thu, 28 Sep 2023 19:12:39 +0000 (UTC) MIME-Version: 1.0 Date: Thu, 28 Sep 2023 21:12:39 +0200 From: Tobias Geerinckx-Rice To: control@debbugs.gnu.org Message-ID: <555ae5875d161140e91feb94486ba7d6@tobias.gr> Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: 2.0 (++) X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: merge 65857 65856 65853 Content analysis details: (2.0 points, 10.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 1.8 MISSING_SUBJECT Missing Subject: header 0.2 NO_SUBJECT Extra score for no subject X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: 1.0 (+) merge 65857 65856 65853 From unknown Sun Jun 22 11:46:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65853] bug#65857: [PATCH v2 2/2] gnu: scilab: Set SCIHOME default to respect XDG base dirs. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Oct 2023 14:52:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65853 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Nicolas Graves Cc: 65853@debbugs.gnu.org, Eric Bavier , Andreas Enge , 65857@debbugs.gnu.org, Efraim Flashner Received: via spool by 65853-submit@debbugs.gnu.org id=B65853.16965175192217 (code B ref 65853); Thu, 05 Oct 2023 14:52:01 +0000 Received: (at 65853) by debbugs.gnu.org; 5 Oct 2023 14:51:59 +0000 Received: from localhost ([127.0.0.1]:48115 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoPhm-0000Zc-QA for submit@debbugs.gnu.org; Thu, 05 Oct 2023 10:51:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49958) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoPhj-0000ZI-Sk; Thu, 05 Oct 2023 10:51:56 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qoPhK-0002Qf-Qw; Thu, 05 Oct 2023 10:51:30 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=L/uPReI50JC/gdZ8hOFyR0lDD7Z0eUtBseC2snxmPSI=; b=rqiNeJiS8Uz8Ukhskkal SRBCkKMU/+9YWQoIG8aMgA3hYnczao00hUIUp7NmUttGeZd6EljVbRCBS9Nz26YVvfgZjcXEfqZwR MzV+32OkEmXS2ej0S2mRX9rMaYtqUdTUuenx7/WnW2D3k4LQ+Zsmip67FvQgokUvsRa0hH1i6KGM2 MaXAmbldTTmgSatMcLWrwHMKuvS6g1ccvnrIYScuvd4AwS58+lpLZNaoVgOteiv3zwoYxTOcUY9vq 2OxFxKP+5QXZI4m/yEwjj1z8UGPpMhJm4uNenOURlPJb6/ebCeadKTukFfM6ySNFDlQX/4lF0YlfM yodDaAxhfcgsow==; From: Ludovic =?UTF-8?Q?Court=C3=A8s?= In-Reply-To: <0dd0a7387a8232abd43f484b87f183c9340497b0.1695927790.git.ngraves@ngraves.fr> (Nicolas Graves's message of "Thu, 28 Sep 2023 21:03:10 +0200") References: <0852115dc8e706b80b05d57cfbfae64de79fdac5.1694362722.git.ngraves@ngraves.fr> <0dd0a7387a8232abd43f484b87f183c9340497b0.1695927790.git.ngraves@ngraves.fr> Date: Thu, 05 Oct 2023 16:51:27 +0200 Message-ID: <87bkdd3yxc.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Nicolas Graves skribis: > + (add-after 'install 'hardcode-script-inputs > + (lambda _ > + (substitute* (string-append #$output "/bin/scilab") > + (("grep") > + (search-inputs-file #$inputs "/bin/grep")) I=E2=80=99ll contradict Efraim, but hopefully they=E2=80=99ll pardon me: I= =E2=80=99d write it like so: (lambda* (#:key inputs #:allow-other-keys) (substitute* =E2=80=A6 (("grep") (search-input-file inputs "/bin/grep")))) That way it=E2=80=99ll DTRT even when creating a variant of this package. (The code above had a typo too, with =E2=80=9Cinputs=E2=80=9D as plural.) Could you send one last updated patch? Thanks, Ludo=E2=80=99. From unknown Sun Jun 22 11:46:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65853] bug#65857: [PATCH v2 2/2] gnu: scilab: Set SCIHOME default to respect XDG base dirs. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 05 Oct 2023 15:10:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65853 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Ludovic =?UTF-8?Q?Court=C3=A8s?= Cc: 65853@debbugs.gnu.org, Eric Bavier , Andreas Enge , 65857@debbugs.gnu.org, Efraim Flashner Received: via spool by 65853-submit@debbugs.gnu.org id=B65853.16965185984479 (code B ref 65853); Thu, 05 Oct 2023 15:10:02 +0000 Received: (at 65853) by debbugs.gnu.org; 5 Oct 2023 15:09:58 +0000 Received: from localhost ([127.0.0.1]:48187 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoPzB-0001A5-PT for submit@debbugs.gnu.org; Thu, 05 Oct 2023 11:09:58 -0400 Received: from 10.mo575.mail-out.ovh.net ([46.105.79.203]:42731) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qoPyw-00019a-Cg for 65853@debbugs.gnu.org; Thu, 05 Oct 2023 11:09:57 -0400 Received: from director4.ghost.mail-out.ovh.net (unknown [10.109.143.146]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 894D02762E for <65853@debbugs.gnu.org>; Thu, 5 Oct 2023 15:09:22 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-mlfvq (unknown [10.110.103.34]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 1036B20272; Thu, 5 Oct 2023 15:09:20 +0000 (UTC) Received: from ngraves.fr ([37.59.142.99]) by ghost-submission-6684bf9d7b-mlfvq with ESMTPSA id PCL4OqDRHmUBvAcAz2nt6g (envelope-from ); Thu, 05 Oct 2023 15:09:20 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-99G00387ab9da3-e442-4b07-b0c3-07495e5cc022, 61FDDC3CB6C893EDD6D8D4386A31E254073FBF5F) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 From: Nicolas Graves In-Reply-To: <87bkdd3yxc.fsf_-_@gnu.org> References: <0852115dc8e706b80b05d57cfbfae64de79fdac5.1694362722.git.ngraves@ngraves.fr> <0dd0a7387a8232abd43f484b87f183c9340497b0.1695927790.git.ngraves@ngraves.fr> <87bkdd3yxc.fsf_-_@gnu.org> Date: Thu, 05 Oct 2023 17:09:20 +0200 Message-ID: <871qe9p0m7.fsf@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Ovh-Tracer-Id: 15105636103071785520 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedrgeeggdekfecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpefhvfevufgjfhffkfggtgfgsehtqhertddttdejnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepffduleekjeevteelueffjeefffethffhffeutdettefhleeuleevffejvdfftdffnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrdelleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehkeehfeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejhedpmhhouggvpehsmhhtphhouhht X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) On 2023-10-05 16:51, Ludovic Court=C3=A8s wrote: > Hi, > > Nicolas Graves skribis: > >> + (add-after 'install 'hardcode-script-inputs >> + (lambda _ >> + (substitute* (string-append #$output "/bin/scilab") >> + (("grep") >> + (search-inputs-file #$inputs "/bin/grep")) > > I=E2=80=99ll contradict Efraim, but hopefully they=E2=80=99ll pardon me: = I=E2=80=99d write it > like so: > > (lambda* (#:key inputs #:allow-other-keys) > (substitute* =E2=80=A6 > (("grep") > (search-input-file inputs "/bin/grep")))) > > That way it=E2=80=99ll DTRT even when creating a variant of this package. > > (The code above had a typo too, with =E2=80=9Cinputs=E2=80=9D as plural.) > > Could you send one last updated patch? Yes, it also has to be rebased now that scilab is version 2023.=20 > > Thanks, > Ludo=E2=80=99. --=20 Best regards, Nicolas Graves From unknown Sun Jun 22 11:46:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65853] [PATCH v3 0/8] Scilab: Big update. References: <0852115dc8e706b80b05d57cfbfae64de79fdac5.1694362722.git.ngraves@ngraves.fr> In-Reply-To: <0852115dc8e706b80b05d57cfbfae64de79fdac5.1694362722.git.ngraves@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Nov 2023 00:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65853 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65853@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 65853-submit@debbugs.gnu.org id=B65853.169922908332561 (code B ref 65853); Mon, 06 Nov 2023 00:05:02 +0000 Received: (at 65853) by debbugs.gnu.org; 6 Nov 2023 00:04:43 +0000 Received: from localhost ([127.0.0.1]:38394 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6g-0008T0-DG for submit@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:42 -0500 Received: from 20.mo581.mail-out.ovh.net ([46.105.49.208]:34207) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6a-0008SV-Fs for 65853@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:40 -0500 Received: from director10.ghost.mail-out.ovh.net (unknown [10.108.4.8]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 95ECF2297E for <65853@debbugs.gnu.org>; Mon, 6 Nov 2023 00:03:57 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-2hhbk (unknown [10.110.115.73]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 4B6FD1FDD5; Mon, 6 Nov 2023 00:03:57 +0000 (UTC) Received: from ngraves.fr ([37.59.142.109]) by ghost-submission-6684bf9d7b-2hhbk with ESMTPSA id Wg+MDm0tSGUL0AUAb83B2w (envelope-from ); Mon, 06 Nov 2023 00:03:57 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-109S003a3e5b9ad-134a-4555-a43e-1cc65535002f, 430062579F40ACD55BD93205AFDC29DFA9FB578A) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 From: Nicolas Graves Date: Mon, 6 Nov 2023 00:51:43 +0100 Message-ID: <20231106000354.32423-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 3273272504425702114 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedruddufedgudejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeffgeetfffgffejgeejvdffgfdtvdeuueetgfefuedvjeegvdegjeejveeuueevnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrddutdelnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeiheekheefseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkedupdhmohguvgepshhmthhpohhuth X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 From unknown Sun Jun 22 11:46:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65853] [PATCH v3 2/8] gnu: scilab: Activate tests and disable failing tests. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Nov 2023 00:05:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65853 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65853@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 65853-submit@debbugs.gnu.org id=B65853.169922908332568 (code B ref 65853); Mon, 06 Nov 2023 00:05:02 +0000 Received: (at 65853) by debbugs.gnu.org; 6 Nov 2023 00:04:43 +0000 Received: from localhost ([127.0.0.1]:38397 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6g-0008T8-Rj for submit@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:43 -0500 Received: from 2.mo584.mail-out.ovh.net ([46.105.72.36]:38841) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6b-0008SY-D0 for 65853@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:41 -0500 Received: from director11.ghost.mail-out.ovh.net (unknown [10.109.138.157]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id 0FB8322D3F for <65853@debbugs.gnu.org>; Mon, 6 Nov 2023 00:03:59 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-d82ln (unknown [10.110.115.73]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id D2C751FDB0; Mon, 6 Nov 2023 00:03:58 +0000 (UTC) Received: from ngraves.fr ([37.59.142.98]) by ghost-submission-6684bf9d7b-d82ln with ESMTPSA id IHzhMG4tSGXouTsA2Qe1KA (envelope-from ); Mon, 06 Nov 2023 00:03:58 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-98R002aa541ce5-ac9e-41c0-830b-7eb13b49a40d, 430062579F40ACD55BD93205AFDC29DFA9FB578A) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 From: Nicolas Graves Date: Mon, 6 Nov 2023 00:51:45 +0100 Message-ID: <20231106000354.32423-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231106000354.32423-1-ngraves@ngraves.fr> References: <20231106000354.32423-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 3273835456216294114 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedruddufedgudejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepgfeuhefhgeelvdeifeduheffgfdttdekveeiffduudejlefhjeffudduhfdvjeehnecuffhomhgrihhnpehinhgtlhdrrghmnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrdelkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehkeehfeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekgedpmhhouggvpehsmhhtphhouhht X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/maths.scm (scilab): Activate tests and disable failing tests. [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(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 88b52eb4fc..f6d0575979 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9622,8 +9622,6 @@ (define-public scilab tk)) (arguments (list - ;; The tests require java code. - #:tests? #f #:configure-flags #~(list "--enable-relocatable" @@ -9663,12 +9661,31 @@ (define-public scilab "modules/scicos/src/translator/makefile.mak" "modules/scicos/src/modelica_compiler/makefile.mak") (("nums\\.cmx?a") "")))) - ;; Install only scilab-cli.desktop - (add-after 'unpack 'remove-desktop-files - (lambda _ - (substitute* "desktop/Makefile.am" - (("desktop_DATA =") - "desktop_DATA = scilab-cli.desktop\nDUMMY =")))) + (add-after 'unpack 'restrain-to-scilab-cli + (lambda _ + ;; Install only scilab-cli.desktop + (substitute* "desktop/Makefile.am" + (("desktop_DATA =") + "desktop_DATA = scilab-cli.desktop\nDUMMY =")) + ;; Replace scilab with scilab-cli for tests. + (substitute* "Makefile.incl.am" + (("scilab-bin") "scilab-cli-bin") + (("scilab -nwni") "scilab-cli") + ;; Do not install tests, demos and examples. + ;; This saves up to 140 Mo in the final output. + (("(TESTS|DEMOS|EXAMPLES)_DIR=.*" all kind) + (string-append kind "_DIR="))))) + (add-before 'check 'disable-failing-tests + (lambda _ + (substitute* "Makefile" + (("TESTS = .*") + "TESTS =\n")) + (substitute* "modules/functions_manager/Makefile" + (("check:.*") + "check:\n")) + (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 -- 2.41.0 From unknown Sun Jun 22 11:46:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65853] [PATCH v3 3/8] gnu: scilab: Use gexp for tcl and tk libraries. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Nov 2023 00:05:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65853 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65853@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 65853-submit@debbugs.gnu.org id=B65853.169922908432582 (code B ref 65853); Mon, 06 Nov 2023 00:05:03 +0000 Received: (at 65853) by debbugs.gnu.org; 6 Nov 2023 00:04:44 +0000 Received: from localhost ([127.0.0.1]:38400 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6i-0008TR-7z for submit@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:44 -0500 Received: from 20.mo582.mail-out.ovh.net ([178.32.124.17]:44021) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6d-0008Sb-Jv for 65853@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:42 -0500 Received: from director7.ghost.mail-out.ovh.net (unknown [10.109.156.25]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 14C97236D6 for <65853@debbugs.gnu.org>; Mon, 6 Nov 2023 00:04:00 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-dcn65 (unknown [10.110.103.46]) by director7.ghost.mail-out.ovh.net (Postfix) with ESMTPS id B6A1E1FD27; Mon, 6 Nov 2023 00:03:59 +0000 (UTC) Received: from ngraves.fr ([37.59.142.107]) by ghost-submission-6684bf9d7b-dcn65 with ESMTPSA id Fa6wKG8tSGWoJwAA3Hx/ow (envelope-from ); Mon, 06 Nov 2023 00:03:59 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-107S00196bec1d2-0ab9-40ee-82f8-a620852c79bf, 430062579F40ACD55BD93205AFDC29DFA9FB578A) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 From: Nicolas Graves Date: Mon, 6 Nov 2023 00:51:46 +0100 Message-ID: <20231106000354.32423-4-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231106000354.32423-1-ngraves@ngraves.fr> References: <20231106000354.32423-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 3274116931470877410 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedruddufedgudejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeekgeevkeffudelveevveekjeetkefgtdejhefgfedvvdffvdefffejudfgfffgnecuffhomhgrihhnpehstghilhgrsgdrohhrghenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegtddrudegvddpfeejrdehledrudegvddruddtjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehkeehfeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekvddpmhhouggvpehsmhhtphhouhht X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/maths.scm (scilab): Use gexp for tcl and tk libraries. [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(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index f6d0575979..62c935a868 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9621,6 +9621,8 @@ (define-public scilab tcl tk)) (arguments + (let* ((tcl (this-package-input "tcl")) + (tk (this-package-input "tk"))) (list #:configure-flags #~(list @@ -9633,18 +9635,10 @@ (define-public scilab "--disable-build-help" "--with-external-scirenderer" ;; Tcl and Tk library locations. - (string-append "--with-tcl-include=" - (dirname - (search-input-file %build-inputs "include/tcl.h"))) - (string-append "--with-tcl-library=" - (dirname - (search-input-directory %build-inputs "lib/tcl8"))) - (string-append "--with-tk-include=" - (dirname - (search-input-file %build-inputs "include/tk.h"))) - (string-append "--with-tk-library=" - (dirname - (search-input-directory %build-inputs "lib/tk8.6"))) + (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 @@ -9709,7 +9703,7 @@ (define-public scilab (apply invoke "make" "src/cpp/parse/parsescilab.cpp" "src/cpp/parse/scanscilab.cpp" - make-flags))))))) + make-flags)))))))) (home-page "https://www.scilab.org/") (synopsis "Software for engineers and scientists") (description "This package provides the non-graphical version of the Scilab -- 2.41.0 From unknown Sun Jun 22 11:46:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65853] [PATCH v3 4/8] gnu: scilab: Add phase rewrap-scilab-cli. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Nov 2023 00:05:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65853 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65853@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 65853-submit@debbugs.gnu.org id=B65853.169922908532602 (code B ref 65853); Mon, 06 Nov 2023 00:05:03 +0000 Received: (at 65853) by debbugs.gnu.org; 6 Nov 2023 00:04:45 +0000 Received: from localhost ([127.0.0.1]:38402 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6i-0008TT-Mu for submit@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:45 -0500 Received: from 7.mo575.mail-out.ovh.net ([46.105.63.230]:54499) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6d-0008Sc-EL for 65853@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:42 -0500 Received: from director10.ghost.mail-out.ovh.net (unknown [10.109.146.32]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 4DAA525785 for <65853@debbugs.gnu.org>; Mon, 6 Nov 2023 00:04:01 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-9rbmq (unknown [10.110.208.248]) by director10.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 046321FDD5; Mon, 6 Nov 2023 00:04:00 +0000 (UTC) Received: from ngraves.fr ([37.59.142.108]) by ghost-submission-6684bf9d7b-9rbmq with ESMTPSA id +yZKOnAtSGV3yAkAX5pIgQ (envelope-from ); Mon, 06 Nov 2023 00:04:00 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-108S002f1b52d5c-0adc-4a72-9fe2-f339832741b7, 430062579F40ACD55BD93205AFDC29DFA9FB578A) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 From: Nicolas Graves Date: Mon, 6 Nov 2023 00:51:47 +0100 Message-ID: <20231106000354.32423-5-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231106000354.32423-1-ngraves@ngraves.fr> References: <20231106000354.32423-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 3274398406948414178 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedruddufedgudekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeekgeevkeffudelveevveekjeetkefgtdejhefgfedvvdffvdefffejudfgfffgnecuffhomhgrihhnpehstghilhgrsgdrohhrghenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegtddrudegvddpfeejrdehledrudegvddruddtkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehkeehfeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejhedpmhhouggvpehsmhhtphhouhht X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/maths.scm (scilab): Add phase rewrap-scilab-cli. Change-Id: Ia3ca5df1a4795c34b6c1cdc8c3b0d7cc2badf0cb --- gnu/packages/maths.scm | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 62c935a868..68e041c33b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9703,7 +9703,27 @@ (define-public scilab (apply invoke "make" "src/cpp/parse/parsescilab.cpp" "src/cpp/parse/scanscilab.cpp" - make-flags)))))))) + 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 _ + (define (bin path) (string-append #$output "/bin/" path)) + (delete-file (bin "scilab-cli")) + (wrap-program (bin "scilab-cli-bin") + `("SCI" = (,(string-append #$output "/share/scilab"))) + `("LD_LIBRARY_PATH" ":" prefix + (,(string-append #$output "/lib/scilab"))) + `("TCL_LIBRARY" = (,(string-append #$tcl "/lib"))) + `("TK_LIBRARY" = (,(string-append #$tk "/lib")))) + (copy-file (bin "scilab-cli-bin") (bin "scilab-cli")) + (copy-file (bin ".scilab-cli-bin-real") (bin "scilab-cli-bin")) + (delete-file (bin ".scilab-cli-bin-real")) + (substitute* (bin "scilab-cli") + (("\\.scilab-cli-bin-real") + "scilab-cli-bin") + (("export SCI=") + "unset LANGUAGE\nexport SCI=")))))))) (home-page "https://www.scilab.org/") (synopsis "Software for engineers and scientists") (description "This package provides the non-graphical version of the Scilab -- 2.41.0 From unknown Sun Jun 22 11:46:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65853] [PATCH v3 5/8] gnu: scilab: Reindent. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Nov 2023 00:05:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65853 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65853@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 65853-submit@debbugs.gnu.org id=B65853.169922908932627 (code B ref 65853); Mon, 06 Nov 2023 00:05:04 +0000 Received: (at 65853) by debbugs.gnu.org; 6 Nov 2023 00:04:49 +0000 Received: from localhost ([127.0.0.1]:38406 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6m-0008U7-BV for submit@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:48 -0500 Received: from 9.mo581.mail-out.ovh.net ([46.105.60.248]:50155) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6g-0008So-DN for 65853@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:43 -0500 Received: from director8.ghost.mail-out.ovh.net (unknown [10.108.20.16]) by mo581.mail-out.ovh.net (Postfix) with ESMTP id 10EDE2297E for <65853@debbugs.gnu.org>; Mon, 6 Nov 2023 00:04:04 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-z95g8 (unknown [10.110.115.73]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id C75471FD15; Mon, 6 Nov 2023 00:04:03 +0000 (UTC) Received: from ngraves.fr ([37.59.142.101]) by ghost-submission-6684bf9d7b-z95g8 with ESMTPSA id t2uoLXMtSGUjJwAAxMSzsg (envelope-from ); Mon, 06 Nov 2023 00:04:03 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-101G0044d613184-c329-4092-b224-b3c55abdc1a5, 430062579F40ACD55BD93205AFDC29DFA9FB578A) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 From: Nicolas Graves Date: Mon, 6 Nov 2023 00:51:48 +0100 Message-ID: <20231106000354.32423-6-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231106000354.32423-1-ngraves@ngraves.fr> References: <20231106000354.32423-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 3275242829699015394 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedruddufedgudejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeeuhfdukeffvdetfeffudfggefhueejvdeigeekgfeigfellefgudekveeiudeggeenucffohhmrghinhepmhhouggvlhhitggrrdgrmhenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegtddrudegvddpfeejrdehledrudegvddruddtudenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehkeehfeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekuddpmhhouggvpehsmhhtphhouhht X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * 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 ;;; Copyright © 2022 Maximilian Heisinger ;;; Copyright © 2022 Akira Kyle +;;; Copyright © 2022, 2023 Nicolas Graves ;;; Copyright © 2022 Roman Scherer ;;; Copyright © 2023 Jake Leporte ;;; Copyright © 2023 Camilo Q.S. (Distopico) @@ -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 From unknown Sun Jun 22 11:46:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65853] [PATCH v3 6/8] gnu: scilab: Update to 2024.0.0. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Nov 2023 00:05:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65853 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65853@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 65853-submit@debbugs.gnu.org id=B65853.169922908932634 (code B ref 65853); Mon, 06 Nov 2023 00:05:04 +0000 Received: (at 65853) by debbugs.gnu.org; 6 Nov 2023 00:04:49 +0000 Received: from localhost ([127.0.0.1]:38408 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6m-0008UC-Vf for submit@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:49 -0500 Received: from 6.mo550.mail-out.ovh.net ([46.105.43.205]:36207) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6h-0008T6-JP for 65853@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:44 -0500 Received: from director2.ghost.mail-out.ovh.net (unknown [10.108.16.164]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 346AF227BC for <65853@debbugs.gnu.org>; Mon, 6 Nov 2023 00:04:05 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-zngbm (unknown [10.108.16.207]) by director2.ghost.mail-out.ovh.net (Postfix) with ESMTPS id E84021FD48; Mon, 6 Nov 2023 00:04:04 +0000 (UTC) Received: from ngraves.fr ([37.59.142.96]) by ghost-submission-6684bf9d7b-zngbm with ESMTPSA id xfs6NHQtSGW4AQAAKLfG7A (envelope-from ); Mon, 06 Nov 2023 00:04:04 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-96R001f88fb055-6d4a-4310-b1a3-5aa7a3a68ad5, 430062579F40ACD55BD93205AFDC29DFA9FB578A) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 From: Nicolas Graves Date: Mon, 6 Nov 2023 00:51:49 +0100 Message-ID: <20231106000354.32423-7-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231106000354.32423-1-ngraves@ngraves.fr> References: <20231106000354.32423-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 3275524304019579618 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedruddufedgudejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepfffhtdejffetgeehteffteduudelhedvveevjefhkeevveetledvuddvleefgeevnecuffhomhgrihhnpegrrhgthhhlihhnuhigrdhorhhgnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrdelieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehkeehfeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheehtddpmhhouggvpehsmhhtphhouhht X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) 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 diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index e3045f4fee..ce0b5a8949 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -104,6 +104,7 @@ (define-module (gnu packages maths) #:use-module (gnu packages algebra) #:use-module (gnu packages audio) #:use-module (gnu packages autotools) + #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bison) @@ -9525,7 +9526,7 @@ (define-public optizelle (define-public scilab (package (name "scilab") - (version "2023.1.0") + (version "2024.0.0") (source (origin (method git-fetch) @@ -9535,10 +9536,9 @@ (define-public scilab (file-name (git-file-name name version)) (sha256 (base32 - "0hbqsnc67b4f8zc690kl79bwhjaasykjlmqbln8iymnjcn3l5ypd")) + "08nyfli3x7gd396ffd1a8zn9fj3gm6a8yw0ggm547c09sp2rgvl7")) (modules '((guix build utils) (ice-9 ftw))) - (patches (search-patches "scilab-hdf5-1.8-api.patch")) (snippet #~(begin ;; Delete everything except for scilab itself: @@ -9593,7 +9593,7 @@ (define-public scilab "modules/ast/src/cpp/parse/parsescilab.cpp")))))) (build-system gnu-build-system) (native-inputs - (list autoconf + (list autoconf-2.71 autoconf-archive automake bison @@ -9610,8 +9610,9 @@ (define-public scilab curl fftw gettext-minimal - hdf5-1.14 + hdf5-1.10 lapack + libarchive libx11 libxml2 matio @@ -9656,6 +9657,11 @@ (define-public scilab "modules/scicos/src/translator/makefile.mak" "modules/scicos/src/modelica_compiler/makefile.mak") (("nums\\.cmx?a") "")))) + (add-after 'unpack 'fix-linking + (lambda _ + (substitute* "modules/Makefile.am" + (("libscilab_cli_la_LDFLAGS = .*\\)" all) + (string-append all " -lcurl"))))) (add-after 'unpack 'restrain-to-scilab-cli (lambda _ ;; Install only scilab-cli.desktop diff --git a/gnu/packages/patches/scilab-hdf5-1.8-api.patch b/gnu/packages/patches/scilab-hdf5-1.8-api.patch deleted file mode 100644 index 8b453e4720..0000000000 --- a/gnu/packages/patches/scilab-hdf5-1.8-api.patch +++ /dev/null @@ -1,71 +0,0 @@ -This patch fixes the compilation with hdf5 version >= 1.10. Adapted from -https://aur.archlinux.org/cgit/aur.git/plain/hdf5_18_api.patch?h=scilab-git. - -diff -ur a/scilab/modules/hdf5/includes/HDF5Objects.h b/scilab/modules/hdf5/includes/HDF5Objects.h ---- a/scilab/modules/hdf5/includes/HDF5Objects.h -+++ b/scilab/modules/hdf5/includes/HDF5Objects.h -@@ -16,14 +16,12 @@ - #ifndef __HDF5OBJECTS_H__ - #define __HDF5OBJECTS_H__ - --#define H5_NO_DEPRECATED_SYMBOLS - #undef H5_USE_16_API -+#define H5_USE_18_API - --#define H5Eset_auto_vers 2 - #include - #include - --#undef H5_NO_DEPRECATED_SYMBOLS - - //#define __HDF5OBJECTS_DEBUG__ - //#define __HDF5ERROR_PRINT__ -diff -ur a/scilab/modules/hdf5/Makefile.am b/scilab/modules/hdf5/Makefile.am ---- a/scilab/modules/hdf5/Makefile.am -+++ b/scilab/modules/hdf5/Makefile.am -@@ -104,8 +104,7 @@ - -DH5Gopen_vers=2 \ - -DH5Tget_array_dims_vers=2 \ - -DH5Acreate_vers=2 \ -- -DH5Rdereference_vers=2 \ -- -DNO_DEPRECATED_SYMBOLS -+ -DH5Rdereference_vers=2 - - - libscihdf5_la_CPPFLAGS = \ -diff -ur a/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp b/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp ---- a/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp -+++ b/scilab/modules/hdf5/sci_gateway/cpp/sci_hdf5_listvar_v3.cpp -@@ -13,6 +13,8 @@ - * - */ - -+#define H5_USE_18_API -+ - #include - #include "function.hxx" - #include "string.hxx" -diff -ur a/scilab/modules/hdf5/src/c/h5_readDataFromFile.c b/scilab/modules/hdf5/src/c/h5_readDataFromFile.c ---- a/scilab/modules/hdf5/src/c/h5_readDataFromFile.c -+++ b/scilab/modules/hdf5/src/c/h5_readDataFromFile.c -@@ -13,7 +13,7 @@ - * - */ - --#define H5_NO_DEPRECATED_SYMBOLS -+#define H5_USE_18_API - - #ifndef _MSC_VER - #include -diff -ur a/scilab/modules/hdf5/src/c/h5_readDataFromFile_v1.c b/scilab/modules/hdf5/src/c/h5_readDataFromFile_v1.c ---- a/scilab/modules/hdf5/src/c/h5_readDataFromFile_v1.c -+++ b/scilab/modules/hdf5/src/c/h5_readDataFromFile_v1.c -@@ -13,7 +13,7 @@ - * - */ - --#define H5_NO_DEPRECATED_SYMBOLS -+#define H5_USE_18_API - - #ifndef _MSC_VER - #include -- 2.41.0 From unknown Sun Jun 22 11:46:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65853] [PATCH v3 1/8] gnu: scilab: Remove uneeded code. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Nov 2023 00:05:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65853 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65853@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 65853-submit@debbugs.gnu.org id=B65853.169922909032642 (code B ref 65853); Mon, 06 Nov 2023 00:05:05 +0000 Received: (at 65853) by debbugs.gnu.org; 6 Nov 2023 00:04:50 +0000 Received: from localhost ([127.0.0.1]:38410 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6n-0008UJ-Gp for submit@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:50 -0500 Received: from 12.mo550.mail-out.ovh.net ([87.98.162.229]:60185) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6a-0008SX-T8 for 65853@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:45 -0500 Received: from director4.ghost.mail-out.ovh.net (unknown [10.109.146.163]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 6138521472 for <65853@debbugs.gnu.org>; Mon, 6 Nov 2023 00:03:58 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-scm5b (unknown [10.110.171.120]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 2387C1FD39; Mon, 6 Nov 2023 00:03:58 +0000 (UTC) Received: from ngraves.fr ([37.59.142.106]) by ghost-submission-6684bf9d7b-scm5b with ESMTPSA id DQIiBm4tSGVWywQA/zfxXA (envelope-from ); Mon, 06 Nov 2023 00:03:58 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-106R00658171683-ab88-4b1d-b1a5-051ab548b4f3, 430062579F40ACD55BD93205AFDC29DFA9FB578A) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 From: Nicolas Graves Date: Mon, 6 Nov 2023 00:51:44 +0100 Message-ID: <20231106000354.32423-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231106000354.32423-1-ngraves@ngraves.fr> References: <20231106000354.32423-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 3273553981138658018 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedruddufedgudejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrddutdeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeiheekheefseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtpdhmohguvgepshhmthhpohhuth X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/maths.scm (scilab): [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(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ed1708c77b..88b52eb4fc 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9554,7 +9554,8 @@ (define-public scilab (for-each delete-file-recursively '("scilab" "config" - "libs/GetWindowsVersion")) + "libs/GetWindowsVersion" + "Visual-Studio-settings")) (for-each delete-file (cons* "aclocal.m4" "configure" @@ -9566,6 +9567,7 @@ (define-public scilab "m4/ltversion.m4" "m4/lt~obsolete.m4" "m4/pkg.m4" + "Scilab.sln" (find-files "." "^Makefile\\.in$"))) ;; And finally some files in the modules directory: @@ -9649,10 +9651,7 @@ (define-public scilab (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" - ;; There are some 2018-fortran errors that are ignored - ;; with this fortran compiler flag. - "FFLAGS=-fallow-argument-mismatch") + "OCAMLOPT=ocamlfind ocamlopt -package num -linkpkg") #:phases #~(modify-phases %standard-phases ;; The Num library is specified with the OCAMLC and @@ -9680,14 +9679,12 @@ (define-public scilab (lambda* (#:key inputs #:allow-other-keys) ;; Fix scilab script. (substitute* "bin/scilab" - (("\\/bin\\/ls") + (("/bin/ls") (search-input-file inputs "bin/ls"))) ;; Fix core.start. (substitute* "modules/core/etc/core.start" (("'SCI/modules") - "SCI+'/modules")) - ;; Set SCIHOME to /tmp before macros compilation. - (setenv "SCIHOME" "/tmp"))) + "SCI+'/modules")))) ;; Prevent race condition (add-after 'pre-build 'build-parsers (lambda* (#:key (make-flags #~'()) #:allow-other-keys) -- 2.41.0 From unknown Sun Jun 22 11:46:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65853] [PATCH v3 7/8] gnu: scilab: Add phase set-version. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Nov 2023 00:05:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65853 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65853@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 65853-submit@debbugs.gnu.org id=B65853.169922909032649 (code B ref 65853); Mon, 06 Nov 2023 00:05:05 +0000 Received: (at 65853) by debbugs.gnu.org; 6 Nov 2023 00:04:50 +0000 Received: from localhost ([127.0.0.1]:38412 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6o-0008UR-Ba for submit@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:50 -0500 Received: from 2.mo560.mail-out.ovh.net ([188.165.53.149]:58917) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6j-0008Tb-MP for 65853@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:47 -0500 Received: from director11.ghost.mail-out.ovh.net (unknown [10.109.156.6]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 7388F25732 for <65853@debbugs.gnu.org>; Mon, 6 Nov 2023 00:04:07 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-bjmbj (unknown [10.109.143.173]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 25A591FDDC; Mon, 6 Nov 2023 00:04:07 +0000 (UTC) Received: from ngraves.fr ([37.59.142.97]) by ghost-submission-6684bf9d7b-bjmbj with ESMTPSA id vvaWBXctSGXIRgIAwTCbqA (envelope-from ); Mon, 06 Nov 2023 00:04:07 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-97G002c35a768d-8069-4b28-b0fd-6f62e48d589d, 430062579F40ACD55BD93205AFDC29DFA9FB578A) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 From: Nicolas Graves Date: Mon, 6 Nov 2023 00:51:50 +0100 Message-ID: <20231106000354.32423-8-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231106000354.32423-1-ngraves@ngraves.fr> References: <20231106000354.32423-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 3276087255723401954 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedruddufedgudejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrdeljeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehkeehfeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitddpmhhouggvpehsmhhtphhouhht X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/maths.scm (scilab): Add phase set-version. [arguments](phases): Add phase set-version. Change-Id: I0e461a229931d159196cae73d1db584250c579b2 --- gnu/packages/maths.scm | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ce0b5a8949..dae4c528e2 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9662,6 +9662,13 @@ (define-public scilab (substitute* "modules/Makefile.am" (("libscilab_cli_la_LDFLAGS = .*\\)" all) (string-append all " -lcurl"))))) + (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))))))) (add-after 'unpack 'restrain-to-scilab-cli (lambda _ ;; Install only scilab-cli.desktop -- 2.41.0 From unknown Sun Jun 22 11:46:29 2025 X-Loop: help-debbugs@gnu.org Subject: [bug#65853] [PATCH v3 8/8] gnu: scilab: Set default SCIHOME value. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 06 Nov 2023 00:05:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65853 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65853@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 65853-submit@debbugs.gnu.org id=B65853.169922909132656 (code B ref 65853); Mon, 06 Nov 2023 00:05:05 +0000 Received: (at 65853) by debbugs.gnu.org; 6 Nov 2023 00:04:51 +0000 Received: from localhost ([127.0.0.1]:38414 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6o-0008UY-LB for submit@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:50 -0500 Received: from 3.mo560.mail-out.ovh.net ([46.105.58.226]:38747) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qzn6k-0008Tu-BH for 65853@debbugs.gnu.org; Sun, 05 Nov 2023 19:04:47 -0500 Received: from director5.ghost.mail-out.ovh.net (unknown [10.109.146.132]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 4ECC425C48 for <65853@debbugs.gnu.org>; Mon, 6 Nov 2023 00:04:08 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-wfccv (unknown [10.110.208.152]) by director5.ghost.mail-out.ovh.net (Postfix) with ESMTPS id ED7901FE4F; Mon, 6 Nov 2023 00:04:07 +0000 (UTC) Received: from ngraves.fr ([37.59.142.98]) by ghost-submission-6684bf9d7b-wfccv with ESMTPSA id mXggOHctSGU2qhAAEdL+9w (envelope-from ); Mon, 06 Nov 2023 00:04:07 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-98R002f8408775-e5b0-4624-9a98-2db34c4489a3, 430062579F40ACD55BD93205AFDC29DFA9FB578A) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.140.142 From: Nicolas Graves Date: Mon, 6 Nov 2023 00:51:51 +0100 Message-ID: <20231106000354.32423-9-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231106000354.32423-1-ngraves@ngraves.fr> References: <20231106000354.32423-1-ngraves@ngraves.fr> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 3276368731923014370 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedruddufedgudejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdeghfffhfefudduheeggeegffefuedvffeuheeuveejveelleeukeeujedutddunecuffhomhgrihhnpehhohhmvgdrlhhotggrlhdpshgtihhlrggsrdhorhhgnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrdelkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehkeehfeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitddpmhhouggvpehsmhhtphhouhht X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.0 (-) * gnu/packages/maths.scm (scilab): Set default SCIHOME value. [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(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index dae4c528e2..355f2132bd 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9734,8 +9734,12 @@ (define (bin path) (string-append #$output "/bin/" path)) (copy-file (bin ".scilab-cli-bin-real") (bin "scilab-cli-bin")) (delete-file (bin ".scilab-cli-bin-real")) (substitute* (bin "scilab-cli") - (("\\.scilab-cli-bin-real") - "scilab-cli-bin") + ;; Also set SCIHOME to sensible XDG base dirs value. + (("\\.scilab-cli-bin-real\"") + (string-append + "scilab-cli-bin\" -scihome " + "\"${XDG_STATE_HOME:-$HOME/.local/state}/scilab/" + #$(package-version this-package) "\"")) (("export SCI=") "unset LANGUAGE\nexport SCI=")))))))) (home-page "https://www.scilab.org/") -- 2.41.0 From unknown Sun Jun 22 11:46:29 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Nicolas Graves Subject: bug#65853: closed (Re: bug#65857: [PATCH v2 2/2] gnu: scilab: Set SCIHOME default to respect XDG base dirs.) Message-ID: References: <87fs0wep7x.fsf_-_@gnu.org> <0852115dc8e706b80b05d57cfbfae64de79fdac5.1694362722.git.ngraves@ngraves.fr> X-Gnu-PR-Message: they-closed 65853 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 65853@debbugs.gnu.org Date: Thu, 23 Nov 2023 10:32:01 +0000 Content-Type: multipart/mixed; boundary="----------=_1700735521-1069-1" This is a multi-part message in MIME format... ------------=_1700735521-1069-1 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #65853: [PATCH] gnu: scilab: Fix and hardcode script inputs. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 65853@debbugs.gnu.org. --=20 65853: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D65853 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1700735521-1069-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 65853-done) by debbugs.gnu.org; 23 Nov 2023 10:31:09 +0000 Received: from localhost ([127.0.0.1]:60684 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r66zF-0000Ey-1L for submit@debbugs.gnu.org; Thu, 23 Nov 2023 05:31:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r66zC-0000EQ-Iw; Thu, 23 Nov 2023 05:31:07 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r66yt-0006ix-5e; Thu, 23 Nov 2023 05:30:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=GGfvZ6UGZ/CIUuMxp1nxoVYNF52gHNueCJQcoMtCcSs=; b=g/gXglPZ86e6Ywfw3Jad wk4Gekk747//4w5Q12x3wAGUF0E/YcE21lRnknn68JVok/iRJ2vs3K3X8DaXpzmAiwz0FgwGjrvKa RiSusjdGiDdAzRgLd+KK6CNUo4HrQFKjFrv/NewGR32ZBpIROwwoJ1pLT2GtDDcTdGyE32BqDmkkk 7GrLIv2uQ2Xqc/0fv8UzQ3hJ+ZPKawVmTQ+UWENbPEIuoJLi9lY5cCC6Oc6x/9abVvPrXzT4t0dLA u4uNy0qzCnTTPe4yqdxPwRE4bJ45ELjficwahTgrDo+nNXTNOULALXpgP1stVe0awNwuS0CiOZWMF chFUeI9p9o/mqw==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Nicolas Graves Subject: Re: bug#65857: [PATCH v2 2/2] gnu: scilab: Set SCIHOME default to respect XDG base dirs. In-Reply-To: <20231106000354.32423-1-ngraves@ngraves.fr> (Nicolas Graves's message of "Mon, 6 Nov 2023 00:51:43 +0100") References: <0852115dc8e706b80b05d57cfbfae64de79fdac5.1694362722.git.ngraves@ngraves.fr> <20231106000354.32423-1-ngraves@ngraves.fr> Date: Thu, 23 Nov 2023 11:30:42 +0100 Message-ID: <87fs0wep7x.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 65853-done Cc: 65853-done@debbugs.gnu.org, 65857-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Nicolas, Nicolas Graves 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=E2=80=99. ------------=_1700735521-1069-1 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 10 Sep 2023 16:19:26 +0000 Received: from localhost ([127.0.0.1]:51162 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfN9h-0008Te-GZ for submit@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 ) id 1qfN9e-0008TO-1x for submit@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 ) id 1qfN9U-0001G5-7B for guix-patches@gnu.org; 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 ) id 1qfN9R-00035n-7s for guix-patches@gnu.org; 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 ; 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 ); Sun, 10 Sep 2023 16:18:52 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-108S0021995a29d-65fa-46f3-81c5-8ec26a588486, 093A30F52D67F1E631810F39359834EEDB6571F2) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.132.86 From: Nicolas Graves To: guix-patches@gnu.org Subject: [PATCH] gnu: scilab: Fix and hardcode script inputs. Date: Sun, 10 Sep 2023 18:18:42 +0200 Message-ID: <0852115dc8e706b80b05d57cfbfae64de79fdac5.1694362722.git.ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Efraim Flashner , Eric Bavier 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@ngraves.fr; 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@ngraves.fr X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" 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 ------------=_1700735521-1069-1-- From unknown Sun Jun 22 11:46:29 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Nicolas Graves Subject: bug#65856: closed (Re: bug#65857: [PATCH v2 2/2] gnu: scilab: Set SCIHOME default to respect XDG base dirs.) Message-ID: References: <87fs0wep7x.fsf_-_@gnu.org> <6d38ad3f36cb03c4ae6d715edcb741b5602a2997.1694367821.git.ngraves@ngraves.fr> X-Gnu-PR-Message: they-closed 65856 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 65856@debbugs.gnu.org Date: Thu, 23 Nov 2023 10:32:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1700735522-1069-3" This is a multi-part message in MIME format... ------------=_1700735522-1069-3 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #65853: [PATCH v2 1/2] gnu: scilab: Fix and hardcode script inputs. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 65856@debbugs.gnu.org. --=20 65853: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D65853 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1700735522-1069-3 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 65853-done) by debbugs.gnu.org; 23 Nov 2023 10:31:09 +0000 Received: from localhost ([127.0.0.1]:60684 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r66zF-0000Ey-1L for submit@debbugs.gnu.org; Thu, 23 Nov 2023 05:31:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r66zC-0000EQ-Iw; Thu, 23 Nov 2023 05:31:07 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r66yt-0006ix-5e; Thu, 23 Nov 2023 05:30:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=GGfvZ6UGZ/CIUuMxp1nxoVYNF52gHNueCJQcoMtCcSs=; b=g/gXglPZ86e6Ywfw3Jad wk4Gekk747//4w5Q12x3wAGUF0E/YcE21lRnknn68JVok/iRJ2vs3K3X8DaXpzmAiwz0FgwGjrvKa RiSusjdGiDdAzRgLd+KK6CNUo4HrQFKjFrv/NewGR32ZBpIROwwoJ1pLT2GtDDcTdGyE32BqDmkkk 7GrLIv2uQ2Xqc/0fv8UzQ3hJ+ZPKawVmTQ+UWENbPEIuoJLi9lY5cCC6Oc6x/9abVvPrXzT4t0dLA u4uNy0qzCnTTPe4yqdxPwRE4bJ45ELjficwahTgrDo+nNXTNOULALXpgP1stVe0awNwuS0CiOZWMF chFUeI9p9o/mqw==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Nicolas Graves Subject: Re: bug#65857: [PATCH v2 2/2] gnu: scilab: Set SCIHOME default to respect XDG base dirs. In-Reply-To: <20231106000354.32423-1-ngraves@ngraves.fr> (Nicolas Graves's message of "Mon, 6 Nov 2023 00:51:43 +0100") References: <0852115dc8e706b80b05d57cfbfae64de79fdac5.1694362722.git.ngraves@ngraves.fr> <20231106000354.32423-1-ngraves@ngraves.fr> Date: Thu, 23 Nov 2023 11:30:42 +0100 Message-ID: <87fs0wep7x.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 65853-done Cc: 65853-done@debbugs.gnu.org, 65857-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Nicolas, Nicolas Graves 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=E2=80=99. ------------=_1700735522-1069-3 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 10 Sep 2023 17:44:19 +0000 Received: from localhost ([127.0.0.1]:51253 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfOTr-0004ti-4x for submit@debbugs.gnu.org; Sun, 10 Sep 2023 13:44:19 -0400 Received: from lists.gnu.org ([2001:470:142::17]:58840) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfOTp-0004tO-Qm for submit@debbugs.gnu.org; Sun, 10 Sep 2023 13:44:18 -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 ) id 1qfOTd-0005uo-IQ for guix-patches@gnu.org; Sun, 10 Sep 2023 13:44:06 -0400 Received: from 6.mo560.mail-out.ovh.net ([87.98.165.38]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qfOTW-0008L5-Mw for guix-patches@gnu.org; Sun, 10 Sep 2023 13:44:05 -0400 Received: from director4.ghost.mail-out.ovh.net (unknown [10.108.16.29]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 2E178252C5 for ; Sun, 10 Sep 2023 17:43:56 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-m6bxg (unknown [10.110.115.95]) by director4.ghost.mail-out.ovh.net (Postfix) with ESMTPS id B777D1FD6F; Sun, 10 Sep 2023 17:43:55 +0000 (UTC) Received: from ngraves.fr ([37.59.142.103]) by ghost-submission-6684bf9d7b-m6bxg with ESMTPSA id UfjEKFsA/mQ4WAAADlAcgg (envelope-from ); Sun, 10 Sep 2023 17:43:55 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-103G00592409fde-7c20-464e-893c-bed0e5a72146, 093A30F52D67F1E631810F39359834EEDB6571F2) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.132.86 From: Nicolas Graves To: guix-patches@gnu.org Subject: [PATCH v2 1/2] gnu: scilab: Fix and hardcode script inputs. Date: Sun, 10 Sep 2023 19:43:40 +0200 Message-ID: <6d38ad3f36cb03c4ae6d715edcb741b5602a2997.1694367821.git.ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Efraim Flashner , Eric Bavier Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 25895701456872162 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedviedrudeivddgudduhecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeefheegheelffeljeehhfegfeekkedttedvvefhvddugfegheeufffftdfhudelleenucffohhmrghinhepshgtihhlrggsrdhorhhgnecukfhppeduvdejrddtrddtrddupddujeeirddujeelrddufedvrdekiedpfeejrdehledrudegvddruddtfeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdfovfetjfhoshhtpehmohehiedtpdhmohguvgepshhmthhpohhuth Received-SPF: pass client-ip=87.98.165.38; envelope-from=ngraves@ngraves.fr; helo=6.mo560.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_H3=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@ngraves.fr X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" 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 | 51 +++++++++++++++++++++++++++++------------- 1 file changed, 35 insertions(+), 16 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 38e71e18f8..900a9f0fac 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 @@ -8499,10 +8502,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") @@ -8534,7 +8533,27 @@ (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") + (string-append + "| " #$(file-append (this-package-input "sed") "/bin/sed"))) + (("/bin/ls") + #$(file-append (this-package-input "coreutils") + "/bin/ls")) + (("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 prerequisite-patch-id: 536470ccb53bbb5672363863c14c082ecc0d5b0a -- 2.41.0 ------------=_1700735522-1069-3-- From unknown Sun Jun 22 11:46:29 2025 MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) X-Loop: help-debbugs@gnu.org From: help-debbugs@gnu.org (GNU bug Tracking System) To: Nicolas Graves Subject: bug#65857: closed (Re: bug#65857: [PATCH v2 2/2] gnu: scilab: Set SCIHOME default to respect XDG base dirs.) Message-ID: References: <87fs0wep7x.fsf_-_@gnu.org> <43ba8c457ebc2994c1b53ce020fd0e1423783e4c.1694367821.git.ngraves@ngraves.fr> X-Gnu-PR-Message: they-closed 65857 X-Gnu-PR-Package: guix-patches X-Gnu-PR-Keywords: patch Reply-To: 65857@debbugs.gnu.org Date: Thu, 23 Nov 2023 10:32:02 +0000 Content-Type: multipart/mixed; boundary="----------=_1700735522-1069-5" This is a multi-part message in MIME format... ------------=_1700735522-1069-5 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Your bug report #65853: [PATCH v2 2/2] gnu: scilab: Set SCIHOME default to respect XDG base= dirs. which was filed against the guix-patches package, has been closed. The explanation is attached below, along with your original report. If you require more details, please reply to 65857@debbugs.gnu.org. --=20 65853: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D65853 GNU Bug Tracking System Contact help-debbugs@gnu.org with problems ------------=_1700735522-1069-5 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at 65853-done) by debbugs.gnu.org; 23 Nov 2023 10:31:09 +0000 Received: from localhost ([127.0.0.1]:60684 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r66zF-0000Ey-1L for submit@debbugs.gnu.org; Thu, 23 Nov 2023 05:31:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:41466) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1r66zC-0000EQ-Iw; Thu, 23 Nov 2023 05:31:07 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1r66yt-0006ix-5e; Thu, 23 Nov 2023 05:30:51 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:Date:References:In-Reply-To:Subject:To: From; bh=GGfvZ6UGZ/CIUuMxp1nxoVYNF52gHNueCJQcoMtCcSs=; b=g/gXglPZ86e6Ywfw3Jad wk4Gekk747//4w5Q12x3wAGUF0E/YcE21lRnknn68JVok/iRJ2vs3K3X8DaXpzmAiwz0FgwGjrvKa RiSusjdGiDdAzRgLd+KK6CNUo4HrQFKjFrv/NewGR32ZBpIROwwoJ1pLT2GtDDcTdGyE32BqDmkkk 7GrLIv2uQ2Xqc/0fv8UzQ3hJ+ZPKawVmTQ+UWENbPEIuoJLi9lY5cCC6Oc6x/9abVvPrXzT4t0dLA u4uNy0qzCnTTPe4yqdxPwRE4bJ45ELjficwahTgrDo+nNXTNOULALXpgP1stVe0awNwuS0CiOZWMF chFUeI9p9o/mqw==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Nicolas Graves Subject: Re: bug#65857: [PATCH v2 2/2] gnu: scilab: Set SCIHOME default to respect XDG base dirs. In-Reply-To: <20231106000354.32423-1-ngraves@ngraves.fr> (Nicolas Graves's message of "Mon, 6 Nov 2023 00:51:43 +0100") References: <0852115dc8e706b80b05d57cfbfae64de79fdac5.1694362722.git.ngraves@ngraves.fr> <20231106000354.32423-1-ngraves@ngraves.fr> Date: Thu, 23 Nov 2023 11:30:42 +0100 Message-ID: <87fs0wep7x.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 65853-done Cc: 65853-done@debbugs.gnu.org, 65857-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi Nicolas, Nicolas Graves 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=E2=80=99. ------------=_1700735522-1069-5 Content-Type: message/rfc822 Content-Disposition: inline Content-Transfer-Encoding: 7bit Received: (at submit) by debbugs.gnu.org; 10 Sep 2023 17:44:22 +0000 Received: from localhost ([127.0.0.1]:51255 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfOTu-0004tu-IM for submit@debbugs.gnu.org; Sun, 10 Sep 2023 13:44:22 -0400 Received: from lists.gnu.org ([2001:470:142::17]:58852) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qfOTp-0004tQ-Tf for submit@debbugs.gnu.org; Sun, 10 Sep 2023 13:44:18 -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 ) id 1qfOTd-0005un-7s for guix-patches@gnu.org; Sun, 10 Sep 2023 13:44:06 -0400 Received: from 17.mo584.mail-out.ovh.net ([46.105.41.16]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qfOTa-0008Lt-Bg for guix-patches@gnu.org; Sun, 10 Sep 2023 13:44:04 -0400 Received: from director9.ghost.mail-out.ovh.net (unknown [10.109.143.208]) by mo584.mail-out.ovh.net (Postfix) with ESMTP id DB48A24C91 for ; Sun, 10 Sep 2023 17:43:59 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-gnmzv (unknown [10.111.208.242]) by director9.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 7A9A61FE57; Sun, 10 Sep 2023 17:43:59 +0000 (UTC) Received: from ngraves.fr ([37.59.142.106]) by ghost-submission-6684bf9d7b-gnmzv with ESMTPSA id JpF9GF8A/mS/xQAA0nGNIQ (envelope-from ); Sun, 10 Sep 2023 17:43:59 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-106R00603ff465c-1246-4bc5-b306-fa3ac976e8ca, 093A30F52D67F1E631810F39359834EEDB6571F2) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 176.179.132.86 From: Nicolas Graves To: guix-patches@gnu.org Subject: [PATCH v2 2/2] gnu: scilab: Set SCIHOME default to respect XDG base dirs. Date: Sun, 10 Sep 2023 19:43:41 +0200 Message-ID: <43ba8c457ebc2994c1b53ce020fd0e1423783e4c.1694367821.git.ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <6d38ad3f36cb03c4ae6d715edcb741b5602a2997.1694367821.git.ngraves@ngraves.fr> References: <6d38ad3f36cb03c4ae6d715edcb741b5602a2997.1694367821.git.ngraves@ngraves.fr> MIME-Version: 1.0 X-Debbugs-Cc: Andreas Enge , Efraim Flashner , Eric Bavier Content-Transfer-Encoding: 8bit X-Ovh-Tracer-Id: 26740123832607458 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedviedrudeivddgudduhecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeekkeegveekffduleevveevkeejteekgfdtjeehgfefvddvffdvfeffjedugfffgfenucffohhmrghinhepshgtihhlrggsrdhorhhgnecukfhppeduvdejrddtrddtrddupddujeeirddujeelrddufedvrdekiedpfeejrdehledrudegvddruddtieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepghhuihigqdhprghttghhvghssehgnhhurdhorhhgpdfovfetjfhoshhtpehmohehkeegpdhmohguvgepshhmthhpohhuth Received-SPF: pass client-ip=46.105.41.16; envelope-from=ngraves@ngraves.fr; helo=17.mo584.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_MSPIKE_H3=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@ngraves.fr X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) * 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 ------------=_1700735522-1069-5--