From patchwork Fri Jul 21 23:50:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karl Hallsby X-Patchwork-Id: 51915 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 0D36527BBE9; Sat, 22 Jul 2023 00:52:43 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 1209727BBE2 for ; Sat, 22 Jul 2023 00:52:41 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qMzun-0002Zy-Ih; Fri, 21 Jul 2023 19:52:05 -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 1qMzum-0002ZH-39 for guix-patches@gnu.org; Fri, 21 Jul 2023 19:52:04 -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 1qMzul-0000pt-Hk for guix-patches@gnu.org; Fri, 21 Jul 2023 19:52:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qMzul-0001iE-EE for guix-patches@gnu.org; Fri, 21 Jul 2023 19:52:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64778] [PATCH 5/5] gnu: Add wally-cli Resent-From: Karl Hallsby Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Jul 2023 23:52:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64778 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 64778@debbugs.gnu.org Cc: Karl Hallsby Received: via spool by 64778-submit@debbugs.gnu.org id=B64778.16899834876507 (code B ref 64778); Fri, 21 Jul 2023 23:52:03 +0000 Received: (at 64778) by debbugs.gnu.org; 21 Jul 2023 23:51:27 +0000 Received: from localhost ([127.0.0.1]:35032 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMzuB-0001gs-0C for submit@debbugs.gnu.org; Fri, 21 Jul 2023 19:51:27 -0400 Received: from mail-qk1-x72f.google.com ([2607:f8b0:4864:20::72f]:42202) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qMzu4-0001ft-3B for 64778@debbugs.gnu.org; Fri, 21 Jul 2023 19:51:20 -0400 Received: by mail-qk1-x72f.google.com with SMTP id af79cd13be357-76ae0784e0bso53106785a.0 for <64778@debbugs.gnu.org>; Fri, 21 Jul 2023 16:51:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hallsby.com; s=google; t=1689983474; x=1690588274; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=cv5C44yUW+ReZ2eLE9yCitYbCxWGFJTKA/bu+o927AE=; b=bfc4/W2Qk5PP6RXNyesp68RjC5mbvfVanPiMSuy9q36TJj0Yn5AAioDwQRW/TTvDaf TlY3E7Zqp86rAnsyNGEWLvlRithnNo7e3azynhQMoOBvcrXUYuvBRzA+daJK4i9dCPf5 PfgGslEY/9OEvBe2j9l3+PY43gKkeeaAMy2PFgYEcQ36s9qQ11tQfLbeQVu/NMjtNipo B6C3pIwYmHwPUDytLZjRmPNi8hCvLAKihGJvnigPRTr4/SoPykCveVxy+7HPdknSRuLa 5f659bgA+cW/gigcCk1+fqGvCRnZj27twCWFpf0VNpvpu8EkscoyQl38HCSQGe+RdPJ3 YNnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689983474; x=1690588274; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cv5C44yUW+ReZ2eLE9yCitYbCxWGFJTKA/bu+o927AE=; b=X3n+6412CIzR7oEoSwfL6OVZKw14//NPrcMmu7CjcohhhZBE42z6CEQc3JidZzGpO7 NNTKshjRP/xEBWINGTUlTVyEz5p1LdyZHDkaAniRCzcE2wwOPZnpdOkUu723z0+IM45Y /BaWMHvzpc+OLxWq809uEJtMqJX28fxHlnmCZUGGjU+e1NEhVwDhUkjXg95h3UhVlkSN v5ubs7Sd5eLaaEi/giR2T7UbQ/BOgUWvwXPEVucO4RIRv5Rn8BabhhYEEmLdLZQKan2T PMItYG3l5jvVaEu/ZIJNzSSs4DIiNigi+8qWaHc7wZVaKGYGfOEwzfpvg5DDqZgi+z2q MRdQ== X-Gm-Message-State: ABy/qLbyg0OvGqKJ/lKGkY4kda+arnEt7b5vDRdUfIayy5QH8+KeOR6l 2dhblmaWym2Mo8vpuhFyfx4TN8/GxDSJ9XoOKBE= X-Google-Smtp-Source: APBJJlGiuC6xYPQX+IsQVK57/TwuF9zke5Cl6RI5QxdjsAPIgXNwxjaV/9O6grPzv9Fe9mI2EjJHiw== X-Received: by 2002:a05:620a:1a0d:b0:767:4715:87e8 with SMTP id bk13-20020a05620a1a0d00b00767471587e8mr1842059qkb.33.1689983474453; Fri, 21 Jul 2023 16:51:14 -0700 (PDT) Received: from Karl-Desktop.raven (1459483-v115.1145-static.batvilaa.metronetinc.net. [192.69.181.148]) by smtp.gmail.com with ESMTPSA id z27-20020a05620a101b00b0075b168fcde9sm1472469qkj.77.2023.07.21.16.51.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Jul 2023 16:51:14 -0700 (PDT) Date: Fri, 21 Jul 2023 18:50:59 -0500 Message-Id: <41425a05d3dd3ea2e521ffe84037501a9bd1ad79.1689982943.git.karl@hallsby.com> X-Mailer: git-send-email 2.40.1 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: , Reply-to: Karl Hallsby X-ACL-Warn: , Karl Hallsby via Guix-patches X-Patchwork-Original-From: Karl Hallsby via Guix-patches via From: Karl Hallsby 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/golang.scm (wally-cli): New variable. Init at 2.0.1. --- gnu/packages/golang.scm | 45 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 495e32dd18..ef6ad0b561 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -12206,6 +12206,51 @@ (define-public go-github-com-marcinbor85-gohex (description "A Go library for parsing Intel HEX files") (license license:expat)))) +(define-public wally-cli + (package + (name "wally-cli") + (version "2.0.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/zsa/wally-cli") + (commit (string-append version "-linux")))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1iswh1z7llapjn116lyr5lvry7q93zfaasxvm36q5jx09hf91v1n")))) + (native-inputs + (list pkg-config + go-github-com-carrlos0-spin + go-github-com-google-gousb + go-github-com-marcinbor85-gohex + go-github-com-mattn-go-runewidth + go-golang-org-x-sys + go-github-com-cheggaaa-pb-v1)) + (inputs (list libusb)) + (build-system go-build-system) + (arguments + `(#:import-path "github.com/zsa/wally-cli" + ;; We don't need to install the source code for end-user applications. + #:install-source? #f + #:phases + (modify-phases %standard-phases + (add-before 'build 'fix-cheggaaa-pb-go-mod-require + ;; Some files that use this package use a strange package path that + ;; go-build-system does not like. So, we replace the imported + ;; package's old name with this new one, which does work. + (lambda* (#:key import-path #:allow-other-keys) + (substitute* (list (string-append "src/" import-path "/go.mod") + (string-append "src/" import-path "/main.go")) + (("gopkg.in/cheggaaa/pb.v1") + "github.com/cheggaaa/pb/v1"))))))) + (home-page "https://ergodox-ez.com/pages/wally-planck") + (synopsis "A tool to flash firmware to mechanical keyboards") + (description "Provides a command-line interface for the Wally GUI utility for +flashing firmware to mechanical keyboards. Particularly for Ergodox, ZSA Moonlander, +and Planck keyboards.") + (license license:expat))) + (define-public go-github-com-gsterjov-go-libsecret (let ((commit "a6f4afe4910cad8688db3e0e9b9ac92ad22d54e1") (revision "0"))