Package: guix-patches;
Reported by: Cayetano Santos <csantosb <at> inventati.org>
Date: Mon, 17 Mar 2025 10:23:04 UTC
Severity: normal
Tags: patch
To reply to this bug, email your comments to 77067 AT debbugs.gnu.org.
Toggle the display of automated, internal messages from the tracker.
View this report as an mbox folder, status mbox, maintainer mbox
guix-patches <at> gnu.org:bug#77067; Package guix-patches.
(Mon, 17 Mar 2025 10:23:05 GMT) Full text and rfc822 format available.Cayetano Santos <csantosb <at> inventati.org>:guix-patches <at> gnu.org.
(Mon, 17 Mar 2025 10:23:05 GMT) Full text and rfc822 format available.Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):
From: Cayetano Santos <csantosb <at> inventati.org> To: guix-patches <at> gnu.org Cc: Cayetano Santos <csantosb <at> inventati.org> Subject: [PATCH] gnu: icestorm: Update to 0.0-5.7fbf8c0. Date: Mon, 17 Mar 2025 11:21:33 +0100
* gnu/packages/fpga.scm (icestorm): Update to 0.0-5.7fbf8c0.
Change-Id: I545ac91c94a97989c3a1494479d36cb5bb46930d
---
gnu/packages/fpga.scm | 91 +++++++++++++++++++++++--------------------
1 file changed, 48 insertions(+), 43 deletions(-)
diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm
index c09fe9bc76..efe0fe89c3 100644
--- a/gnu/packages/fpga.scm
+++ b/gnu/packages/fpga.scm
@@ -269,49 +269,54 @@ (define-public yosys-clang
(synopsis "FPGA Verilog RTL synthesizer (Clang variant)")))
(define-public icestorm
- (let ((commit "2bc541743ada3542c6da36a50e66303b9cbd2059")
- (revision "4"))
- (package
- (name "icestorm")
- (version (git-version "0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/cliffordwolf/icestorm")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0d0ibdq3rzmjcbv97h4b9wgq8ikvgwlfw60spi2w81mis317lis8"))))
- (build-system gnu-build-system)
- (arguments
- `(#:tests? #f ; no unit tests that don't need an FPGA exist.
- #:make-flags (list "CC=gcc" "CXX=g++"
- (string-append "PREFIX=" (assoc-ref %outputs "out")))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'remove-usr-local
- (lambda _
- (substitute* "iceprog/Makefile"
- (("-I/usr/local/include") "")
- (("-L/usr/local/lib") ""))
- #t))
- (add-after 'remove-usr-local 'fix-usr-local
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "icebox/icebox_vlog.py"
- (("/usr/local/share") (string-append (assoc-ref outputs "out") "/share")))
- #t))
- (delete 'configure))))
- (inputs
- (list libftdi))
- (native-inputs
- `(("python-3" ,python)
- ("pkg-config" ,pkg-config)))
- (home-page "https://www.clifford.at/icestorm/")
- (synopsis "Project IceStorm - Lattice iCE40 FPGAs bitstream tools")
- (description "Project IceStorm - Lattice iCE40 FPGAs Bitstream Tools.
-Includes the actual FTDI connector.")
- (license license:isc))))
+ (let ((commit "7fbf8c0afbcf7665c45499b090409859b1815184")
+ (revision "5"))
+ (package
+ (name "icestorm")
+ (version (git-version "0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/YosysHQ/icestorm/")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0vwl0j5sw2awsv82s18zby522h2b6wa5jyc6dkpqfxybak19kv7f"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:tests? #f ;no unit tests that don't need an FPGA exist.
+ #:make-flags
+ #~(list (string-append "CC=" #$(cc-for-target))
+ (string-append "CXX=" #$(cxx-for-target))
+ (string-append "PREFIX=" #$output)
+ "ICEPROG=1")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-usr-local
+ (lambda* (#:key outputs #:allow-other-keys)
+ (with-directory-excursion "icepack"
+ (substitute* "Makefile"
+ (("/usr/local")
+ #$output)))
+ (with-directory-excursion "icebox"
+ (substitute* "Makefile"
+ (("/usr/local/share")
+ (string-append #$output "/share")))
+ (substitute* "icebox_vlog.py"
+ (("/usr/local/share")
+ (string-append #$output "/share"))))))
+ (delete 'configure))))
+ (inputs (list libftdi))
+ (native-inputs (list python pkg-config))
+ (home-page "https://prjicestorm.readthedocs.io/")
+ (synopsis "Project IceStorm")
+ (description
+ "Project IceStorm aims at documenting the bitstream format of
+Lattice iCE40 FPGAs and providing simple tools for analyzing and creating bitstream
+files.")
+ (license license:isc))))
(define-public nextpnr-ice40
(let* ((version "0.7")
base-commit: fd19785a9a7f111c6a97da25187c3351e7e8f3fd
--
2.48.1
guix-patches <at> gnu.org:bug#77067; Package guix-patches.
(Tue, 18 Mar 2025 15:46:04 GMT) Full text and rfc822 format available.Message #8 received at 77067 <at> debbugs.gnu.org (full text, mbox):
From: Cayetano Santos <csantosb <at> inventati.org> To: 77067 <at> debbugs.gnu.org Cc: Cayetano Santos <csantosb <at> inventati.org> Subject: [PATCH v1] gnu: icestorm: Update to 0.0-5.7fbf8c0. Date: Tue, 18 Mar 2025 16:45:00 +0100
* gnu/packages/fpga.scm (icestorm): Update to 0.0-5.7fbf8c0.
Change-Id: I545ac91c94a97989c3a1494479d36cb5bb46930d
---
gnu/packages/fpga.scm | 109 +++++++++++++++++++++++++-----------------
1 file changed, 66 insertions(+), 43 deletions(-)
diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm
index c09fe9bc76..01d16baf7a 100644
--- a/gnu/packages/fpga.scm
+++ b/gnu/packages/fpga.scm
@@ -75,7 +75,9 @@ (define-module (gnu packages fpga)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
#:use-module (gnu packages readline)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages tcl)
+ #:use-module (gnu packages texinfo)
#:use-module (gnu packages toolkits)
#:use-module (gnu packages version-control))
@@ -269,49 +271,70 @@ (define-public yosys-clang
(synopsis "FPGA Verilog RTL synthesizer (Clang variant)")))
(define-public icestorm
- (let ((commit "2bc541743ada3542c6da36a50e66303b9cbd2059")
- (revision "4"))
- (package
- (name "icestorm")
- (version (git-version "0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/cliffordwolf/icestorm")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0d0ibdq3rzmjcbv97h4b9wgq8ikvgwlfw60spi2w81mis317lis8"))))
- (build-system gnu-build-system)
- (arguments
- `(#:tests? #f ; no unit tests that don't need an FPGA exist.
- #:make-flags (list "CC=gcc" "CXX=g++"
- (string-append "PREFIX=" (assoc-ref %outputs "out")))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'remove-usr-local
- (lambda _
- (substitute* "iceprog/Makefile"
- (("-I/usr/local/include") "")
- (("-L/usr/local/lib") ""))
- #t))
- (add-after 'remove-usr-local 'fix-usr-local
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "icebox/icebox_vlog.py"
- (("/usr/local/share") (string-append (assoc-ref outputs "out") "/share")))
- #t))
- (delete 'configure))))
- (inputs
- (list libftdi))
- (native-inputs
- `(("python-3" ,python)
- ("pkg-config" ,pkg-config)))
- (home-page "https://www.clifford.at/icestorm/")
- (synopsis "Project IceStorm - Lattice iCE40 FPGAs bitstream tools")
- (description "Project IceStorm - Lattice iCE40 FPGAs Bitstream Tools.
-Includes the actual FTDI connector.")
- (license license:isc))))
+ (let ((commit "7fbf8c0afbcf7665c45499b090409859b1815184")
+ (revision "5"))
+ (package
+ (name "icestorm")
+ (version (git-version "0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/YosysHQ/icestorm/")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0vwl0j5sw2awsv82s18zby522h2b6wa5jyc6dkpqfxybak19kv7f"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:tests? #f ;no unit tests that don't need an FPGA exist.
+ #:make-flags
+ #~(list (string-append "CC="
+ #$(cc-for-target))
+ (string-append "CXX="
+ #$(cxx-for-target))
+ (string-append "PREFIX="
+ #$output) "ICEPROG=1")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-usr-local
+ (lambda* (#:key outputs #:allow-other-keys)
+ (with-directory-excursion "icepack"
+ (substitute* "Makefile"
+ (("/usr/local")
+ #$output)))
+ (with-directory-excursion "icebox"
+ (substitute* "Makefile"
+ (("/usr/local")
+ #$output))
+ (substitute* "icebox_vlog.py"
+ (("/usr/local")
+ #$output)))))
+ (add-after 'build 'make-info
+ (lambda* (#:key outputs #:allow-other-keys)
+ (with-directory-excursion "docs"
+ (invoke "make" "info")
+ (install-file "build/texinfo/projecticestorm.info"
+ (string-append #$output "/share/info"))
+ (copy-recursively "build/texinfo/projecticestorm-figures"
+ (string-append #$output
+ "/share/info/projecticestorm-figures")))))
+ (delete 'configure))))
+ (inputs (list libftdi))
+ (native-inputs (list python
+ pkg-config
+ ;; doc
+ texinfo
+ python-sphinx
+ python-sphinx-rtd-theme))
+ (home-page "https://prjicestorm.readthedocs.io/")
+ (synopsis "Project IceStorm")
+ (description
+ "Project IceStorm aims at documenting the bitstream format of
+Lattice iCE40 FPGAs and providing simple tools for analyzing and creating bitstream
+files.")
+ (license license:isc))))
(define-public nextpnr-ice40
(let* ((version "0.7")
base-commit: fd19785a9a7f111c6a97da25187c3351e7e8f3fd
--
2.48.1
guix-patches <at> gnu.org:bug#77067; Package guix-patches.
(Wed, 26 Mar 2025 23:09:02 GMT) Full text and rfc822 format available.Message #11 received at 77067 <at> debbugs.gnu.org (full text, mbox):
From: Nicolas Graves <ngraves <at> ngraves.fr> To: 77067 <at> debbugs.gnu.org Cc: csantosb <at> inventati.org Subject: QA review for 77067 Date: Thu, 27 Mar 2025 00:08:52 +0100
Guix QA review form submission: Hi Cayetano! The content of the patch seems OK, but you might be a little more precise about the changes in the commit message. Find out more about how they are written in Guix here : https://www.gnu.org/prep/standards/html_node/Change-Logs.html Items marked as checked: Lint warnings, Package builds -- Best regards, Nicolas Graves
guix-patches <at> gnu.org:bug#77067; Package guix-patches.
(Thu, 27 Mar 2025 08:19:02 GMT) Full text and rfc822 format available.Message #14 received at 77067 <at> debbugs.gnu.org (full text, mbox):
From: Cayetano Santos <csantosb <at> inventati.org> To: 77067 <at> debbugs.gnu.org Cc: Cayetano Santos <csantosb <at> inventati.org> Subject: [PATCH v2] gnu: icestorm: Update to 0.0-5.7fbf8c0. Date: Thu, 27 Mar 2025 09:18:01 +0100
* gnu/packages/fpga.scm (icestorm): Update to 0.0-5.7fbf8c0.
Change-Id: I545ac91c94a97989c3a1494479d36cb5bb46930d
- update to latest commit
- update source url and homepage
- include doc info file
- update CC, CXX and PREFIX variables
- updated /usr/local substitutions in makefiles
- replaced old style native inputs, including new requirements for doc
- improve synopsys and description
- tests require nextpnr-ice40, which depends on this package
Change-Id: I22d8adb52daac893bf7436fd86fefe0df18c7bf9
---
gnu/packages/fpga.scm | 108 +++++++++++++++++++++++++-----------------
1 file changed, 65 insertions(+), 43 deletions(-)
diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm
index 893e875276..b1ffde17bf 100644
--- a/gnu/packages/fpga.scm
+++ b/gnu/packages/fpga.scm
@@ -75,7 +75,9 @@ (define-module (gnu packages fpga)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
#:use-module (gnu packages readline)
+ #:use-module (gnu packages sphinx)
#:use-module (gnu packages tcl)
+ #:use-module (gnu packages texinfo)
#:use-module (gnu packages toolkits)
#:use-module (gnu packages version-control))
@@ -269,49 +271,69 @@ (define-public yosys-clang
(synopsis "FPGA Verilog RTL synthesizer (Clang variant)")))
(define-public icestorm
- (let ((commit "2bc541743ada3542c6da36a50e66303b9cbd2059")
- (revision "4"))
- (package
- (name "icestorm")
- (version (git-version "0.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/cliffordwolf/icestorm")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "0d0ibdq3rzmjcbv97h4b9wgq8ikvgwlfw60spi2w81mis317lis8"))))
- (build-system gnu-build-system)
- (arguments
- `(#:tests? #f ; no unit tests that don't need an FPGA exist.
- #:make-flags (list "CC=gcc" "CXX=g++"
- (string-append "PREFIX=" (assoc-ref %outputs "out")))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'remove-usr-local
- (lambda _
- (substitute* "iceprog/Makefile"
- (("-I/usr/local/include") "")
- (("-L/usr/local/lib") ""))
- #t))
- (add-after 'remove-usr-local 'fix-usr-local
- (lambda* (#:key outputs #:allow-other-keys)
- (substitute* "icebox/icebox_vlog.py"
- (("/usr/local/share") (string-append (assoc-ref outputs "out") "/share")))
- #t))
- (delete 'configure))))
- (inputs
- (list libftdi))
- (native-inputs
- `(("python-3" ,python)
- ("pkg-config" ,pkg-config)))
- (home-page "https://www.clifford.at/icestorm/")
- (synopsis "Project IceStorm - Lattice iCE40 FPGAs bitstream tools")
- (description "Project IceStorm - Lattice iCE40 FPGAs Bitstream Tools.
-Includes the actual FTDI connector.")
- (license license:isc))))
+ (let ((commit "7fbf8c0afbcf7665c45499b090409859b1815184")
+ (revision "5"))
+ (package
+ (name "icestorm")
+ (version (git-version "0.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/YosysHQ/icestorm/")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "0vwl0j5sw2awsv82s18zby522h2b6wa5jyc6dkpqfxybak19kv7f"))))
+ (build-system gnu-build-system)
+ (arguments
+ (list
+ #:tests? #f ; tests require nextpr-ice40, will be run in there
+ #:make-flags
+ #~(list (string-append "CC="
+ #$(cc-for-target))
+ (string-append "CXX="
+ #$(cxx-for-target))
+ (string-append "PREFIX="
+ #$output)
+ "ICEPROG=1")
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'fix-usr-local
+ (lambda* (#:key outputs #:allow-other-keys)
+ (substitute* "icepack/Makefile"
+ (("/usr/local")
+ #$output))
+ (substitute* "icebox/Makefile"
+ (("/usr/local")
+ #$output))
+ (substitute* "icebox/icebox_vlog.py"
+ (("/usr/local")
+ #$output))))
+ (add-after 'build 'make-info
+ (lambda* (#:key outputs #:allow-other-keys)
+ (with-directory-excursion "docs"
+ (invoke "make" "info")
+ (install-file "build/texinfo/projecticestorm.info"
+ (string-append #$output "/share/info"))
+ (copy-recursively "build/texinfo/projecticestorm-figures"
+ (string-append #$output
+ "/share/info/projecticestorm-figures")))))
+ (delete 'configure))))
+ (inputs (list libftdi))
+ (native-inputs (list python
+ pkg-config
+ ;; doc
+ texinfo
+ python-sphinx
+ python-sphinx-rtd-theme))
+ (home-page "https://prjicestorm.readthedocs.io/")
+ (synopsis "Project IceStorm")
+ (description
+ "Project IceStorm aims at documenting the bitstream format of
+Lattice iCE40 FPGAs and providing simple tools for analyzing and creating bitstream
+files.")
+ (license license:isc))))
(define-public nextpnr-ice40
(let* ((version "0.7")
base-commit: eb30f5ecbea896e9cf93722bf97681d208f1a7be
--
2.49.0
guix-patches <at> gnu.org:bug#77067; Package guix-patches.
(Thu, 27 Mar 2025 08:20:04 GMT) Full text and rfc822 format available.Message #17 received at 77067 <at> debbugs.gnu.org (full text, mbox):
From: Cayetano Santos <csantosb <at> inventati.org> To: Nicolas Graves <ngraves <at> ngraves.fr> Cc: 77067 <at> debbugs.gnu.org Subject: Re: QA review for 77067 Date: Thu, 27 Mar 2025 09:19:45 +0100
[Message part 1 (text/plain, inline)]
>Thu 27 Mar 2025 at 00:08, Nicolas Graves <ngraves <at> ngraves.fr> wrote: > The content of the patch seems OK, but you might be a little more precise about the > changes in the commit message. Find out more about how they are written in Guix here : > https://www.gnu.org/prep/standards/html_node/Change-Logs.html Updated the commit message in v2, with a list of changes.
[signature.asc (application/pgp-signature, inline)]
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997,2003 nCipher Corporation Ltd,
1994-97 Ian Jackson.