* [bug#66060] [PATCH 1/5] gnu: sigrok-firmware-fx2lafw: Rely on implicit inputs.
2023-09-17 22:11 [bug#66060] [PATCH 0/5] gnu: sigrok-firmware-fx2lafw: Update; improve package Simon South
@ 2023-09-17 22:12 ` Simon South
2023-09-17 22:12 ` [bug#66060] [PATCH 2/5] gnu: sigrok-firmware-fx2lafw: Remove input labels Simon South
` (4 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Simon South @ 2023-09-17 22:12 UTC (permalink / raw)
To: 66060
This effectively reverts commit 79f0bd7, "gnu: sigrok-firmware-fx2lafw: Fix
build."
* gnu/packages/electronics.scm (sigrok-firmware-fx2lafw)[arguments]: Remove
with #:implicit-inputs?.
[native-inputs]: Remove all but sdcc.
---
gnu/packages/electronics.scm | 14 +-------------
1 file changed, 1 insertion(+), 13 deletions(-)
diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm
index 6e6071e6e6..182e183312 100644
--- a/gnu/packages/electronics.scm
+++ b/gnu/packages/electronics.scm
@@ -34,7 +34,6 @@ (define-module (gnu packages electronics)
#:use-module (gnu packages algebra)
#:use-module (gnu packages autotools)
#:use-module (gnu packages base)
- #:use-module (gnu packages bash)
#:use-module (gnu packages boost)
#:use-module (gnu packages c)
#:use-module (gnu packages check)
@@ -42,7 +41,6 @@ (define-module (gnu packages electronics)
#:use-module (gnu packages documentation)
#:use-module (gnu packages embedded)
#:use-module (gnu packages fontutils)
- #:use-module (gnu packages gawk)
#:use-module (gnu packages gl)
#:use-module (gnu packages glib)
#:use-module (gnu packages graphviz)
@@ -134,18 +132,8 @@ (define-public sigrok-firmware-fx2lafw
(sha256
(base32
"0fyfd82mvrcf55v5a3afq1mh1kfswk4c37qrbln6x92jm3b41x53"))))
- (arguments
- `(#:implicit-inputs? #f))
(native-inputs
- `(("awk" ,gawk)
- ("bash" ,bash)
- ("coreutils" ,coreutils)
- ("grep" ,grep)
- ("gzip" ,gzip)
- ("make" ,gnu-make)
- ("sdcc" ,sdcc)
- ("sed" ,sed)
- ("tar" ,tar)))
+ `(("sdcc" ,sdcc)))
(build-system gnu-build-system)
(home-page "https://www.sigrok.org/wiki/Fx2lafw")
(synopsis "Firmware for Cypress FX2 chips")
--
2.41.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#66060] [PATCH 2/5] gnu: sigrok-firmware-fx2lafw: Remove input labels.
2023-09-17 22:11 [bug#66060] [PATCH 0/5] gnu: sigrok-firmware-fx2lafw: Update; improve package Simon South
2023-09-17 22:12 ` [bug#66060] [PATCH 1/5] gnu: sigrok-firmware-fx2lafw: Rely on implicit inputs Simon South
@ 2023-09-17 22:12 ` Simon South
2023-09-17 22:12 ` [bug#66060] [PATCH 3/5] gnu: sigrok-firmware-fx2lafw: Adjust format Simon South
` (3 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Simon South @ 2023-09-17 22:12 UTC (permalink / raw)
To: 66060
* gnu/packages/electronics.scm (sigrok-firmware-fx2lafw)[native-inputs]:
Remove input labels.
---
gnu/packages/electronics.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm
index 182e183312..48d1099c78 100644
--- a/gnu/packages/electronics.scm
+++ b/gnu/packages/electronics.scm
@@ -133,7 +133,7 @@ (define-public sigrok-firmware-fx2lafw
(base32
"0fyfd82mvrcf55v5a3afq1mh1kfswk4c37qrbln6x92jm3b41x53"))))
(native-inputs
- `(("sdcc" ,sdcc)))
+ (list sdcc))
(build-system gnu-build-system)
(home-page "https://www.sigrok.org/wiki/Fx2lafw")
(synopsis "Firmware for Cypress FX2 chips")
--
2.41.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#66060] [PATCH 3/5] gnu: sigrok-firmware-fx2lafw: Adjust format.
2023-09-17 22:11 [bug#66060] [PATCH 0/5] gnu: sigrok-firmware-fx2lafw: Update; improve package Simon South
2023-09-17 22:12 ` [bug#66060] [PATCH 1/5] gnu: sigrok-firmware-fx2lafw: Rely on implicit inputs Simon South
2023-09-17 22:12 ` [bug#66060] [PATCH 2/5] gnu: sigrok-firmware-fx2lafw: Remove input labels Simon South
@ 2023-09-17 22:12 ` Simon South
2023-09-17 22:12 ` [bug#66060] [PATCH 4/5] gnu: sigrok-firmware-fx2lafw: Explicitly disable tests Simon South
` (2 subsequent siblings)
5 siblings, 0 replies; 7+ messages in thread
From: Simon South @ 2023-09-17 22:12 UTC (permalink / raw)
To: 66060
* gnu/packages/electronics.scm (sigrok-firmware-fx2lafw): Move build-system
above native-inputs.
---
gnu/packages/electronics.scm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm
index 48d1099c78..63ca4ae0f1 100644
--- a/gnu/packages/electronics.scm
+++ b/gnu/packages/electronics.scm
@@ -132,9 +132,9 @@ (define-public sigrok-firmware-fx2lafw
(sha256
(base32
"0fyfd82mvrcf55v5a3afq1mh1kfswk4c37qrbln6x92jm3b41x53"))))
+ (build-system gnu-build-system)
(native-inputs
(list sdcc))
- (build-system gnu-build-system)
(home-page "https://www.sigrok.org/wiki/Fx2lafw")
(synopsis "Firmware for Cypress FX2 chips")
(description "Fx2lafw is free firmware for Cypress FX2 chips which makes them usable
--
2.41.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#66060] [PATCH 4/5] gnu: sigrok-firmware-fx2lafw: Explicitly disable tests.
2023-09-17 22:11 [bug#66060] [PATCH 0/5] gnu: sigrok-firmware-fx2lafw: Update; improve package Simon South
` (2 preceding siblings ...)
2023-09-17 22:12 ` [bug#66060] [PATCH 3/5] gnu: sigrok-firmware-fx2lafw: Adjust format Simon South
@ 2023-09-17 22:12 ` Simon South
2023-09-17 22:12 ` [bug#66060] [PATCH 5/5] gnu: sigrok-firmware-fx2lafw: Update to 0.1.7-1.96b0b47 Simon South
2023-09-25 11:02 ` [bug#66060] [PATCH 0/5] gnu: sigrok-firmware-fx2lafw: Update; improve package Christopher Baines
5 siblings, 0 replies; 7+ messages in thread
From: Simon South @ 2023-09-17 22:12 UTC (permalink / raw)
To: 66060
* gnu/packages/electronics.scm (sigrok-firmware-fx2lafw)[arguments]: Add
with #:tests?.
---
gnu/packages/electronics.scm | 2 ++
1 file changed, 2 insertions(+)
diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm
index 63ca4ae0f1..2330a5922f 100644
--- a/gnu/packages/electronics.scm
+++ b/gnu/packages/electronics.scm
@@ -133,6 +133,8 @@ (define-public sigrok-firmware-fx2lafw
(base32
"0fyfd82mvrcf55v5a3afq1mh1kfswk4c37qrbln6x92jm3b41x53"))))
(build-system gnu-build-system)
+ (arguments
+ (list #:tests? #f)) ; no test suite
(native-inputs
(list sdcc))
(home-page "https://www.sigrok.org/wiki/Fx2lafw")
--
2.41.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#66060] [PATCH 5/5] gnu: sigrok-firmware-fx2lafw: Update to 0.1.7-1.96b0b47.
2023-09-17 22:11 [bug#66060] [PATCH 0/5] gnu: sigrok-firmware-fx2lafw: Update; improve package Simon South
` (3 preceding siblings ...)
2023-09-17 22:12 ` [bug#66060] [PATCH 4/5] gnu: sigrok-firmware-fx2lafw: Explicitly disable tests Simon South
@ 2023-09-17 22:12 ` Simon South
2023-09-25 11:02 ` [bug#66060] [PATCH 0/5] gnu: sigrok-firmware-fx2lafw: Update; improve package Christopher Baines
5 siblings, 0 replies; 7+ messages in thread
From: Simon South @ 2023-09-17 22:12 UTC (permalink / raw)
To: 66060
* gnu/packages/electronics.scm (sigrok-firmware-fx2lafw): Update to
0.1.7-1.96b0b47.
[source]: Switch to git-fetch.
[native-inputs]: Add autoconf, automake.
---
gnu/packages/electronics.scm | 45 +++++++++++++++++++-----------------
1 file changed, 24 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm
index 2330a5922f..77a9fc2d90 100644
--- a/gnu/packages/electronics.scm
+++ b/gnu/packages/electronics.scm
@@ -121,27 +121,30 @@ (define-public libsigrokdecode
(license license:gpl3+))))
(define-public sigrok-firmware-fx2lafw
- (package
- (name "sigrok-firmware-fx2lafw")
- (version "0.1.7")
- (source (origin
- (method url-fetch)
- (uri (string-append
- "http://sigrok.org/download/source/sigrok-firmware-fx2lafw/"
- "sigrok-firmware-fx2lafw-" version ".tar.gz"))
- (sha256
- (base32
- "0fyfd82mvrcf55v5a3afq1mh1kfswk4c37qrbln6x92jm3b41x53"))))
- (build-system gnu-build-system)
- (arguments
- (list #:tests? #f)) ; no test suite
- (native-inputs
- (list sdcc))
- (home-page "https://www.sigrok.org/wiki/Fx2lafw")
- (synopsis "Firmware for Cypress FX2 chips")
- (description "Fx2lafw is free firmware for Cypress FX2 chips which makes them usable
-as simple logic analyzer and/or oscilloscope hardware.")
- (license license:gpl2+)))
+ (let ((commit "96b0b476522c3f93a47ff8f479ec08105ba6a2a5")
+ (revision "1"))
+ (package
+ (name "sigrok-firmware-fx2lafw")
+ (version (git-version "0.1.7" revision commit))
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "git://sigrok.org/sigrok-firmware-fx2lafw")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "1n5nj2g2m5ih59591ny2drrv25zviqcwyx1cfdhy8ijl82yxjkmb"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list #:tests? #f)) ; no test suite
+ (native-inputs
+ (list autoconf automake sdcc))
+ (home-page "https://www.sigrok.org/wiki/Fx2lafw")
+ (synopsis "Firmware for Cypress FX2 chips")
+ (description "Fx2lafw is free firmware for Cypress FX2 chips which makes
+them usable as simple logic analyzer and/or oscilloscope hardware.")
+ (license license:gpl2+))))
(define-public libsigrok
(let ((commit "a7e919a3a6b7fd511acbe1a280536b76c70c28d2")
--
2.41.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#66060] [PATCH 0/5] gnu: sigrok-firmware-fx2lafw: Update; improve package.
2023-09-17 22:11 [bug#66060] [PATCH 0/5] gnu: sigrok-firmware-fx2lafw: Update; improve package Simon South
` (4 preceding siblings ...)
2023-09-17 22:12 ` [bug#66060] [PATCH 5/5] gnu: sigrok-firmware-fx2lafw: Update to 0.1.7-1.96b0b47 Simon South
@ 2023-09-25 11:02 ` Christopher Baines
5 siblings, 0 replies; 7+ messages in thread
From: Christopher Baines @ 2023-09-25 11:02 UTC (permalink / raw)
To: Simon South; +Cc: 66060-done, 66060
[-- Attachment #1: Type: text/plain, Size: 1396 bytes --]
Simon South <simon@simonsouth.net> writes:
> This patch series updates sigrok-firmware-fx2lafw, firmware for inexpensive
> logic analyzers built around the Cypress Semiconductor FX2 microcontroller, to
> the latest revision in its source-code repository.
>
> This brings in eight commits[0] that improve the software in small ways, most
> importantly allowing it to build with the latest version of SDCC, 4.3.0
> (patches to follow). Note the project's last formal release was in 2019.
>
> This series also simplifies and updates the style of the package definition.
>
> I've tested these changes on AArch64 and x86-64 using PulseView and a real
> FX2-based device (a MuseTech nanoDLA) and everything seems fine.
>
> --
> Simon South
> simon@simonsouth.net
>
> [0] See
> http://sigrok.org/gitweb/?p=sigrok-firmware-fx2lafw.git;a=shortlog;h=96b0b47
>
>
> Simon South (5):
> gnu: sigrok-firmware-fx2lafw: Rely on implicit inputs.
> gnu: sigrok-firmware-fx2lafw: Remove input labels.
> gnu: sigrok-firmware-fx2lafw: Adjust format.
> gnu: sigrok-firmware-fx2lafw: Explicitly disable tests.
> gnu: sigrok-firmware-fx2lafw: Update to 0.1.7-1.96b0b47.
Thanks for the patches Simon, I've added a comment and a bit to the
commit message in the last commit to give the reason for using a VCS
snapshot and pushed these patches to master as
9239c822469259509dbbc7a6966b5b265dd7c4f1.
Chris
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]
^ permalink raw reply [flat|nested] 7+ messages in thread