From adde76d065a053a0ef7cb529edccc1f7f0467b35 Mon Sep 17 00:00:00 2001
From: Andreas Enge <andreas@enge.fr>
Date: Wed, 15 Oct 2025 13:51:37 +0200
Subject: [PATCH] Revert "gnu: Remove wally-cli."

This reverts commit cc6b41f168074cda034a988fffa3c447b3abea26.

The software still compiles, works and has users.

Change-Id: I986f67c0e30110dcd8cc0166abe9bb605cb5920f
---
 gnu/packages/flashing-tools.scm | 48 +++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

diff --git a/gnu/packages/flashing-tools.scm b/gnu/packages/flashing-tools.scm
index 87d48843d5f01efdcdc9b75887e640281aab6253..f591e57f34b583859d4d161ebc2f99cb4fe97c28 100644
--- a/gnu/packages/flashing-tools.scm
+++ b/gnu/packages/flashing-tools.scm
@@ -760,6 +760,54 @@ formats, and can perform many different manipulations.")
 It can be used to upload images to I.MX SoC's using at least their boot ROM.")
     (license license:bsd-3)))
 
+;; The upstream repository has been archived on 2024-08-21,
+;; the replacement Keymapp does not seem to be free software.
+;; Keep it as long as it builds and works and no replacement is in sight.
+(define-public wally-cli
+  (let ((commit "b0fafe52cc7fb9d55f2b968d4548c99917c7325c")
+        (revision "0"))
+    (package
+      (name "wally-cli")
+      (version (git-version "2.0.1" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/zsa/wally-cli")
+               (commit commit)))
+         (sha256
+          (base32 "09phq2g51x7rlalzb87aqf48p3j4s7s5jdf5vdf48l9805hi2yha"))
+         (file-name (git-file-name name version))))
+      (build-system go-build-system)
+      (arguments
+       (list
+        #:install-source? #f
+        #:import-path "github.com/zsa/wally-cli"
+        #:phases
+        #~(modify-phases %standard-phases
+            ;; XXX: Upstream Golang module name was changed from
+            ;; <gopkg.in/cheggaaa/pb.v1> to <github.com/cheggaaa/pb>, adjust
+            ;; references to it accordingly. Remove it in the new release of
+            ;; the package.
+            (add-after 'unpack 'fix-module-name
+              (lambda* (#:key import-path #:allow-other-keys)
+                (with-directory-excursion (string-append "src/" import-path)
+                  (substitute* "main.go"
+                    (("gopkg.in/cheggaaa/pb.v1") "github.com/cheggaaa/pb"))))))))
+      (native-inputs
+       (list go-github-com-briandowns-spinner
+             go-github-com-google-gousb
+             go-github-com-logrusorgru-aurora
+             go-github-com-marcinbor85-gohex
+             go-github-com-cheggaaa-pb
+             pkg-config))
+      (home-page "https://ergodox-ez.com/pages/wally")
+      (synopsis "Flashing tool for ZSA keyboards")
+      (description
+       "This tool is for flashing custom layouts to
+@url{https://ergodox-ez.com/,ZSA keyboards}.")
+      (license license:expat))))
+
 (define-public wlink
   (package
     (name "wlink")