From patchwork Tue Mar 8 15:52:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 37653 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 5C83327BBEA; Tue, 8 Mar 2022 15:55:51 +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 1AD3727BBE9 for ; Tue, 8 Mar 2022 15:55:51 +0000 (GMT) Received: from localhost ([::1]:39082 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nRcBi-0004pB-4s for patchwork@mira.cbaines.net; Tue, 08 Mar 2022 10:55:50 -0500 Received: from eggs.gnu.org ([209.51.188.92]:53182) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nRc92-0000eI-Ag for guix-patches@gnu.org; Tue, 08 Mar 2022 10:53:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:35310) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nRc90-0002TZ-Bz for guix-patches@gnu.org; Tue, 08 Mar 2022 10:53:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nRc90-0006b4-BT for guix-patches@gnu.org; Tue, 08 Mar 2022 10:53:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54260] [PATCH v3 2/2] gnu: ucsim: Update to 0.7.1. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 08 Mar 2022 15:53:02 +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.164675474025284 (code B ref 54260); Tue, 08 Mar 2022 15:53:02 +0000 Received: (at 54260) by debbugs.gnu.org; 8 Mar 2022 15:52:20 +0000 Received: from localhost ([127.0.0.1]:57438 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nRc8J-0006Ze-G4 for submit@debbugs.gnu.org; Tue, 08 Mar 2022 10:52:19 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:51608) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nRc8H-0006Z8-6W for 54260@debbugs.gnu.org; Tue, 08 Mar 2022 10:52:17 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id E2B9681BB8 for <54260@debbugs.gnu.org>; Tue, 8 Mar 2022 15:52:11 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo03-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo03-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xGEZAxNfxuRq for <54260@debbugs.gnu.org>; Tue, 8 Mar 2022 15:52:10 +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 B52A181BB9 for <54260@debbugs.gnu.org>; Tue, 8 Mar 2022 15:52:10 +0000 (UTC) From: Simon South Date: Tue, 8 Mar 2022 10:52:09 -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 7b219203be..f3d5e8fced 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,39 +1487,39 @@ (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") - #:phases + `(#: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); 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.") (license license:gpl2+))) (define-public sdcc