From patchwork Wed Apr 10 07:15:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 62898 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 2D7A127BBEA; Wed, 10 Apr 2024 08:17:43 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 A0E4027BBE2 for ; Wed, 10 Apr 2024 08:17:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ruSCk-0005UW-8Q; Wed, 10 Apr 2024 03:17:10 -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 1ruSCi-0005Tv-JX for guix-patches@gnu.org; Wed, 10 Apr 2024 03:17:08 -0400 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 1ruSCi-0002dZ-BC for guix-patches@gnu.org; Wed, 10 Apr 2024 03:17:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ruSCp-00078Z-Ti for guix-patches@gnu.org; Wed, 10 Apr 2024 03:17:16 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70158] [PATCH v2 1/3] gnu: scilab: Cleanup. References: <20240403062146.1652-1-ngraves@ngraves.fr> In-Reply-To: <20240403062146.1652-1-ngraves@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Apr 2024 07:17:14 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70158 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70158@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 70158-submit@debbugs.gnu.org id=B70158.171273336726784 (code B ref 70158); Wed, 10 Apr 2024 07:17:14 +0000 Received: (at 70158) by debbugs.gnu.org; 10 Apr 2024 07:16:07 +0000 Received: from localhost ([127.0.0.1]:51960 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ruSBY-0006wG-Nz for submit@debbugs.gnu.org; Wed, 10 Apr 2024 03:16:05 -0400 Received: from 4.mo582.mail-out.ovh.net ([87.98.184.159]:51069) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ruSBR-0006vJ-2N for 70158@debbugs.gnu.org; Wed, 10 Apr 2024 03:15:53 -0400 Received: from director1.ghost.mail-out.ovh.net (unknown [10.109.148.49]) by mo582.mail-out.ovh.net (Postfix) with ESMTP id 4VDvHZ2W8gz1Hrh for <70158@debbugs.gnu.org>; Wed, 10 Apr 2024 07:15:38 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-w6h27 (unknown [10.110.168.153]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 11C421FE07; Wed, 10 Apr 2024 07:15:38 +0000 (UTC) Received: from ngraves.fr ([37.59.142.103]) by ghost-submission-6684bf9d7b-w6h27 with ESMTPSA id tGxRAZo8FmYwTQAA1Z8ScQ (envelope-from ); Wed, 10 Apr 2024 07:15:38 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-103G0058cd46f20-3937-485b-9633-a7bca932f657, 3D594BCB5898CC947373B117ED623EFC885049E0) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Wed, 10 Apr 2024 09:15:13 +0200 Message-ID: <20240410071517.30074-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Ovh-Tracer-Id: 4366802791747412706 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrudehhedguddufecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeekffegteffgfffjeegjedvfffgtddvueeutefgfeeuvdejgedvgeejjeevueeuveenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtfeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedtudehkeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekvddpmhhouggvpehsmhhtphhouhht 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): [arguments]<#:phases>: In pre-build phase, remove unecessary code, due to the former introduction of the rewrap-scilab-cli phase. More robust version setting in the set-version phase. It anticipates for the next release which will not use "main" anymore. [source](snippet) Sort dynamic_link deleted files. [inputs]: Add bash-minimal. Change-Id: I49b17886405e1ed8161e71b51655fa393ff7f10b --- gnu/packages/maths.scm | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 03760f3f3e..00b3ed213b 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9759,9 +9759,9 @@ (define-public scilab "compile" "config.guess" "config.sub" - "ltmain.sh" "depcomp" "install-sh" + "ltmain.sh" "missing")) (delete-file-recursively "modules/dynamic_link/src/scripts/m4") (for-each delete-file @@ -9785,6 +9785,7 @@ (define-public scilab (inputs (list `(,pcre "bin") `(,pcre "out") arpack-ng + bash-minimal curl fftw gettext-minimal @@ -9842,10 +9843,8 @@ (define-public scilab (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))))))) + (("branch-[a-z0-9\\.]*") ; version + #$(version-major+minor (package-version this-package)))))) (add-after 'unpack 'restrain-to-scilab-cli (lambda _ ;; Install only scilab-cli.desktop @@ -9879,10 +9878,6 @@ (define-public scilab ((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")