From patchwork Sun Nov 5 23:51:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 55972 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5ECEC27BBEA; Mon, 6 Nov 2023 00:05:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B7C3927BBE2 for ; Mon, 6 Nov 2023 00:05:20 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qzn6W-0004kO-6f; Sun, 05 Nov 2023 19:04:32 -0500 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 1qzn6S-0004ij-BD for guix-patches@gnu.org; Sun, 05 Nov 2023 19:04:28 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qzn6S-0000Rp-3O for guix-patches@gnu.org; Sun, 05 Nov 2023 19:04:28 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qzn73-0008Vq-2q for guix-patches@gnu.org; Sun, 05 Nov 2023 19:05:05 -0500 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 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 X-Ovh-Tracer-Id: 3273553981138658018 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedruddufedgudejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrddutdeinecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehinhgvthepuddvjedrtddrtddruddpmhgrihhlfhhrohhmpeeonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqedpnhgspghrtghpthhtohepuddprhgtphhtthhopeeiheekheefseguvggssghughhsrdhgnhhurdhorhhgpdfovfetjfhoshhtpehmohehhedtpdhmohguvgepshhmthhpohhuth X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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) From patchwork Sun Nov 5 23:51:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 55970 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 3732A27BBE2; Mon, 6 Nov 2023 00:05:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4AEDB27BBEA for ; Mon, 6 Nov 2023 00:05:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qzn6S-0004iV-0u; Sun, 05 Nov 2023 19:04:28 -0500 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 1qzn6Q-0004ha-4Z for guix-patches@gnu.org; Sun, 05 Nov 2023 19:04:26 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qzn6P-0000Qi-Rv for guix-patches@gnu.org; Sun, 05 Nov 2023 19:04:25 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qzn70-0008VF-KZ for guix-patches@gnu.org; Sun, 05 Nov 2023 19:05:02 -0500 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 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 X-Ovh-Tracer-Id: 3273835456216294114 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedruddufedgudejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepgfeuhefhgeelvdeifeduheffgfdttdekveeiffduudejlefhjeffudduhfdvjeehnecuffhomhgrihhnpehinhgtlhdrrghmnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrdelkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehkeehfeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekgedpmhhouggvpehsmhhtphhouhht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 From patchwork Sun Nov 5 23:51:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 55965 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A3BD127BBE2; Mon, 6 Nov 2023 00:04:50 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0F4B327BBE9 for ; Mon, 6 Nov 2023 00:04:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qzn6S-0004ih-5l; Sun, 05 Nov 2023 19:04:28 -0500 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 1qzn6Q-0004ho-Dv for guix-patches@gnu.org; Sun, 05 Nov 2023 19:04:26 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qzn6Q-0000Qr-5g for guix-patches@gnu.org; Sun, 05 Nov 2023 19:04:26 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qzn71-0008VM-49 for guix-patches@gnu.org; Sun, 05 Nov 2023 19:05:03 -0500 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 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 X-Ovh-Tracer-Id: 3274116931470877410 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedruddufedgudejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeekgeevkeffudelveevveekjeetkefgtdejhefgfedvvdffvdefffejudfgfffgnecuffhomhgrihhnpehstghilhgrsgdrohhrghenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegtddrudegvddpfeejrdehledrudegvddruddtjeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehkeehfeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekvddpmhhouggvpehsmhhtphhouhht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 From patchwork Sun Nov 5 23:51:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 55967 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A0EC027BBE9; Mon, 6 Nov 2023 00:05:08 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 0494F27BBE2 for ; Mon, 6 Nov 2023 00:05:07 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qzn6S-0004ii-9F; Sun, 05 Nov 2023 19:04:28 -0500 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 1qzn6Q-0004i1-VL for guix-patches@gnu.org; Sun, 05 Nov 2023 19:04:27 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qzn6Q-0000R2-Lu for guix-patches@gnu.org; Sun, 05 Nov 2023 19:04:26 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qzn71-0008VU-Lh for guix-patches@gnu.org; Sun, 05 Nov 2023 19:05:03 -0500 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 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 X-Ovh-Tracer-Id: 3274398406948414178 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedruddufedgudekucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepkeekgeevkeffudelveevveekjeetkefgtdejhefgfedvvdffvdefffejudfgfffgnecuffhomhgrihhnpehstghilhgrsgdrohhrghenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegtddrudegvddpfeejrdehledrudegvddruddtkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehkeehfeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejhedpmhhouggvpehsmhhtphhouhht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 From patchwork Sun Nov 5 23:51:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 55968 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A23F527BBEA; Mon, 6 Nov 2023 00:05:10 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id EBD7B27BBE2 for ; Mon, 6 Nov 2023 00:05:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qzn6V-0004k9-1Q; Sun, 05 Nov 2023 19:04:32 -0500 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 1qzn6R-0004iG-CK for guix-patches@gnu.org; Sun, 05 Nov 2023 19:04:27 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qzn6R-0000RO-40 for guix-patches@gnu.org; Sun, 05 Nov 2023 19:04:27 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qzn72-0008Vb-2R for guix-patches@gnu.org; Sun, 05 Nov 2023 19:05:04 -0500 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 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 X-Ovh-Tracer-Id: 3275242829699015394 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedruddufedgudejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfgggtgfesthekredtredtjeenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeeuhfdukeffvdetfeffudfggefhueejvdeigeekgfeigfellefgudekveeiudeggeenucffohhmrghinhepmhhouggvlhhitggrrdgrmhenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegtddrudegvddpfeejrdehledrudegvddruddtudenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehkeehfeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekuddpmhhouggvpehsmhhtphhouhht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 _ From patchwork Sun Nov 5 23:51:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 55966 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 78A4027BBEA; Mon, 6 Nov 2023 00:04:52 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 1760227BBE2 for ; Mon, 6 Nov 2023 00:04:51 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qzn6T-0004jq-EB; Sun, 05 Nov 2023 19:04:29 -0500 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 1qzn6R-0004iZ-PM for guix-patches@gnu.org; Sun, 05 Nov 2023 19:04:27 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qzn6R-0000Rg-Hh for guix-patches@gnu.org; Sun, 05 Nov 2023 19:04:27 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qzn72-0008Vj-HT for guix-patches@gnu.org; Sun, 05 Nov 2023 19:05:04 -0500 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 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 X-Ovh-Tracer-Id: 3275524304019579618 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedruddufedgudejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepfffhtdejffetgeehteffteduudelhedvveevjefhkeevveetledvuddvleefgeevnecuffhomhgrihhnpegrrhgthhhlihhnuhigrdhorhhgnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrdelieenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehkeehfeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheehtddpmhhouggvpehsmhhtphhouhht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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 From patchwork Sun Nov 5 23:51:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 55971 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 79FFD27BBE2; Mon, 6 Nov 2023 00:05:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4484327BBE9 for ; Mon, 6 Nov 2023 00:05:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qzn6W-0004kX-JA; Sun, 05 Nov 2023 19:04:32 -0500 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 1qzn6S-0004j2-NY for guix-patches@gnu.org; Sun, 05 Nov 2023 19:04:28 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qzn6S-0000Rx-Ez for guix-patches@gnu.org; Sun, 05 Nov 2023 19:04:28 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qzn73-0008Vx-EK for guix-patches@gnu.org; Sun, 05 Nov 2023 19:05:05 -0500 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 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 X-Ovh-Tracer-Id: 3276087255723401954 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedruddufedgudejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrdeljeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehkeehfeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitddpmhhouggvpehsmhhtphhouhht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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 From patchwork Sun Nov 5 23:51:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 55969 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 9B4DE27BBE2; Mon, 6 Nov 2023 00:05:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 46B6227BBE9 for ; Mon, 6 Nov 2023 00:05:14 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qzn6Z-0004lJ-23; Sun, 05 Nov 2023 19:04:35 -0500 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 1qzn6T-0004ji-4q for guix-patches@gnu.org; Sun, 05 Nov 2023 19:04:29 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qzn6S-0000S2-Qw for guix-patches@gnu.org; Sun, 05 Nov 2023 19:04:28 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qzn73-0008W5-Qp for guix-patches@gnu.org; Sun, 05 Nov 2023 19:05:05 -0500 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 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 X-Ovh-Tracer-Id: 3276368731923014370 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvkedruddufedgudejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepvdeghfffhfefudduheeggeegffefuedvffeuheeuveejveelleeukeeujedutddunecuffhomhgrihhnpehhohhmvgdrlhhotggrlhdpshgtihhlrggsrdhorhhgnecukfhppeduvdejrddtrddtrddupdekuddrieejrddugedtrddugedvpdefjedrheelrddugedvrdelkeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqpdhnsggprhgtphhtthhopedupdhrtghpthhtohepieehkeehfeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitddpmhhouggvpehsmhhtphhouhht X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Nicolas Graves X-ACL-Warn: , Nicolas Graves via Guix-patches X-Patchwork-Original-From: Nicolas Graves via Guix-patches via From: Nicolas Graves Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * 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/")