From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 15 10:23:47 2023 Received: (at submit) by debbugs.gnu.org; 15 Sep 2023 14:23:47 +0000 Received: from localhost ([127.0.0.1]:44407 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qh9jK-0001mb-TC for submit@debbugs.gnu.org; Fri, 15 Sep 2023 10:23:47 -0400 Received: from lists.gnu.org ([2001:470:142::17]:51838) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qh9jI-0001mM-4O for submit@debbugs.gnu.org; Fri, 15 Sep 2023 10:23:33 -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 1qh9j6-0002l7-BN for guix-patches@gnu.org; Fri, 15 Sep 2023 10:23:20 -0400 Received: from mailout.easymail.ca ([64.68.200.34]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qh9j4-0001Lk-4j for guix-patches@gnu.org; Fri, 15 Sep 2023 10:23:19 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 2839B63338 for ; Fri, 15 Sep 2023 14:23:16 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo09-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo09-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id selfd-6VfMLg for ; Fri, 15 Sep 2023 14:23:15 +0000 (UTC) Received: from localhost.localdomain (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 8896563287 for ; Fri, 15 Sep 2023 14:23:03 +0000 (UTC) From: Simon South To: guix-patches@gnu.org Subject: [PATCH 0/4] gnu: ucsim: Update to 0.8.0; other improvements. Date: Fri, 15 Sep 2023 10:22:59 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=64.68.200.34; envelope-from=simon@simonsouth.net; helo=mailout.easymail.ca X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 1.0 (+) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -0.0 (/) This patch series updates μCsim, a collection of software simulators for various microcontroller families, to version 0.8.0. It also tries to improve the package by - Modernizing it with the use of gexps. - Disabling tests. "make check" runs what is actually a regression-test suite[0], which is of little value here as it doesn't stop or return an error code when it encounters a problem. In fact it has been quietly failing this entire time due to missing dependencies but because it doesn't report any errors, no one noticed. This change also eliminates the possibility of a circular dependency between μCsim and SDCC, which will become important with a future patch to the sdcc package. - Moving the documentation to a separate "doc" output. I've tested these changes on AArch64 and x86-64 and everything appears fine. -- Simon South simon@simonsouth.net [0] Documented at http://mazsola.iit.uni-miskolc.hu/ucsim/testing.html Simon South (4): gnu: ucsim: Use gexps. gnu: ucsim: Disable tests. gnu: ucsim: Move documentation to "doc" output. gnu: ucsim: Update to 0.8.0. gnu/packages/embedded.scm | 47 ++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 20 deletions(-) base-commit: b696fb41bc0dfcb7130a5aa6d69aff2ae191c283 prerequisite-patch-id: 556b40aab19d0d1dd3e301115880883c329ee516 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 15 10:25:29 2023 Received: (at 66001) by debbugs.gnu.org; 15 Sep 2023 14:25:29 +0000 Received: from localhost ([127.0.0.1]:44420 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qh9lB-0001qQ-E9 for submit@debbugs.gnu.org; Fri, 15 Sep 2023 10:25:29 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:49334) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qh9lA-0001qD-9a for 66001@debbugs.gnu.org; Fri, 15 Sep 2023 10:25:29 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 29F2563357 for <66001@debbugs.gnu.org>; Fri, 15 Sep 2023 14:25:16 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo09-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo09-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id C6LpsU1SDsGw for <66001@debbugs.gnu.org>; Fri, 15 Sep 2023 14:25:15 +0000 (UTC) Received: from localhost.localdomain (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 8406663338 for <66001@debbugs.gnu.org>; Fri, 15 Sep 2023 14:25:14 +0000 (UTC) From: Simon South To: 66001@debbugs.gnu.org Subject: [PATCH 3/4] gnu: ucsim: Move documentation to "doc" output. Date: Fri, 15 Sep 2023 10:25:02 -0400 Message-ID: <4af5efd7ec061ee2ed93c77b638faf4da001a7d8.1694784333.git.simon@simonsouth.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 66001 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/embedded.scm (ucsim)[arguments]<#:phases>: Expand "patch-makefiles" phase to set correct documentation-installation path. [outputs]: Add with "out", "doc". --- gnu/packages/embedded.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 80efe2363d..bee6ab6543 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1527,7 +1527,13 @@ (define-public ucsim (add-after 'unpack 'patch-makefiles (lambda _ (substitute* (find-files "." "(\\.mk$|\\.in$)") - (("/bin/sh") (which "sh")))))) + (("/bin/sh") (which "sh"))) + + ;; Ensure the documentation is installed to the correct path, + ;; without a duplicate "ucsim" segment (necessary as we are + ;; building μCsim outside of SDCC). + (substitute* "doc/Makefile.in" + (("@docdir@/ucsim") "@docdir@"))))) ;; μCsim's regression-test suite is of little use in this context since ;; it doesn't stop or return an error code when it encounters a problem. #:tests? #f)) @@ -1535,6 +1541,7 @@ (define-public ucsim (list ncurses)) (native-inputs (list bison flex)) + (outputs '("out" "doc")) (home-page "http://mazsola.iit.uni-miskolc.hu/ucsim/") (synopsis "Simulators for various microcontroller families") (description "μCsim is a collection of software simulators for -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 15 10:25:35 2023 Received: (at 66001) by debbugs.gnu.org; 15 Sep 2023 14:25:35 +0000 Received: from localhost ([127.0.0.1]:44423 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qh9lG-0001qi-Or for submit@debbugs.gnu.org; Fri, 15 Sep 2023 10:25:35 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:49444) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qh9lF-0001qJ-IM for 66001@debbugs.gnu.org; Fri, 15 Sep 2023 10:25:33 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id CCF3F63345 for <66001@debbugs.gnu.org>; Fri, 15 Sep 2023 14:25:21 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo09-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo09-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TXPjk1GpKbsX for <66001@debbugs.gnu.org>; Fri, 15 Sep 2023 14:25:21 +0000 (UTC) Received: from localhost.localdomain (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 709FC6333B for <66001@debbugs.gnu.org>; Fri, 15 Sep 2023 14:25:15 +0000 (UTC) From: Simon South To: 66001@debbugs.gnu.org Subject: [PATCH 4/4] gnu: ucsim: Update to 0.8.0. Date: Fri, 15 Sep 2023 10:25:03 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 66001 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/embedded.scm (ucsim): Update to 0.8.0. [source]: Update source URI. [description]: Update. --- gnu/packages/embedded.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index bee6ab6543..71ad50aa81 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1509,16 +1509,16 @@ (define-public ebusd (define-public ucsim (package (name "ucsim") - (version "0.7.1") + (version "0.8.0") (source (origin (method url-fetch) (uri (string-append - "http://mazsola.iit.uni-miskolc.hu/ucsim/download/unix/" - "source/v" (version-major+minor version) ".x/" - "ucsim-" version ".tar.gz")) + "http://mazsola.iit.uni-miskolc.hu/ucsim/download/" + "v" (version-major+minor version) ".x/" + "ucsim_" version "_orig.tar.gz")) (sha256 (base32 - "080471wvkjdzxz5j3zdaq1apjcj84ql50kn26b7p4ansixnimml4")))) + "0qyrrna2ssvwla15al183r9zqnqdxxlqawyhx9c86a10m8q8qqlz")))) (build-system gnu-build-system) (arguments (list @@ -1545,10 +1545,10 @@ (define-public ucsim (home-page "http://mazsola.iit.uni-miskolc.hu/ucsim/") (synopsis "Simulators for various microcontroller families") (description "μCsim is a collection of software simulators for -microcontrollers in the Atmel AVR; Intel MCS-51 (8051); MOS Technology 6502; -Motorola 6800, 68HC08 and 6809; P1516; Padauk PDK13, PDK14 and PDK15; -STMicroelectronics ST7 and STM8; Xilinx PicoBlaze; and Zilog Z80 families, -plus many of their variants.") +microcontrollers in the Atmel AVR; Fairchild F8; Intel MCS-51 (8051) and 8085; +MOS Technology 6502; Motorola 6800, 6809, 68HC08, 68HC11 and 68HC12; P1516; +Padauk PDK13, PDK14 and PDK15; STMicroelectronics ST7 and STM8; Xilinx +PicoBlaze; and Zilog Z80 families, plus many of their variants.") (license license:gpl2+))) (define-public sdcc -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 15 10:25:51 2023 Received: (at 66001) by debbugs.gnu.org; 15 Sep 2023 14:25:51 +0000 Received: from localhost ([127.0.0.1]:44427 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qh9lX-0001rH-6T for submit@debbugs.gnu.org; Fri, 15 Sep 2023 10:25:51 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:49788) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qh9lU-0001qx-Vg for 66001@debbugs.gnu.org; Fri, 15 Sep 2023 10:25:49 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 421FB63337 for <66001@debbugs.gnu.org>; Fri, 15 Sep 2023 14:25:37 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo09-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo09-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id O1-pyMocVH99 for <66001@debbugs.gnu.org>; Fri, 15 Sep 2023 14:25:37 +0000 (UTC) Received: from localhost.localdomain (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id A47A763336 for <66001@debbugs.gnu.org>; Fri, 15 Sep 2023 14:25:13 +0000 (UTC) From: Simon South To: 66001@debbugs.gnu.org Subject: [PATCH 2/4] gnu: ucsim: Disable tests. Date: Fri, 15 Sep 2023 10:25:01 -0400 Message-ID: <070bba289fae9c4da0d5e25394e9fbdb86be8091.1694784333.git.simon@simonsouth.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 66001 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/embedded.scm (ucsim)[arguments]: Add #:tests?. [native-inputs]: Remove sdcc unconditionally. --- gnu/packages/embedded.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 12c92d0e30..80efe2363d 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1527,15 +1527,14 @@ (define-public ucsim (add-after 'unpack 'patch-makefiles (lambda _ (substitute* (find-files "." "(\\.mk$|\\.in$)") - (("/bin/sh") (which "sh")))))))) + (("/bin/sh") (which "sh")))))) + ;; μCsim's regression-test suite is of little use in this context since + ;; it doesn't stop or return an error code when it encounters a problem. + #:tests? #f)) (inputs (list ncurses)) (native-inputs - (append (list bison flex) - ;; Certain tests use assemblers provided by SDCC. - (if (not (%current-target-system)) - (list sdcc) - '()))) + (list bison flex)) (home-page "http://mazsola.iit.uni-miskolc.hu/ucsim/") (synopsis "Simulators for various microcontroller families") (description "μCsim is a collection of software simulators for -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Fri Sep 15 10:25:54 2023 Received: (at 66001) by debbugs.gnu.org; 15 Sep 2023 14:25:55 +0000 Received: from localhost ([127.0.0.1]:44429 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qh9la-0001rR-HQ for submit@debbugs.gnu.org; Fri, 15 Sep 2023 10:25:54 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:49806) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qh9lW-0001qz-9O for 66001@debbugs.gnu.org; Fri, 15 Sep 2023 10:25:50 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 9378163336 for <66001@debbugs.gnu.org>; Fri, 15 Sep 2023 14:25:38 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo09-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo09-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Z8THBqwiHP7m for <66001@debbugs.gnu.org>; Fri, 15 Sep 2023 14:25:38 +0000 (UTC) Received: from localhost.localdomain (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id C1B1463341 for <66001@debbugs.gnu.org>; Fri, 15 Sep 2023 14:25:12 +0000 (UTC) From: Simon South To: 66001@debbugs.gnu.org Subject: [PATCH 1/4] gnu: ucsim: Use gexps. Date: Fri, 15 Sep 2023 10:25:00 -0400 Message-ID: <5462007739ad4020a005fcd71d298dcdbd0f2c95.1694784333.git.simon@simonsouth.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 66001 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/embedded.scm (ucsim)[arguments]: Use gexp. --- gnu/packages/embedded.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 325013a627..12c92d0e30 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1521,12 +1521,13 @@ (define-public ucsim "080471wvkjdzxz5j3zdaq1apjcj84ql50kn26b7p4ansixnimml4")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-makefiles - (lambda _ - (substitute* (find-files "." "(\\.mk$|\\.in$)") - (("/bin/sh") (which "sh")))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-makefiles + (lambda _ + (substitute* (find-files "." "(\\.mk$|\\.in$)") + (("/bin/sh") (which "sh")))))))) (inputs (list ncurses)) (native-inputs -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 27 10:56:12 2023 Received: (at 66001) by debbugs.gnu.org; 27 Sep 2023 14:56:12 +0000 Received: from localhost ([127.0.0.1]:52239 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlVxU-0007Mf-Gn for submit@debbugs.gnu.org; Wed, 27 Sep 2023 10:56:12 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:53274) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlVxQ-0007M5-AC for 66001@debbugs.gnu.org; Wed, 27 Sep 2023 10:56:10 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 39D3A641DF for <66001@debbugs.gnu.org>; Wed, 27 Sep 2023 14:55:49 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo09-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo09-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AvKbGSUUUQ5o for <66001@debbugs.gnu.org>; Wed, 27 Sep 2023 14:55:49 +0000 (UTC) Received: from localhost.localdomain (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id E256464035 for <66001@debbugs.gnu.org>; Wed, 27 Sep 2023 14:55:48 +0000 (UTC) From: Simon South To: 66001@debbugs.gnu.org Subject: [PATCH v2 1/4] gnu: ucsim: Use gexps. Date: Wed, 27 Sep 2023 10:55:34 -0400 Message-ID: <29a0289b38cdf1d0ea55458398ef05ed879891ad.1695823937.git.simon@simonsouth.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 66001 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/embedded.scm (ucsim)[arguments]: Use gexp. --- gnu/packages/embedded.scm | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 46a9a3a70a..9d07bc4a55 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1604,12 +1604,13 @@ (define-public ucsim "080471wvkjdzxz5j3zdaq1apjcj84ql50kn26b7p4ansixnimml4")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-makefiles - (lambda _ - (substitute* (find-files "." "(\\.mk$|\\.in$)") - (("/bin/sh") (which "sh")))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-makefiles + (lambda _ + (substitute* (find-files "." "(\\.mk$|\\.in$)") + (("/bin/sh") (which "sh")))))))) (inputs (list ncurses)) (native-inputs -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 27 10:56:13 2023 Received: (at 66001) by debbugs.gnu.org; 27 Sep 2023 14:56:13 +0000 Received: from localhost ([127.0.0.1]:52241 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlVxU-0007Mi-Ps for submit@debbugs.gnu.org; Wed, 27 Sep 2023 10:56:13 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:53326) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlVxS-0007M9-QU for 66001@debbugs.gnu.org; Wed, 27 Sep 2023 10:56:11 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id ECC61641E3 for <66001@debbugs.gnu.org>; Wed, 27 Sep 2023 14:55:51 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo09-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo09-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qi1CTV9ZYYcH for <66001@debbugs.gnu.org>; Wed, 27 Sep 2023 14:55:51 +0000 (UTC) Received: from localhost.localdomain (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 99C0C64035 for <66001@debbugs.gnu.org>; Wed, 27 Sep 2023 14:55:51 +0000 (UTC) From: Simon South To: 66001@debbugs.gnu.org Subject: [PATCH v2 4/4] gnu: ucsim: Update to 0.8.0. Date: Wed, 27 Sep 2023 10:55:37 -0400 Message-ID: <2ef55ec35b12368bd1ee60b300b9f3dc7ae3b35a.1695823937.git.simon@simonsouth.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 66001 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/embedded.scm (ucsim): Update to 0.8.0. [source]: Update source URI. [description]: Update. --- gnu/packages/embedded.scm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 6a21a71d07..040290f94e 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1592,16 +1592,16 @@ (define-public ebusd (define-public ucsim (package (name "ucsim") - (version "0.7.1") + (version "0.8.0") (source (origin (method url-fetch) (uri (string-append - "http://mazsola.iit.uni-miskolc.hu/ucsim/download/unix/" - "source/v" (version-major+minor version) ".x/" - "ucsim-" version ".tar.gz")) + "http://mazsola.iit.uni-miskolc.hu/ucsim/download/" + "v" (version-major+minor version) ".x/" + "ucsim_" version "_orig.tar.gz")) (sha256 (base32 - "080471wvkjdzxz5j3zdaq1apjcj84ql50kn26b7p4ansixnimml4")))) + "0qyrrna2ssvwla15al183r9zqnqdxxlqawyhx9c86a10m8q8qqlz")))) (build-system gnu-build-system) (arguments (list @@ -1628,10 +1628,10 @@ (define-public ucsim (home-page "http://mazsola.iit.uni-miskolc.hu/ucsim/") (synopsis "Simulators for various microcontroller families") (description "μCsim is a collection of software simulators for -microcontrollers in the Atmel AVR; Intel MCS-51 (8051); MOS Technology 6502; -Motorola 6800, 68HC08 and 6809; P1516; Padauk PDK13, PDK14 and PDK15; -STMicroelectronics ST7 and STM8; Xilinx PicoBlaze; and Zilog Z80 families, -plus many of their variants.") +microcontrollers in the Atmel AVR; Fairchild F8; Intel MCS-51 (8051) and 8085; +MOS Technology 6502; Motorola 6800, 6809, 68HC08, 68HC11 and 68HC12; P1516; +Padauk PDK13, PDK14 and PDK15; STMicroelectronics ST7 and STM8; Xilinx +PicoBlaze; and Zilog Z80 families, plus many of their variants.") (license license:gpl2+))) (define-public sdcc -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 27 10:56:13 2023 Received: (at 66001) by debbugs.gnu.org; 27 Sep 2023 14:56:13 +0000 Received: from localhost ([127.0.0.1]:52243 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlVxV-0007Mt-8P for submit@debbugs.gnu.org; Wed, 27 Sep 2023 10:56:13 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:53318) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlVxS-0007M8-7O for 66001@debbugs.gnu.org; Wed, 27 Sep 2023 10:56:11 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 4F6D5641E2 for <66001@debbugs.gnu.org>; Wed, 27 Sep 2023 14:55:51 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo09-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo09-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rp3qJVLUSGev for <66001@debbugs.gnu.org>; Wed, 27 Sep 2023 14:55:50 +0000 (UTC) Received: from localhost.localdomain (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id AD46364035 for <66001@debbugs.gnu.org>; Wed, 27 Sep 2023 14:55:50 +0000 (UTC) From: Simon South To: 66001@debbugs.gnu.org Subject: [PATCH v2 3/4] gnu: ucsim: Move documentation to "doc" output. Date: Wed, 27 Sep 2023 10:55:36 -0400 Message-ID: <7939dfd0b6334965028b4bc44c41e3c8d1623092.1695823937.git.simon@simonsouth.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 66001 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/embedded.scm (ucsim)[arguments]<#:phases>: Expand "patch-makefiles" phase to set correct documentation-installation path. [outputs]: Add with "out", "doc". --- gnu/packages/embedded.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 517e5bcbf2..6a21a71d07 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1610,7 +1610,13 @@ (define-public ucsim (add-after 'unpack 'patch-makefiles (lambda _ (substitute* (find-files "." "(\\.mk$|\\.in$)") - (("/bin/sh") (which "sh")))))) + (("/bin/sh") (which "sh"))) + + ;; Ensure the documentation is installed to the correct path, + ;; without a duplicate "ucsim" segment (necessary as we are + ;; building μCsim outside of SDCC). + (substitute* "doc/Makefile.in" + (("@docdir@/ucsim") "@docdir@"))))) ;; μCsim's regression-test suite is of little use in this context since ;; it doesn't stop or return an error code when it encounters a problem. #:tests? #f)) @@ -1618,6 +1624,7 @@ (define-public ucsim (list ncurses)) (native-inputs (list bison flex)) + (outputs '("out" "doc")) (home-page "http://mazsola.iit.uni-miskolc.hu/ucsim/") (synopsis "Simulators for various microcontroller families") (description "μCsim is a collection of software simulators for -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 27 10:56:14 2023 Received: (at 66001) by debbugs.gnu.org; 27 Sep 2023 14:56:14 +0000 Received: from localhost ([127.0.0.1]:52245 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlVxV-0007My-Pp for submit@debbugs.gnu.org; Wed, 27 Sep 2023 10:56:14 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:53262) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlVxQ-0007M3-5U for 66001@debbugs.gnu.org; Wed, 27 Sep 2023 10:56:11 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id A0823641DC for <66001@debbugs.gnu.org>; Wed, 27 Sep 2023 14:55:48 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo09-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo09-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id eha2f8jLx245 for <66001@debbugs.gnu.org>; Wed, 27 Sep 2023 14:55:48 +0000 (UTC) Received: from localhost.localdomain (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 0733864035 for <66001@debbugs.gnu.org>; Wed, 27 Sep 2023 14:55:48 +0000 (UTC) From: Simon South To: 66001@debbugs.gnu.org Subject: [PATCH v2 0/4] gnu: ucsim: Update to 0.8.0; other improvements. Date: Wed, 27 Sep 2023 10:55:33 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 66001 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) I'm resubmitting this patch series rebased directly against master in the hope it will prompt qa.guix.gnu.org to pick it up for building. Otherwise the series is entirely unchanged. For convenience, here's the original cover letter: This patch series updates μCsim, a collection of software simulators for various microcontroller families, to version 0.8.0. It also tries to improve the package by - Modernizing it with the use of gexps. - Disabling tests. "make check" runs what is actually a regression-test suite[0], which is of little value here as it doesn't stop or return an error code when it encounters a problem. In fact it has been quietly failing this entire time due to missing dependencies but because it doesn't report any errors, no one noticed. This change also eliminates the possibility of a circular dependency between μCsim and SDCC, which will become important with a future patch to the sdcc package. - Moving the documentation to a separate "doc" output. I've tested these changes on AArch64 and x86-64 and everything appears fine. -- Simon South simon@simonsouth.net [0] Documented at http://mazsola.iit.uni-miskolc.hu/ucsim/testing.html Simon South (4): gnu: ucsim: Use gexps. gnu: ucsim: Disable tests. gnu: ucsim: Move documentation to "doc" output. gnu: ucsim: Update to 0.8.0. gnu/packages/embedded.scm | 47 ++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 20 deletions(-) base-commit: ce0cc6137df81919389f61671096a6ce701c0889 -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Wed Sep 27 10:56:41 2023 Received: (at 66001) by debbugs.gnu.org; 27 Sep 2023 14:56:41 +0000 Received: from localhost ([127.0.0.1]:52249 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlVxx-0007O0-CD for submit@debbugs.gnu.org; Wed, 27 Sep 2023 10:56:41 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:53746) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlVxv-0007Nk-1N for 66001@debbugs.gnu.org; Wed, 27 Sep 2023 10:56:40 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 1A3466406C for <66001@debbugs.gnu.org>; Wed, 27 Sep 2023 14:55:50 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo09-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo09-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id B_3r41c9YbVW for <66001@debbugs.gnu.org>; Wed, 27 Sep 2023 14:55:49 +0000 (UTC) Received: from localhost.localdomain (23-233-96-210.cpe.pppoe.ca [23.233.96.210]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id CC73E64035 for <66001@debbugs.gnu.org>; Wed, 27 Sep 2023 14:55:49 +0000 (UTC) From: Simon South To: 66001@debbugs.gnu.org Subject: [PATCH v2 2/4] gnu: ucsim: Disable tests. Date: Wed, 27 Sep 2023 10:55:35 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 66001 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) * gnu/packages/embedded.scm (ucsim)[arguments]: Add #:tests?. [native-inputs]: Remove sdcc unconditionally. --- gnu/packages/embedded.scm | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 9d07bc4a55..517e5bcbf2 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1610,15 +1610,14 @@ (define-public ucsim (add-after 'unpack 'patch-makefiles (lambda _ (substitute* (find-files "." "(\\.mk$|\\.in$)") - (("/bin/sh") (which "sh")))))))) + (("/bin/sh") (which "sh")))))) + ;; μCsim's regression-test suite is of little use in this context since + ;; it doesn't stop or return an error code when it encounters a problem. + #:tests? #f)) (inputs (list ncurses)) (native-inputs - (append (list bison flex) - ;; Certain tests use assemblers provided by SDCC. - (if (not (%current-target-system)) - (list sdcc) - '()))) + (list bison flex)) (home-page "http://mazsola.iit.uni-miskolc.hu/ucsim/") (synopsis "Simulators for various microcontroller families") (description "μCsim is a collection of software simulators for -- 2.41.0 From debbugs-submit-bounces@debbugs.gnu.org Thu Sep 28 05:32:53 2023 Received: (at 66001-done) by debbugs.gnu.org; 28 Sep 2023 09:32:53 +0000 Received: from localhost ([127.0.0.1]:53012 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlnO9-0003W3-2I for submit@debbugs.gnu.org; Thu, 28 Sep 2023 05:32:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59460) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qlnO8-0003Vr-5s for 66001-done@debbugs.gnu.org; Thu, 28 Sep 2023 05:32:52 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qlnNo-0000fk-F9; Thu, 28 Sep 2023 05:32:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=vYK+BlphHXzWLoVrPn7RjXTaK5kJV1BRY5w9uGjMVNE=; b=jA9KWAPg9Dl5dq1jLz63 ypuOSOreN6Rw382F+gy8WOqn6Z0ctQqX6Wq5Mgp2B89LRZeBt5ZZJMZGuqQoLr3dsXd4IF0n5fjXj eUhocOJxRUltwaHb56a5dwtOxuwffnyBpXgRIPCG2slXCkYY/5MXXm7zYlIMC60XUg6YWJn2951G7 pthpmelTniYyk71deAluFlEmwy8ZtWyMiAkDop11kxccxUHXQfmerEuntRa7bO0L47Hr8lu6HkoNB B6FTaLGgaKQiUPCoWYp6JvHo4IF0jhkGyWrkaNRDGHniabEE2KIoD3AxQtoC763PVm1KeXI3vYXEL ymkESIrBR9HuhQ==; From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Simon South Subject: Re: bug#66001: [PATCH 0/4] gnu: ucsim: Update to 0.8.0; other improvements. References: Date: Thu, 28 Sep 2023 11:32:29 +0200 In-Reply-To: (Simon South's message of "Wed, 27 Sep 2023 10:55:33 -0400") Message-ID: <87h6ney76a.fsf_-_@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 66001-done Cc: 66001-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Simon South skribis: > I'm resubmitting this patch series rebased directly against master in the= hope > it will prompt qa.guix.gnu.org to pick it up for building. It did the trick. > gnu: ucsim: Use gexps. > gnu: ucsim: Disable tests. > gnu: ucsim: Move documentation to "doc" output. > gnu: ucsim: Update to 0.8.0. Applied, thanks! Ludo=E2=80=99. From unknown Tue Jun 24 05:14:25 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Thu, 26 Oct 2023 11:24:06 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator