From patchwork Tue Jun 14 18:58:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Polidoro X-Patchwork-Id: 40009 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 E56DF27BBEA; Tue, 14 Jun 2022 20:00:35 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 4E14A27BBE9 for ; Tue, 14 Jun 2022 20:00:35 +0100 (BST) Received: from localhost ([::1]:37816 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o1BmE-0001YA-Am for patchwork@mira.cbaines.net; Tue, 14 Jun 2022 15:00:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47890) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1Bli-0001Xl-Nz for guix-patches@gnu.org; Tue, 14 Jun 2022 15:00:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41898) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o1Bli-0005NV-B1 for guix-patches@gnu.org; Tue, 14 Jun 2022 15:00:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o1Bli-0005VS-9m for guix-patches@gnu.org; Tue, 14 Jun 2022 15:00:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#55981] [PATCH] gnu: teensy-loader-cli: Update to 2.2. Resent-From: peter@polidoro.io Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 14 Jun 2022 19:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 55981 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 55981@debbugs.gnu.org Cc: Peter Polidoro X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.165523316121078 (code B ref -1); Tue, 14 Jun 2022 19:00:02 +0000 Received: (at submit) by debbugs.gnu.org; 14 Jun 2022 18:59:21 +0000 Received: from localhost ([127.0.0.1]:35793 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o1Bky-0005Tn-I2 for submit@debbugs.gnu.org; Tue, 14 Jun 2022 14:59:21 -0400 Received: from lists.gnu.org ([209.51.188.17]:45308) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o1Bkv-0005TZ-Gr for submit@debbugs.gnu.org; Tue, 14 Jun 2022 14:59:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47822) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1Bkv-0001V3-8a for guix-patches@gnu.org; Tue, 14 Jun 2022 14:59:13 -0400 Received: from fossa.birch.relay.mailchannels.net ([23.83.209.62]:31739) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o1Bks-0005Kr-RB for guix-patches@gnu.org; Tue, 14 Jun 2022 14:59:12 -0400 X-Sender-Id: dreamhost|x-authsender|peter@polidoro.io Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 4FB8E8E1A3F; Tue, 14 Jun 2022 18:59:06 +0000 (UTC) Received: from pdx1-sub0-mail-a294.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 73D1E8E26EE; Tue, 14 Jun 2022 18:59:04 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1655233144; a=rsa-sha256; cv=none; b=upakzkrEQ0A6Qfl0Xu5ZG/HHu3rgiG8b/5QbTuLM1yAkVqMd9eBiT+6+4FUCRrChaZdnDw 1Zq0xu4CrLuEHDnBfGOdbMpRVuLDPmn457woi97bEuL1unsmVih2JaOv86peWHZ3uj9S7G ahB+heew2Kil2aNrI+s8NLzKHkeFkGNCAAfC74ZM2SN8jTZ6mTAjFVuDP2I+KtSfhqL0SM UtVNuqx8DsjIPJBWCznHnQkAnxPcA9hy5SP5liosNH7dLbXNt81sdHW9qdwShndc0geaEm gblI0sUCU/UIuUQ8WiO/jtrVNWSWM8NGt+MirBgfOXbEXlmyA4JxYJg6NR/Jsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1655233144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding:dkim-signature; bh=qsG1dBjRlR9qd9jMbbVesNUpSvZdgfDa05Pdyqp40JI=; b=oHIMYa5ztW41uyJbUmIe3J/tmaTjauIkjb0A/QG3mQnkGzx6228I92B904D7ORA1EpgWl5 TF7oTA6/7y7KzNLpYAo4vX7piQtNTnNHgwpvwYQrFnS0dGh7DXwMjOiU9orXPzZZPosBVW KDioF8J9UVnKR7SH+y+GaN0jhs+3io1dW9nld/yRufdWKOqcZC192KodP4x7O2YW1ZkU16 TdBab20j3U8eaAzaccr+SF+USTcQt+4S5fbiiPSSc4ATpuSBl46HbuWomUwAv2LDLOZQGt 4TuZJnRGTEFSDp0WlT9ojGCRzy1w5nMAdbvhIacocuRamSTgX1ez6xM5pi31nA== ARC-Authentication-Results: i=1; rspamd-848669fb87-ms8g7; auth=pass smtp.auth=dreamhost smtp.mailfrom=peter@polidoro.io X-Sender-Id: dreamhost|x-authsender|peter@polidoro.io X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|peter@polidoro.io X-MailChannels-Auth-Id: dreamhost X-Dime-Supply: 507108655610ea8b_1655233145782_3398504070 X-MC-Loop-Signature: 1655233145782:3064492483 X-MC-Ingress-Time: 1655233145782 Received: from pdx1-sub0-mail-a294.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.98.242.216 (trex/6.7.1); Tue, 14 Jun 2022 18:59:05 +0000 Received: from knave.hhmi.org (unknown [206.241.0.254]) (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) (Authenticated sender: peter@polidoro.io) by pdx1-sub0-mail-a294.dreamhost.com (Postfix) with ESMTPSA id 4LMyQb5mp5z2T; Tue, 14 Jun 2022 11:59:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=polidoro.io; s=dreamhost; t=1655233144; bh=qsG1dBjRlR9qd9jMbbVesNUpSvZdgfDa05Pdyqp40JI=; h=From:To:Cc:Subject:Date:Content-Type:Content-Transfer-Encoding; b=ITPxK8fXs+X/gfeR9iP5J4PpDyePWK5IZmB/0/RAu9VERiqwB6e2YHLjTy7aoERLW Ygg1QhX8Umwkk5t0GddURnEkpf8HlwgI2fFbslrQltdEcXp5weNn8njiExKwgwvbf0 c3wHauCqdX1jfd9gLneMzwHtJ4PE2dwhBY8wHZizKu2mEPHx+Pyi/L94FPudcHgwCh IP2ReOVvE50c9RDcS8cL7i0RLLXBeONqFjkS9ZmrXvGQUAW4UjVvAq6hDIGfIs2/wT r6VfZbNag8//amGlHNrov6JSkwHJlWsyPM3V/a2AhNa7FfnkZdmxRkOGwQ/nxhZn5n u6OwYbJTl5JKA== From: peter@polidoro.io Date: Tue, 14 Jun 2022 14:58:53 -0400 Message-Id: <703325a05d2d9ac343c1f5585260d00233b9a762.1655232993.git.peter@polidoro.io> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Received-SPF: pass client-ip=23.83.209.62; envelope-from=peter@polidoro.io; helo=fossa.birch.relay.mailchannels.net X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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 From: Peter Polidoro * gnu/packages/flashing-tools.scm (teensy-loader-cli): Update to 2.2. --- gnu/packages/flashing-tools.scm | 83 +++++++++++++++------------------ 1 file changed, 38 insertions(+), 45 deletions(-) diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm index 764fc9b422..08300cb860 100644 --- a/gnu/packages/flashing-tools.scm +++ b/gnu/packages/flashing-tools.scm @@ -9,6 +9,7 @@ ;;; Copyright © 2018–2021 Tobias Geerinckx-Rice ;;; Copyright © 2021 Ricardo Wurmus ;;; Copyright © 2021 Mathieu Othacehe +;;; Copyright © 2022 Peter Polidoro ;;; ;;; This file is part of GNU Guix. ;;; @@ -217,56 +218,48 @@ (define-public dfu-util (license license:gpl2+))) (define-public teensy-loader-cli - ;; The repo does not tag versions nor does it use releases, but a commit - ;; message says "Importing 2.1", while the sourcce still says "2.0". So pin - ;; to a fixed commit. - (let ((commit "f289b7a2e5627464044249f0e5742830e052e360")) - (package - (name "teensy-loader-cli") - (version (git-version "2.1" "1" commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/PaulStoffregen/teensy_loader_cli") - (commit commit))) - (sha256 (base32 "0sssim56pwsxp5cp5dlf6mi9h5fx2592m6j1g7abnm0s09b0lpdx")) - (file-name (git-file-name name version)) - (modules '((guix build utils))) - (snippet - `(begin - ;; Remove example flash files and teensy rebooter flash binaries. - (for-each delete-file (find-files "." "\\.(elf|hex)$")) - ;; Fix the version - (substitute* "teensy_loader_cli.c" - (("Teensy Loader, Command Line, Version 2.0\\\\n") - (string-append "Teensy Loader, Command Line, " ,version "\\n"))) - #t)) + (package + (name "teensy-loader-cli") + (version "2.2") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/PaulStoffregen/teensy_loader_cli") + (commit version))) + (sha256 (base32 "12n8ifz4gph1anhwd8if3j1kw0wc3yxf48abbyxl8071l9vj3m0b")) + (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet + `(begin + ;; Remove example flash files and teensy rebooter flash binaries. + (for-each delete-file (find-files "." "\\.(elf|hex)$")) + #t)) (patches (search-patches "teensy-loader-cli-help.patch")))) - (build-system gnu-build-system) - (arguments - '(#:tests? #f ;; Makefile has no test target - #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)) - #:phases - (modify-phases %standard-phases - (delete 'configure) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin"))) - (install-file "teensy_loader_cli" bin) - #t)))))) - (inputs - (list libusb-compat)) - (synopsis "Command line firmware uploader for Teensy development boards") - (description - "The Teensy loader program communicates with your Teensy board when the + (build-system gnu-build-system) + (arguments + '(#:tests? #f ;; Makefile has no test target + #:make-flags (list "CC=gcc" (string-append "PREFIX=" %output)) + #:phases + (modify-phases %standard-phases + (delete 'configure) + (replace 'install + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (bin (string-append out "/bin"))) + (install-file "teensy_loader_cli" bin) + #t)))))) + (inputs + (list libusb-compat)) + (synopsis "Command line firmware uploader for Teensy development boards") + (description + "The Teensy loader program communicates with your Teensy board when the HalfKay bootloader is running, so you can upload new programs and run them. You need to add the udev rules to make the Teensy update available for non-root users.") - (home-page "https://www.pjrc.com/teensy/loader_cli.html") - (license license:gpl3)))) + (home-page "https://www.pjrc.com/teensy/loader_cli.html") + (license license:gpl3))) (define-public rkflashtool (let ((commit "8966c4e277de8148290554aaaa4146a3a84a3c53")