From patchwork Wed Apr 3 06:25:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 62667 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 3011D27BBEA; Wed, 3 Apr 2024 07:26:44 +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=-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 AAF8527BBE2 for ; Wed, 3 Apr 2024 07:26:43 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rru4V-0008VG-Lt; Wed, 03 Apr 2024 02:26:07 -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 1rru4O-0008Rx-Ls for guix-patches@gnu.org; Wed, 03 Apr 2024 02:26:00 -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 1rru4N-0005aZ-U7 for guix-patches@gnu.org; Wed, 03 Apr 2024 02:26:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rru4S-0004eC-2N for guix-patches@gnu.org; Wed, 03 Apr 2024 02:26:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70158] [PATCH 4/6] gnu: scilab: Simpler and more robust version setting. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 03 Apr 2024 06:26:04 +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.171212554717720 (code B ref 70158); Wed, 03 Apr 2024 06:26:04 +0000 Received: (at 70158) by debbugs.gnu.org; 3 Apr 2024 06:25:47 +0000 Received: from localhost ([127.0.0.1]:56851 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rru4A-0004bf-Jj for submit@debbugs.gnu.org; Wed, 03 Apr 2024 02:25:46 -0400 Received: from 7.mo560.mail-out.ovh.net ([188.165.48.182]:48121) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rru45-0004aN-FC for 70158@debbugs.gnu.org; Wed, 03 Apr 2024 02:25:44 -0400 Received: from director8.ghost.mail-out.ovh.net (unknown [10.108.17.174]) by mo560.mail-out.ovh.net (Postfix) with ESMTP id 4V8ZW405bGz1S3d for <70158@debbugs.gnu.org>; Wed, 3 Apr 2024 06:25:35 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-nxz6k (unknown [10.110.168.40]) by director8.ghost.mail-out.ovh.net (Postfix) with ESMTPS id A4ED61FD26; Wed, 3 Apr 2024 06:25:35 +0000 (UTC) Received: from ngraves.fr ([37.59.142.105]) by ghost-submission-6684bf9d7b-nxz6k with ESMTPSA id I6vtI1/2DGZyNAAA2vvR1Q (envelope-from ); Wed, 03 Apr 2024 06:25:35 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-105G0069b87b226-2896-4881-8a25-656630787849, 50F27E84980287D69AF642A420FD808EB57BA51D) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 81.67.146.208 Date: Wed, 3 Apr 2024 08:25:24 +0200 Message-ID: <20240403062528.5483-4-ngraves@ngraves.fr> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240403062528.5483-1-ngraves@ngraves.fr> References: <20240403062528.5483-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 17752908258264277730 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedvledrudeffedguddtjecutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpkedurdeijedrudegiedrvddtkedpfeejrdehledrudegvddruddtheenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedtudehkeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheeitddpmhhouggvpehsmhhtphhouhht 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>: Simpler and more robust version setting in version.h.in. It saves two lines and anticipates for the next release which will not use "main" anymore. Change-Id: Ib052756a55528e991da54d880205c75ab2c6fa5f --- gnu/packages/maths.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index c920bc2f30..9223a86eab 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9846,10 +9846,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