From patchwork Tue Sep 19 14:26:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 54055 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 0F98B27BBE9; Tue, 19 Sep 2023 15:27:04 +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=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 DD62A27BBE2 for ; Tue, 19 Sep 2023 15:27:01 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qibgl-0000jt-EZ; Tue, 19 Sep 2023 10:26:55 -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 1qibgk-0000jX-5K for guix-patches@gnu.org; Tue, 19 Sep 2023 10:26:54 -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 1qibgj-0004Cp-Ty for guix-patches@gnu.org; Tue, 19 Sep 2023 10:26:53 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qibgs-0008Uf-GE for guix-patches@gnu.org; Tue, 19 Sep 2023 10:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66101] [PATCH 1/1] gnu: stcgal: Update to 1.10. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 19 Sep 2023 14:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66101 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66101@debbugs.gnu.org Received: via spool by 66101-submit@debbugs.gnu.org id=B66101.169513360132619 (code B ref 66101); Tue, 19 Sep 2023 14:27:02 +0000 Received: (at 66101) by debbugs.gnu.org; 19 Sep 2023 14:26:41 +0000 Received: from localhost ([127.0.0.1]:57613 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qibgX-0008U2-Cx for submit@debbugs.gnu.org; Tue, 19 Sep 2023 10:26:41 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:46430) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qibgW-0008To-0h for 66101@debbugs.gnu.org; Tue, 19 Sep 2023 10:26:40 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id D599C635E0 for <66101@debbugs.gnu.org>; Tue, 19 Sep 2023 14:26:25 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo07-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo07-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dpSAVLdzkPyh for <66101@debbugs.gnu.org>; Tue, 19 Sep 2023 14:26:25 +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 62DA560AE2 for <66101@debbugs.gnu.org>; Tue, 19 Sep 2023 14:26:25 +0000 (UTC) From: Simon South Date: Tue, 19 Sep 2023 10:26:21 -0400 Message-ID: <855fd7094b36aa2d0bd007ae8d2eaa626c6962a1.1695133090.git.simon@simonsouth.net> X-Mailer: git-send-email 2.41.0 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/embedded.scm (stcgal): Update to 1.10. [source]: Update comment; remove obsolete snippet. [description]: Update. --- gnu/packages/embedded.scm | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/gnu/packages/embedded.scm b/gnu/packages/embedded.scm index 325013a627..884aee690a 100644 --- a/gnu/packages/embedded.scm +++ b/gnu/packages/embedded.scm @@ -1357,12 +1357,11 @@ (define-public fc-host-tools (define-public stcgal (package (name "stcgal") - (version "1.6") + (version "1.10") (source (origin - ;; Neither the unit tests nor the "doc" subdirectory referred to - ;; by stcgal's setup.py is present in the source distribution on - ;; PyPI, so we fetch directly from the project's git repository - ;; instead. + ;; The "doc" subdirectory referred to by stcgal's setup.py is + ;; missing from the source distribution on PyPI so we fetch + ;; directly from the project's git repository instead. (method git-fetch) (uri (git-reference (url "https://github.com/grigorig/stcgal") @@ -1370,14 +1369,7 @@ (define-public stcgal (file-name (git-file-name name version)) (sha256 (base32 - "1d10qxyghz66zp7iqpm8q8rfv9jz9n609gxmfcav1lssmf1dlyk3")) - (modules '((guix build utils))) - (snippet - ;; Make tests compatible with PyYAML 6 and later. - '(substitute* '("tests/test_program.py" - "tests/test_fuzzing.py") - (("yaml\\.load\\(test_file\\.read\\(\\)\\)") - "yaml.load(test_file.read(), Loader=yaml.SafeLoader)"))))) + "04hsj49sw5mb6swhd3sdsm7dzwp1frnzpmq70wgsn5vmjavb1ka8")))) (build-system python-build-system) (propagated-inputs (list python-pyserial python-pyusb python-tqdm)) @@ -1388,7 +1380,7 @@ (define-public stcgal (synopsis "Programmer for STC 8051-compatible microcontrollers") (description "stcgal is a command-line flash-programming tool for STC MCU's line of Intel 8051-compatible microcontrollers, including those in the -STC89, STC90, STC10, STC11, STC12, STC15 and STC8 series.") +STC89, STC90, STC10, STC11, STC12, STC15, STC8 and STC32 series.") (license license:expat))) (define-public stlink