From patchwork Sat Mar 5 12:58:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 37616 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 CAEB127BBE9; Sat, 5 Mar 2022 13:00:24 +0000 (GMT) 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_H5,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS 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 7F2F427BBEA for ; Sat, 5 Mar 2022 13:00:24 +0000 (GMT) Received: from localhost ([::1]:53606 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nQU1H-00021P-I0 for patchwork@mira.cbaines.net; Sat, 05 Mar 2022 08:00:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43310) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQU0x-0001zm-KY for guix-patches@gnu.org; Sat, 05 Mar 2022 08:00:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53575) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nQU0x-0002bF-9n for guix-patches@gnu.org; Sat, 05 Mar 2022 08:00:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nQU0x-0002qN-85 for guix-patches@gnu.org; Sat, 05 Mar 2022 08:00:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54260] [PATCH 1/3] gnu: ucsim: Don't run tests when cross-compiling. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Mar 2022 13:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54260 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54260@debbugs.gnu.org Received: via spool by 54260-submit@debbugs.gnu.org id=B54260.164648514910799 (code B ref 54260); Sat, 05 Mar 2022 13:00:03 +0000 Received: (at 54260) by debbugs.gnu.org; 5 Mar 2022 12:59:09 +0000 Received: from localhost ([127.0.0.1]:47465 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQU05-0002o7-HZ for submit@debbugs.gnu.org; Sat, 05 Mar 2022 07:59:09 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:48148) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQU04-0002nt-DW for 54260@debbugs.gnu.org; Sat, 05 Mar 2022 07:59:08 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 95E2DEAE46 for <54260@debbugs.gnu.org>; Sat, 5 Mar 2022 12:59:02 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo01-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo01-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id cRVBBOrqnL9P for <54260@debbugs.gnu.org>; Sat, 5 Mar 2022 12:59:02 +0000 (UTC) Received: from laptop.simonsouth.net (23-233-96-244.cpe.pppoe.ca [23.233.96.244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 5E9F9EAE24 for <54260@debbugs.gnu.org>; Sat, 5 Mar 2022 12:59:02 +0000 (UTC) From: Simon South Date: Sat, 5 Mar 2022 07:58:59 -0500 Message-Id: X-Mailer: git-send-email 2.25.2 In-Reply-To: References: MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/embedded.scm (ucsim)[arguments]: Skip tests when cross-compiling. --- gnu/packages/embedded.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index f7573618b9..43fba510da 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1501,6 +1501,7 @@ (define-public ucsim "--enable-m6809-port" "--enable-p1516-port" "--enable-st7-port") + #:tests? ,(not (%current-target-system)) ; run unless cross-compiling #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-makefiles From patchwork Sat Mar 5 12:59:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 37617 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 1EFB627BBEA; Sat, 5 Mar 2022 13:00:25 +0000 (GMT) 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_H5,RCVD_IN_MSPIKE_WL,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 E6F4327BBE9 for ; Sat, 5 Mar 2022 13:00:24 +0000 (GMT) Received: from localhost ([::1]:53654 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nQU1H-00023P-Vy for patchwork@mira.cbaines.net; Sat, 05 Mar 2022 08:00:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43318) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQU0y-000206-98 for guix-patches@gnu.org; Sat, 05 Mar 2022 08:00:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53576) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nQU0x-0002fY-Vk for guix-patches@gnu.org; Sat, 05 Mar 2022 08:00:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nQU0x-0002qY-U2 for guix-patches@gnu.org; Sat, 05 Mar 2022 08:00:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54260] [PATCH 2/3] gnu: ucsim: Don't explicitly return #t from phases. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Mar 2022 13:00:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54260 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54260@debbugs.gnu.org Received: via spool by 54260-submit@debbugs.gnu.org id=B54260.164648515210821 (code B ref 54260); Sat, 05 Mar 2022 13:00:03 +0000 Received: (at 54260) by debbugs.gnu.org; 5 Mar 2022 12:59:12 +0000 Received: from localhost ([127.0.0.1]:47468 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQU07-0002oS-P1 for submit@debbugs.gnu.org; Sat, 05 Mar 2022 07:59:12 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:48190) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQU05-0002nw-Mc for 54260@debbugs.gnu.org; Sat, 05 Mar 2022 07:59:10 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 64640EAE24 for <54260@debbugs.gnu.org>; Sat, 5 Mar 2022 12:59:04 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo01-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo01-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Qm3dx5eN2VMl for <54260@debbugs.gnu.org>; Sat, 5 Mar 2022 12:59:02 +0000 (UTC) Received: from laptop.simonsouth.net (23-233-96-244.cpe.pppoe.ca [23.233.96.244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 7B5D7EAE45 for <54260@debbugs.gnu.org>; Sat, 5 Mar 2022 12:59:02 +0000 (UTC) From: Simon South Date: Sat, 5 Mar 2022 07:59:00 -0500 Message-Id: <49559efd0d392df29393ac7441b83f14c2840b21.1646484354.git.simon@simonsouth.net> X-Mailer: git-send-email 2.25.2 In-Reply-To: References: MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/embedded.scm (ucsim)[arguments]: Don't explicitly return #t from phases. --- gnu/packages/embedded.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 43fba510da..1d232e471a 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1507,13 +1507,11 @@ (define-public ucsim (add-after 'unpack 'patch-makefiles (lambda _ (substitute* (find-files "." "(\\.mk$|\\.in$)") - (("/bin/sh") (which "sh"))) - #t)) + (("/bin/sh") (which "sh"))))) (add-after 'install 'remove-empty-directory (lambda* (#:key outputs #:allow-other-keys) (delete-file-recursively - (string-append (assoc-ref outputs "out") "/share/man")) - #t))))) + (string-append (assoc-ref outputs "out") "/share/man"))))))) (native-inputs (list bison flex)) (home-page "http://mazsola.iit.uni-miskolc.hu/ucsim/") From patchwork Sat Mar 5 12:59:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 37615 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 B4E0827BBEB; Sat, 5 Mar 2022 13:00:24 +0000 (GMT) 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_H5,RCVD_IN_MSPIKE_WL,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 4842E27BBE9 for ; Sat, 5 Mar 2022 13:00:24 +0000 (GMT) Received: from localhost ([::1]:53618 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nQU1H-00021o-A4 for patchwork@mira.cbaines.net; Sat, 05 Mar 2022 08:00:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:43320) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nQU0y-00020Z-RV for guix-patches@gnu.org; Sat, 05 Mar 2022 08:00:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53577) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nQU0y-0002fh-Ht for guix-patches@gnu.org; Sat, 05 Mar 2022 08:00:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nQU0y-0002qg-GS for guix-patches@gnu.org; Sat, 05 Mar 2022 08:00:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54260] [PATCH 3/3] gnu: ucsim: Update to 0.7.1. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 05 Mar 2022 13:00:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54260 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54260@debbugs.gnu.org Received: via spool by 54260-submit@debbugs.gnu.org id=B54260.164648515210827 (code B ref 54260); Sat, 05 Mar 2022 13:00:04 +0000 Received: (at 54260) by debbugs.gnu.org; 5 Mar 2022 12:59:12 +0000 Received: from localhost ([127.0.0.1]:47470 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQU08-0002oU-61 for submit@debbugs.gnu.org; Sat, 05 Mar 2022 07:59:12 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:48156) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nQU04-0002nu-DX for 54260@debbugs.gnu.org; Sat, 05 Mar 2022 07:59:11 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id DE77FEAE40 for <54260@debbugs.gnu.org>; Sat, 5 Mar 2022 12:59:02 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo01-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo01-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id z4VSz2rXGeCS for <54260@debbugs.gnu.org>; Sat, 5 Mar 2022 12:59:02 +0000 (UTC) Received: from laptop.simonsouth.net (23-233-96-244.cpe.pppoe.ca [23.233.96.244]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id 93FA5EAE49 for <54260@debbugs.gnu.org>; Sat, 5 Mar 2022 12:59:02 +0000 (UTC) From: Simon South Date: Sat, 5 Mar 2022 07:59:01 -0500 Message-Id: X-Mailer: git-send-email 2.25.2 In-Reply-To: References: MIME-Version: 1.0 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: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/embedded.scm (ucsim): Update to 0.7.1. [source]: Update URI. [arguments]<#:configure-flags>: Remove as all stable ports are now built by default. <#:phases>: Remove obsolete "remove-empty-directory" phase. [inputs]: Add ncurses, needed for the serialview utility. [native-inputs]: Add sdcc when needed for tests. [description]: Update to mention newly supported microcontroller families. --- gnu/packages/embedded.scm | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 1d232e471a..f93968dd59 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -56,6 +56,7 @@ (define-module (gnu packages embedded) #:use-module (gnu packages libftdi) #:use-module (gnu packages libusb) #:use-module (gnu packages messaging) + #:use-module (gnu packages ncurses) #:use-module (gnu packages perl) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) @@ -1486,40 +1487,40 @@ (define-public ebusd (define-public ucsim (package (name "ucsim") - (version "0.6-pre68") + (version "0.7.1") (source (origin (method url-fetch) (uri (string-append "http://mazsola.iit.uni-miskolc.hu/ucsim/download/unix/" - "devel/ucsim-" version ".tar.gz")) + "source/v" (version-major+minor version) ".x/" + "ucsim-" version ".tar.gz")) (sha256 (base32 - "1bfj21f5pcfcg1xqqynlcfr8mn6qj5705cgc2lfr2s3n97qsd9df")))) + "080471wvkjdzxz5j3zdaq1apjcj84ql50kn26b7p4ansixnimml4")))) (build-system gnu-build-system) (arguments - `(#:configure-flags '("--enable-avr-port" - "--enable-m6809-port" - "--enable-p1516-port" - "--enable-st7-port") - #:tests? ,(not (%current-target-system)) ; run unless cross-compiling + `(#:tests? ,(not (%current-target-system)) ; run unless cross-compiling #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-makefiles (lambda _ (substitute* (find-files "." "(\\.mk$|\\.in$)") - (("/bin/sh") (which "sh"))))) - (add-after 'install 'remove-empty-directory - (lambda* (#:key outputs #:allow-other-keys) - (delete-file-recursively - (string-append (assoc-ref outputs "out") "/share/man"))))))) + (("/bin/sh") (which "sh")))))))) + (inputs + (list ncurses)) (native-inputs - (list bison flex)) + (append (list bison flex) + ;; Certain tests use assemblers provided by SDCC. + (if (not (%current-target-system)) + (list sdcc) + '()))) (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); Motorola 68HC08 and -6809; P1516; Padauk PDK13, PDK14 and PDK15; STMicroelectronics ST7 and STM8; -and Zilog Z80 families, plus many of their variants.") +microcontrollers in the Atmel AVR; Intel MCS-51 (8051); Motorola 6800, 68HC08 +and 6809; MOS Technology 6502; P1516; Padauk PDK13, PDK14 and PDK15; Philips +XA; STMicroelectronics ST7 and STM8; Xilinx PicoBlaze; and Zilog Z80 families, +plus many of their variants.") (license license:gpl2+))) (define-public sdcc