From patchwork Thu Aug 29 16:25:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 30465 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 4A84E27BBE9; Thu, 29 Aug 2024 17:27: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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,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 1ACF227BBE2 for ; Thu, 29 Aug 2024 17:27:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sjhzW-00059L-Ou; Thu, 29 Aug 2024 12:27:22 -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 1sjhzG-00054W-BV for guix-patches@gnu.org; Thu, 29 Aug 2024 12:27: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 1sjhzG-0006Is-2T for guix-patches@gnu.org; Thu, 29 Aug 2024 12:27:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=etuPphRgF+0pqo7rfG+J0x/YHiYJ/UA0JLoR4bX2u4U=; b=OLVLRCwah/0R+JuOZfYFwldMKnfC4LoYgyH8gHF87kcY69fvbQwi1KPMFsiSDHTCYSHU9/25d66gaUliOoVUHBqzk08e4TpKwMOAj1v+m2sdGhtxR9X1KAwNG0pyGmBlmxy3Xa4BMF0J+DB4Hn7ljhdIu1lRQaMjnFhYUimgKtGHyiJkiPd66BpwzHrK4MLPrtsUZbY9yKF/rySg9L9wWMhjTg4G3ySOV6wSc7u4cel9Oi5mUufF2CVJqw3tsfp1BsDqbqzbS2WnwnxO3MJ1vI0nr+ThB4p4qzE9Te9H9rEPpTR6fjs8xHquzfTd7PFvFJ8PdbgjXqh8BCV39i+VbA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sji09-0005EU-IB for guix-patches@gnu.org; Thu, 29 Aug 2024 12:28:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72873] [PATCH 1/4] gnu: scilab: Update to 2024.1.0. References: <20240829150739.19497-1-ngraves@ngraves.fr> In-Reply-To: <20240829150739.19497-1-ngraves@ngraves.fr> Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 29 Aug 2024 16:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72873@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 72873-submit@debbugs.gnu.org id=B72873.172494882320000 (code B ref 72873); Thu, 29 Aug 2024 16:28:01 +0000 Received: (at 72873) by debbugs.gnu.org; 29 Aug 2024 16:27:03 +0000 Received: from localhost ([127.0.0.1]:52058 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sjhzD-0005CL-5n for submit@debbugs.gnu.org; Thu, 29 Aug 2024 12:27:03 -0400 Received: from 14.mo583.mail-out.ovh.net ([188.165.51.82]:48487) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sjhz8-0005BQ-0H for 72873@debbugs.gnu.org; Thu, 29 Aug 2024 12:27:01 -0400 Received: from director3.ghost.mail-out.ovh.net (unknown [10.108.2.21]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4WvmqX3Pl7z1WSs for <72873@debbugs.gnu.org>; Thu, 29 Aug 2024 16:26:00 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-hrr4r (unknown [10.111.174.38]) by director3.ghost.mail-out.ovh.net (Postfix) with ESMTPS id E935C1FD40; Thu, 29 Aug 2024 16:25:59 +0000 (UTC) Received: from ngraves.fr ([37.59.142.95]) by ghost-submission-6684bf9d7b-hrr4r with ESMTPSA id bk0RMBeh0GYCewcAx40tOA (envelope-from ); Thu, 29 Aug 2024 16:25:59 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-95G0018dd136d7-00cc-47a2-bbdb-f645bd6fceff, 6F600CF742B1A60B32D51C2DEF6090C4F326D718) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 80.214.77.241 Date: Thu, 29 Aug 2024 18:25:43 +0200 Message-ID: <20240829162554.28746-1-ngraves@ngraves.fr> X-Mailer: git-send-email 2.45.2 MIME-Version: 1.0 X-Ovh-Tracer-Id: 11608028043704394466 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrudefgedguddttdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeehgfffffdtkeevieehudduleefgfffteethfeuteetleeliedtudffgfduiefgleenucffohhmrghinhepghhithhlrggsrdgtohhmnecukfhppeduvdejrddtrddtrddupdektddrvddugedrjeejrddvgedupdefjedrheelrddugedvrdelheenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedvkeejfeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekfedpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=etuPphRgF+0pqo7rfG+J0x/YHiYJ/UA0JLoR4bX2u4U=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1724948760; v=1; b=ag3ux8LW4xQWE5dM6gicwQ+y6Ik7yarsePI8HeiUb/1aD5+3hrqCT/BhCfKiB8aPT+sunSc7 IW6QkLHjyWi+SffhM8cXqRbxhF73xJm7jwqXu0vP0RZc3wcv5laImkjyllhBQnRrcPZg7yK9PAq saavN9X9fYcUHJzyH5nbJ8MXtAZc33Qb7m8wtXeXxBO8UdBK0TdwZvbw4SoBieWoin+As9uLSvi mAWIJiIsE1jkGl9BGa99FOXpI+C22nFNqnkvpLuXIz2z63gF+3sJLu9IMFkVMD4eK0uMPyCU9at +cu5mlnctJTpjLJDKOs5wYpWU0lEEKsBQeCG5/t1V5B7A== 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): Update to 2024.1.0. * gnu/packages/patches/scilab-tbx_build_help.patch: Update patch. Change-Id: I79197822aefba698b2383e3aa30fbc511da6954c --- gnu/packages/maths.scm | 4 +-- .../patches/scilab-tbx_build_help.patch | 33 +++++++++---------- 2 files changed, 17 insertions(+), 20 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 557d9acc48..8617ba7217 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9832,7 +9832,7 @@ (define-public optizelle (define-public scilab (package (name "scilab") - (version "2024.0.0") + (version "2024.1.0") (source (origin (method git-fetch) @@ -9842,7 +9842,7 @@ (define-public scilab (file-name (git-file-name name version)) (sha256 (base32 - "08nyfli3x7gd396ffd1a8zn9fj3gm6a8yw0ggm547c09sp2rgvl7")) + "1qk0pf1cwcvdqjza9xqkynd90ywq0yh421bz59w5zjzbs40ijnrx")) (patches (search-patches "scilab-better-compiler-detection.patch" "scilab-tbx_build_help.patch")) (modules '((guix build utils) diff --git a/gnu/packages/patches/scilab-tbx_build_help.patch b/gnu/packages/patches/scilab-tbx_build_help.patch index d2a9b41357..34dbe7dfa4 100644 --- a/gnu/packages/patches/scilab-tbx_build_help.patch +++ b/gnu/packages/patches/scilab-tbx_build_help.patch @@ -1,38 +1,35 @@ -From c59d78c5a5c8c187450f157cf7f8480455e8e6a2 Mon Sep 17 00:00:00 2001 +From 24a9bc240729b7630e20a7b83b75f086024ae03d Mon Sep 17 00:00:00 2001 From: Nicolas Graves -Date: Wed, 3 Apr 2024 03:32:23 +0200 +Date: Wed, 21 Aug 2024 15:42:35 +0200 Subject: [PATCH] scilab: tbx_build_help: Allow for some flexibility under -nwni. upstream reference: https://gitlab.com/scilab/scilab/-/merge_requests/818 - --- - .../modules_manager/macros/tbx_build_help.sci | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) + scilab/modules/modules_manager/macros/tbx_build_help.sci | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scilab/modules/modules_manager/macros/tbx_build_help.sci b/scilab/modules/modules_manager/macros/tbx_build_help.sci -index 7862e33a868..5593ee3dc04 100644 +index ab06b3fa8dc..cbb1b4cadf8 100644 --- a/scilab/modules/modules_manager/macros/tbx_build_help.sci +++ b/scilab/modules/modules_manager/macros/tbx_build_help.sci -@@ -58,12 +58,12 @@ function tbx_build_help(moduletitle, path) +@@ -57,8 +57,8 @@ function tbx_build_help(moduletitle, path) // Check scilab mode if and(getscilabmode() <> ["STD" "NW"]) then - error(msprintf(gettext("%s: documentation cannot be built in this scilab mode: %s.\n"),"tbx_build_help",getscilabmode())); +- end + msprintf(gettext("%s: documentation cannot be built in this scilab mode: %s.\n"),"tbx_build_help",getscilabmode()); + else -+ directory_language = basename(path); -+ default_language = "en_US" -+ -+ xmltojar(path, moduletitle, directory_language, default_language); - end -- directory_language = basename(path); -- default_language = "en_US" -- -- xmltojar(path, moduletitle, directory_language, default_language); -- + directory_language = basename(path); + default_language = "en_US" +@@ -89,4 +89,5 @@ function tbx_build_help(moduletitle, path) + warning(_(".start file was not found, build of help pages using tag may failed.")); + xmltojar(path, moduletitle, directory_language, default_language); + end ++ end endfunction -- -2.41.0 +2.45.2 From patchwork Thu Aug 29 16:25:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 30462 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 329AB27BBEC; Thu, 29 Aug 2024 17:27:25 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,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 0B89B27BBE9 for ; Thu, 29 Aug 2024 17:27:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sjhzO-00057C-Ja; Thu, 29 Aug 2024 12:27:15 -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 1sjhzH-00054a-80 for guix-patches@gnu.org; Thu, 29 Aug 2024 12:27: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 1sjhzG-0006J2-UP for guix-patches@gnu.org; Thu, 29 Aug 2024 12:27:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=iLgMgEHq3ahdT61aL56fRi+WUm1KxBRtwTE5JS7X2zE=; b=B5l9+kcLV/8/3bw2GPvmi5WpclVgOOULp/AhYAUnItBOx65qKxNCbXZFat19MriOusEGBU6KEO2CEYMLQGylxwdn3SDIWi/Rgq3tdTt/k9Pc5r+y9+CKiMSzEqk7wB4wKh5kGwmdzMqsq+I+juLi0j28uEPCQUuVh4g+68eItl1Zw+4qOXFCYvyVeqgxsHtuJ26fEvDS2Oznqp8DK1f+4OqoxbSFYWbSKhSapyZ1iwBDd73ocqgO63u6fqoPhNGJBKshzeCMBHIp0fvy2njmR3p2Tiz868KB6UpNXotRbAyBSFA2Q3nB849fDp0WKOnVL0APufUkh9LPcd+3lyTqcg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sji0A-0005Ej-EY for guix-patches@gnu.org; Thu, 29 Aug 2024 12:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72873] [PATCH 2/4] gnu: scilab: Cleanup more files. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 29 Aug 2024 16:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72873@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 72873-submit@debbugs.gnu.org id=B72873.172494882720019 (code B ref 72873); Thu, 29 Aug 2024 16:28:02 +0000 Received: (at 72873) by debbugs.gnu.org; 29 Aug 2024 16:27:07 +0000 Received: from localhost ([127.0.0.1]:52062 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sjhzH-0005Cn-9n for submit@debbugs.gnu.org; Thu, 29 Aug 2024 12:27:07 -0400 Received: from 9.mo575.mail-out.ovh.net ([46.105.78.111]:45001) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sjhz9-0005Ba-0J for 72873@debbugs.gnu.org; Thu, 29 Aug 2024 12:27:03 -0400 Received: from director1.ghost.mail-out.ovh.net (unknown [10.109.139.47]) by mo575.mail-out.ovh.net (Postfix) with ESMTP id 4WvmqY6csGz1mXD for <72873@debbugs.gnu.org>; Thu, 29 Aug 2024 16:26:01 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-m8fgp (unknown [10.110.101.246]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 13DE11FEA9; Thu, 29 Aug 2024 16:26:01 +0000 (UTC) Received: from ngraves.fr ([37.59.142.100]) by ghost-submission-6684bf9d7b-m8fgp with ESMTPSA id b9LJARmh0GYfrRoArQjVdw (envelope-from ); Thu, 29 Aug 2024 16:26:01 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-100R0035885587c-e323-4de5-a27c-7c4ab567bb35, 6F600CF742B1A60B32D51C2DEF6090C4F326D718) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 80.214.77.241 Date: Thu, 29 Aug 2024 18:25:44 +0200 Message-ID: <20240829162554.28746-2-ngraves@ngraves.fr> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240829162554.28746-1-ngraves@ngraves.fr> References: <20240829162554.28746-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 11608309517761831650 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrudefgedguddttdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpeelffejteeutefhfeekfffffedvudekjeekgfeludeitdfhkeevhfeivdfhffeggeenucfkphepuddvjedrtddrtddruddpkedtrddvudegrdejjedrvdeguddpfeejrdehledrudegvddruddttdenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedvkeejfeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheejhedpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=iLgMgEHq3ahdT61aL56fRi+WUm1KxBRtwTE5JS7X2zE=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1724948762; v=1; b=VyRhaE7RI3s1DTJDh2g/yaLYh0tL032z+1L75G0l3lZyNra110wLQ7kKw2E8uGdnrMFl6shk AnMd3GZ7WZ72KUyB7UdbYaElJvs/ZxgHdHBVl9n/MomHIyPLKThrm7rXQ7at87bcMr/msaTFRiu tWleozRmC1mN/oyTBhl/+nz6/dtnsA5tPeGHooUkEAEfjHSx0Du74uln8e6DRlV8oOopkkFPPHH Lkk16nUks7ZMo56Cu/SVGWwNwqFt/Ps2PFGd3mi0k9xkRhW4obVSuLc66nkxbYeLlCjs21gTsAO DfjmM6ZARh0WawdQ7Jrldl3m3Y2EufU6VxM/xLnZzkXCw== 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] Delete .bat files. Change-Id: I6f9ae17dd5d689c3e5836bf0c9e54725ef381428 --- gnu/packages/maths.scm | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 8617ba7217..a211121375 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9866,7 +9866,8 @@ (define-public scilab "libs/GetWindowsVersion" "Visual-Studio-settings")) (for-each delete-file - (cons* "aclocal.m4" + (append + (list "aclocal.m4" "configure" "m4/ax_cxx_compile_stdcxx.m4" "m4/lib-ld.m4" @@ -9876,8 +9877,9 @@ (define-public scilab "m4/ltversion.m4" "m4/lt~obsolete.m4" "m4/pkg.m4" - "Scilab.sln" - (find-files "." "^Makefile\\.in$"))) + "Scilab.sln") + (find-files "." "^Makefile\\.in$") + (find-files "." "\\.bat$"))) ;; And finally some files in the modules directory: (for-each From patchwork Thu Aug 29 16:25:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 30463 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 6F8AF27BBE2; Thu, 29 Aug 2024 17:27:26 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,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 21F0027BBEA for ; Thu, 29 Aug 2024 17:27:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sjhzQ-00057y-J6; Thu, 29 Aug 2024 12:27:16 -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 1sjhzG-00054X-PP for guix-patches@gnu.org; Thu, 29 Aug 2024 12:27: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 1sjhzG-0006Ix-Ga for guix-patches@gnu.org; Thu, 29 Aug 2024 12:27:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=E04UtBuW1EaWQVYGUmrO6PCGPdPB3PDTjDRJ9o4kues=; b=NRDoIgVZ+svIMCXOjsAOZjcZK6ngoQnv/lCUmzg5n07O9if1maCo5vfg2R46ciNbzn9QhZYxyqLa/2yxEcL1TAxcdG3UfZdvXZ4oMqV3XHwBNdV7FVV2ypWqykav5cdMXKKvuwGsnjU6wx7gNHyDouxyKWTZvFHpGkkD8qUDGEuxMfoSZ+LdYe34yZ5bqPlAGtalHqQioWsmtb+FCfneWB35VPy2NatNEIMiVzvezcEB2mpdB3DAwtwQC0nE1T5mCMeFMyFuq3COkkGHCVlfXRPRXLyYz8tZ14AZRsTJvlUYiEms71z74/UlIHDNsrQ7hNFHbJYfP/ugqXJWuLmXtQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sji0A-0005Eb-0K for guix-patches@gnu.org; Thu, 29 Aug 2024 12:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72873] [PATCH 3/4] gnu: scilab: Fix the scilab build script. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 29 Aug 2024 16:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72873@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 72873-submit@debbugs.gnu.org id=B72873.172494882720011 (code B ref 72873); Thu, 29 Aug 2024 16:28:01 +0000 Received: (at 72873) by debbugs.gnu.org; 29 Aug 2024 16:27:07 +0000 Received: from localhost ([127.0.0.1]:52060 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sjhzG-0005Ch-R6 for submit@debbugs.gnu.org; Thu, 29 Aug 2024 12:27:07 -0400 Received: from 5.mo550.mail-out.ovh.net ([178.33.45.107]:42295) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sjhzA-0005Bc-Ey for 72873@debbugs.gnu.org; Thu, 29 Aug 2024 12:27:02 -0400 Received: from director1.ghost.mail-out.ovh.net (unknown [10.109.139.47]) by mo550.mail-out.ovh.net (Postfix) with ESMTP id 4WvmqZ6KW1z18Dw for <72873@debbugs.gnu.org>; Thu, 29 Aug 2024 16:26:02 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-ltbt4 (unknown [10.110.101.52]) by director1.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 6BED51FEA9; Thu, 29 Aug 2024 16:26:02 +0000 (UTC) Received: from ngraves.fr ([37.59.142.99]) by ghost-submission-6684bf9d7b-ltbt4 with ESMTPSA id 4I48Fhqh0GZ0OwEA3EXDwA (envelope-from ); Thu, 29 Aug 2024 16:26:02 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-99G003b9ab7008-0b47-4b31-bc23-3ef41a1a3a2c, 6F600CF742B1A60B32D51C2DEF6090C4F326D718) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 80.214.77.241 Date: Thu, 29 Aug 2024 18:25:45 +0200 Message-ID: <20240829162554.28746-3-ngraves@ngraves.fr> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240829162554.28746-1-ngraves@ngraves.fr> References: <20240829162554.28746-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 11608590992660751074 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrudefgedgleelucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefpihgtohhlrghsucfirhgrvhgvshcuoehnghhrrghvvghssehnghhrrghvvghsrdhfrheqnecuggftrfgrthhtvghrnhepleffjeetueethfefkeffffefvddukeejkefgleduiedthfekvefhiedvhfffgeegnecukfhppeduvdejrddtrddtrddupdektddrvddugedrjeejrddvgedupdefjedrheelrddugedvrdelleenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedvkeejfeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheehtddpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=E04UtBuW1EaWQVYGUmrO6PCGPdPB3PDTjDRJ9o4kues=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1724948763; v=1; b=EU2vtz2LtaSAeZiczKCsqCP7hRBtubVu0yIjc1hkAsoLGhw49mW+aOgHQo3DeN/xDpDWbON+ lh4H82Y8iVjtlQaS2H+btVSWfT3Wen9RsROA+znxHfVzISCWgK0pmFRJnk0l3dS3g/0OtEt9Wq2 WsKHh6U5DpCXU9b9Hs1qNfu0eJ+dpHzBk5AOWSVLh8amtxhiHzZffiIFpQVYs37YYdyzEeZIFO4 GfjUCVIbGiW8phMuTaevP8ACjnfeqvZCKBSQunSNlzbh4oFABiOGqrnr/rWKiIYGE3xTQX/NtTS Dt60RrAQstRz9FLORjv98dHo0Soqb7qr4VlP8tcDgbuMg== 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>: Reintroduce a manual patch for /bin/ls in phase pre-build. This is necessary because the file is used when scilab builds macros, even if it is discarded later. [inputs]: Add coreutils-minimal. Change-Id: I692fd6696273bfdce0e50b0f688a60e7dc289ce6 --- gnu/packages/maths.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index a211121375..48a22bb6a1 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -9907,6 +9907,7 @@ (define-public scilab autoconf-archive automake bison + coreutils-minimal eigen flex gfortran @@ -10014,6 +10015,10 @@ (define-public scilab (("PROGNAME.*") "\n"))))) (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") From patchwork Thu Aug 29 16:25:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Graves X-Patchwork-Id: 30464 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 3A0BE27BBEA; Thu, 29 Aug 2024 17:27:33 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,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 9E1F327BBE2 for ; Thu, 29 Aug 2024 17:27:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sjhzN-00056z-Od; Thu, 29 Aug 2024 12:27:13 -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 1sjhzH-00054c-Lf for guix-patches@gnu.org; Thu, 29 Aug 2024 12:27:09 -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 1sjhzH-0006J9-DR for guix-patches@gnu.org; Thu, 29 Aug 2024 12:27:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=y98fQeWdxhcUXPDzhdbjSjsH7DXFgaQdyKI3ToDLpGg=; b=fuSnmktW1wZD4/grBGO3A7vnz+MkBtI98gfKgS7FNM52JfUInwvtPLugfui0k0Bv/I+ShND+a1k/e4CM3VU8k9xEsf34/9bZys6ak9axuFy0AlFPWp6yIx1XSTXkjewyBkgfUZHESbu0sbzYaReOsPsLFWBuX0OtwPSj8JPtq5USF4xvutDa6+Ga6HRnTOrtKLfgqlEgkGzMF63wbGgYg5YBN/btFlZNs/ojNb/xJx8Gx93caV7Sglvd2aeyIChtQlo9QqvuNZb0shfl1QvY2kzutIGmPMUw8k2Y2XBLll28DriIS/y8PmmFBw2h3AbJ9kkHgs2mmkjegqFOIXygSA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sji0A-0005Es-Qz for guix-patches@gnu.org; Thu, 29 Aug 2024 12:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72873] [PATCH 4/4] gnu: scilab: Add sanity-check phase. Resent-From: Nicolas Graves Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 29 Aug 2024 16:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72873 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72873@debbugs.gnu.org Cc: ngraves@ngraves.fr Received: via spool by 72873-submit@debbugs.gnu.org id=B72873.172494882720026 (code B ref 72873); Thu, 29 Aug 2024 16:28:02 +0000 Received: (at 72873) by debbugs.gnu.org; 29 Aug 2024 16:27:07 +0000 Received: from localhost ([127.0.0.1]:52064 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sjhzH-0005Cv-K3 for submit@debbugs.gnu.org; Thu, 29 Aug 2024 12:27:07 -0400 Received: from 4.mo583.mail-out.ovh.net ([178.33.111.247]:42047) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sjhzC-0005Bt-Az for 72873@debbugs.gnu.org; Thu, 29 Aug 2024 12:27:03 -0400 Received: from director11.ghost.mail-out.ovh.net (unknown [10.109.139.176]) by mo583.mail-out.ovh.net (Postfix) with ESMTP id 4Wvmqd4jvXz1WgY for <72873@debbugs.gnu.org>; Thu, 29 Aug 2024 16:26:05 +0000 (UTC) Received: from ghost-submission-6684bf9d7b-8gvqz (unknown [10.111.174.233]) by director11.ghost.mail-out.ovh.net (Postfix) with ESMTPS id 0630A1FEC5; Thu, 29 Aug 2024 16:26:03 +0000 (UTC) Received: from ngraves.fr ([37.59.142.103]) by ghost-submission-6684bf9d7b-8gvqz with ESMTPSA id rHKnIRuh0GaeDQgARW2akQ (envelope-from ); Thu, 29 Aug 2024 16:26:03 +0000 Authentication-Results: garm.ovh; auth=pass (GARM-103G00582d55a94-a6f1-4549-9bc1-39c501f49749, 6F600CF742B1A60B32D51C2DEF6090C4F326D718) smtp.auth=ngraves@ngraves.fr X-OVh-ClientIp: 80.214.77.241 Date: Thu, 29 Aug 2024 18:25:46 +0200 Message-ID: <20240829162554.28746-4-ngraves@ngraves.fr> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240829162554.28746-1-ngraves@ngraves.fr> References: <20240829162554.28746-1-ngraves@ngraves.fr> MIME-Version: 1.0 X-Ovh-Tracer-Id: 11609435418388783842 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: 0 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeeftddrudefgedguddttdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekredtredttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedvgefhfffhfeduudehgeeggefffeeuvdffueehueevjeevleelueekueejuddtudenucffohhmrghinhephhhomhgvrdhlohgtrghlpdhstghilhgrsgdrohhrghenucfkphepuddvjedrtddrtddruddpkedtrddvudegrdejjedrvdeguddpfeejrdehledrudegvddruddtfeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedupdhrtghpthhtohepjedvkeejfeesuggvsggsuhhgshdrghhnuhdrohhrghdpoffvtefjohhsthepmhhoheekfedpmhhouggvpehsmhhtphhouhht DKIM-Signature: a=rsa-sha256; bh=y98fQeWdxhcUXPDzhdbjSjsH7DXFgaQdyKI3ToDLpGg=; c=relaxed/relaxed; d=ngraves.fr; h=From; s=ovhmo4487190-selector1; t=1724948765; v=1; b=SbPuEoYSHgky9N+je96pIC52MajOsR0fdHl5RyADCaa3zzgQpE+T2OavQMKsMY4cdWCicacp REKCz3l5e3dJMdvjBOIePax9WEan1wUAGsgAplu22AFuc9nReNbS/meRRIVFrlkWeLN8rg9i8VX SzjgIdmep7BWwmYd6/R+8ra/nm6yCcThXNYCIQMpqG3vGBVCReh03gqu9NHWtFxgsSNk8RIvtGg rSbJchId5YdbkJmPuR5dSRBddyxU/oaGUw6wiH9U3yT8OzMMCa2CTAaGEQPJzV5cVbX7Y+OZntK Ugq0Yvag4NlAD4EOXv2vTfC4k0jJqQ2DRhbTZquotwu3w== 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>: Add sanity-check phase. Change-Id: Idc6911511fd0bf7e779d4af026f0a6390eb3b079 --- gnu/packages/maths.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index 48a22bb6a1..577d9b87aa 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -10054,7 +10054,12 @@ (define (bin path) (string-append #$output "/bin/" path)) "\"${XDG_STATE_HOME:-$HOME/.local/state}/scilab/" #$(package-version this-package) "\"")) (("export SCI=") - "unset LANGUAGE\nexport SCI=")))))))) + "unset LANGUAGE\nexport SCI=")))) + (add-after 'rewrap-scilab-cli 'sanity-check + (lambda _ + (setenv "HOME" (getcwd)) + (invoke (string-append #$output "/bin/scilab-cli") + "-e" "\"quit;\""))))))) (home-page "https://www.scilab.org/") (synopsis "Software for engineers and scientists") (description "This package provides the non-graphical version of the Scilab