From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms1.migadu.com with LMTPS id iNRdOxY9FmZjUgAAe85BDQ:P1 (envelope-from ) for ; Wed, 10 Apr 2024 09:17:43 +0200 Received: from aspmx1.migadu.com ([2001:41d0:303:e224::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id iNRdOxY9FmZjUgAAe85BDQ (envelope-from ) for ; Wed, 10 Apr 2024 09:17:43 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1712733462; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=ksEqC8Uv6lxIEpTHZzJsjQMXitB08vsI/sStZBLJbfI=; b=Eorpo4QcUlKOC6kdvTeS7UWM95jvSX7eSefyz5mnt1dTKgXM2musbh8C9Q7ZBmUg01lYOq m8JeptLZ9bFggCt4RYCa/EX0qFHkfaL3Y4aoMCII91wIl5sQZlnmc0+J3ZbqRSOrXjsrMJ UdFFcm1mFUuXHmJHyX6TkuX4SFdkztE2riwTgos+1eZD4vFCgMiS0Fix+qVumW+ar/Mq3d GfnlcIwOYOm3S3Vi1p9AG16SqtTxv5OQtqUyKybgFGSIa/FCf1t/xAsbfO0B4NWqTQpbPi SFXPb1MjPUDDAa6+nH0sXt8Cg1kbYSjqZ+EhOD3Eqk6yHmySsVTWd4OA0enGQg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1712733462; a=rsa-sha256; cv=none; b=b2L5Pz89pkWfqFcvjvGb4K0vcIHWTgVV9TY7dAT8lStywaRbuMKxI2hWaBsahBz9aOfN9U qWmyeMmAz+YQvjyKebWSb2Cl2Wwde97M/EvWXfBmmWnmBIYSpvFNURG+ILYfXt3Xb1OlFZ HZS9l7SLfqoA8KRX3LwlzWw9t25jYakfuU4bTf918aD7UOL+7R05GvQFiPEGrvfCh84cNb iSEmECu4frm6NIqrOnLGZcP6bC9bnOSqiZ1n+3+oApfuE6VRrJdzMoCgDjFAbG55IGeg8Y dehW4H+JS7HLjtR3f6Dz2Pw3YoeaXUf+Iz49YN/8diob+UqLT+rPOxkmTtIPNQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=pass (policy=none) header.from=gnu.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A47D020E67 for ; Wed, 10 Apr 2024 09:17:42 +0200 (CEST) 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 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 Content-Transfer-Encoding: 8bit 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 From: Nicolas Graves via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -6.37 X-Spam-Score: -6.37 X-Migadu-Queue-Id: A47D020E67 X-Migadu-Scanner: mx12.migadu.com X-TUID: DHhyO5HU3DHU * 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") -- 2.41.0