GNU logs - #77067, boring messages

Message sent to guix-patches@HIDDEN:


X-Loop: help-debbugs@HIDDEN
Subject: [bug#77067] [PATCH] gnu: icestorm: Update to 0.0-5.7fbf8c0.
Resent-From: Cayetano Santos <csantosb@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Mon, 17 Mar 2025 10:23:04 +0000
Resent-Message-ID: <handler.77067.B.174220694116197 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: report 77067
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 77067 <at> debbugs.gnu.org
Cc: Cayetano Santos <csantosb@HIDDEN>
X-Debbugs-Original-To: guix-patches@HIDDEN
Received: via spool by submit <at> debbugs.gnu.org id=B.174220694116197
          (code B ref -1); Mon, 17 Mar 2025 10:23:04 +0000
Received: (at submit) by debbugs.gnu.org; 17 Mar 2025 10:22:21 +0000
Received: from localhost ([127.0.0.1]:55835 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tu7bu-0004Cj-Nk
	for submit <at> debbugs.gnu.org; Mon, 17 Mar 2025 06:22:20 -0400
Received: from lists.gnu.org ([2001:470:142::17]:39244)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <csantosb@HIDDEN>)
 id 1tu7bq-0004BE-Ih
 for submit <at> debbugs.gnu.org; Mon, 17 Mar 2025 06:22:16 -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 <csantosb@HIDDEN>)
 id 1tu7bk-0006FG-1f
 for guix-patches@HIDDEN; Mon, 17 Mar 2025 06:22:08 -0400
Received: from confino.investici.org ([2a11:7980:1::2:0])
 by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.90_1) (envelope-from <csantosb@HIDDEN>)
 id 1tu7bh-0003vs-4P
 for guix-patches@HIDDEN; Mon, 17 Mar 2025 06:22:07 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inventati.org;
 s=stigmate; t=1742206918;
 bh=OaM8jaG0MyZlIfqGe5j5rVUdujWPAWgyprxR0sITwl8=;
 h=From:To:Cc:Subject:Date:From;
 b=FP0diYQvIDhJe/6jdBI+zRS3VbyhvrZ3rLOo94R6TAGmMHGLPyhp76YrDf34sNBwf
 GAutRPwl7eIOugAFR8TaVW+IEg3juEQz2Jv/10fIW65vweNtqjhA+W89n6PfGF3eU1
 7LpI5ro/FjrzKW+/VBIdhAmhZMHDRTYbY3RWktVY=
Received: from mx1.investici.org (unknown [127.0.0.1])
 by confino.investici.org (Postfix) with ESMTP id 4ZGWHB31Tbz119y;
 Mon, 17 Mar 2025 10:21:58 +0000 (UTC)
Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19])
 (Authenticated sender: cayetano.santos@HIDDEN) by localhost (Postfix)
 with ESMTPSA id 4ZGWHB20psz119b; 
 Mon, 17 Mar 2025 10:21:58 +0000 (UTC)
From: Cayetano Santos <csantosb@HIDDEN>
Date: Mon, 17 Mar 2025 11:21:33 +0100
Message-ID: <c815c7f4a486b1c14a89131875c9f31db3f59c89.1742206893.git.csantosb@HIDDEN>
X-Mailer: git-send-email 2.48.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2a11:7980:1::2:0;
 envelope-from=csantosb@HIDDEN; helo=confino.investici.org
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, SPF_HELO_PASS=-0.001,
 SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 0.9 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.1 (/)

* 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

Message sent:


Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-Mailer: MIME-tools 5.505 (Entity 5.505)
Content-Type: text/plain; charset=utf-8
X-Loop: help-debbugs@HIDDEN
From: help-debbugs@HIDDEN (GNU bug Tracking System)
To: Cayetano Santos <csantosb@HIDDEN>
Subject: bug#77067: Acknowledgement ([PATCH] gnu: icestorm: Update to
 0.0-5.7fbf8c0.)
Message-ID: <handler.77067.B.174220694116197.ack <at> debbugs.gnu.org>
References: <c815c7f4a486b1c14a89131875c9f31db3f59c89.1742206893.git.csantosb@HIDDEN>
X-Gnu-PR-Message: ack 77067
X-Gnu-PR-Package: guix-patches
X-Gnu-PR-Keywords: patch
Reply-To: 77067 <at> debbugs.gnu.org
Date: Mon, 17 Mar 2025 10:23:05 +0000

Thank you for filing a new bug report with debbugs.gnu.org.

This is an automatically generated reply to let you know your message
has been received.

Your message is being forwarded to the package maintainers and other
interested parties for their attention; they will reply in due course.

Your message has been sent to the package maintainer(s):
 guix-patches@HIDDEN

If you wish to submit further information on this problem, please
send it to 77067 <at> debbugs.gnu.org.

Please do not send mail to help-debbugs@HIDDEN unless you wish
to report a problem with the Bug-tracking system.

--=20
77067: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D77067
GNU Bug Tracking System
Contact help-debbugs@HIDDEN with problems

Message sent to guix-patches@HIDDEN:


X-Loop: help-debbugs@HIDDEN
Subject: [bug#77067] [PATCH v1] gnu: icestorm: Update to 0.0-5.7fbf8c0.
References: <c815c7f4a486b1c14a89131875c9f31db3f59c89.1742206893.git.csantosb@HIDDEN>
In-Reply-To: <c815c7f4a486b1c14a89131875c9f31db3f59c89.1742206893.git.csantosb@HIDDEN>
Resent-From: Cayetano Santos <csantosb@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Tue, 18 Mar 2025 15:46:04 +0000
Resent-Message-ID: <handler.77067.B77067.174231273027006 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 77067
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 77067 <at> debbugs.gnu.org
Cc: Cayetano Santos <csantosb@HIDDEN>
Received: via spool by 77067-submit <at> debbugs.gnu.org id=B77067.174231273027006
          (code B ref 77067); Tue, 18 Mar 2025 15:46:04 +0000
Received: (at 77067) by debbugs.gnu.org; 18 Mar 2025 15:45:30 +0000
Received: from localhost ([127.0.0.1]:42492 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1tuZ89-00070t-V7
	for submit <at> debbugs.gnu.org; Tue, 18 Mar 2025 11:45:30 -0400
Received: from confino.investici.org ([2a11:7980:1::2:0]:45767)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <csantosb@HIDDEN>)
 id 1tuZ84-0006yz-So
 for 77067 <at> debbugs.gnu.org; Tue, 18 Mar 2025 11:45:23 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inventati.org;
 s=stigmate; t=1742312717;
 bh=Qq9dJ0kqTD2Jejby46v3v5n1ep6DCv6DKbPIIEPGecE=;
 h=From:To:Cc:Subject:Date:From;
 b=o4ZuaF+dre/XgNmLY374BDaBDYi8Mz7ywIsO999KO/M8BTqIDWYLb5eW8tzMxC9GV
 xwdHlsoU9t1LAZwRJprcDqN/+dFy52TMzIaK5vureZNy+iDmpXsxLpws04lYcH51pI
 pKWSwdbQI3LsPlDTBjeSsHKbuhVskJPwkTiUI/sg=
Received: from mx1.investici.org (unknown [127.0.0.1])
 by confino.investici.org (Postfix) with ESMTP id 4ZHGPn4dX1z115h;
 Tue, 18 Mar 2025 15:45:17 +0000 (UTC)
Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19])
 (Authenticated sender: cayetano.santos@HIDDEN) by localhost (Postfix)
 with ESMTPSA id 4ZHGPn3cQYz115F; 
 Tue, 18 Mar 2025 15:45:17 +0000 (UTC)
From: Cayetano Santos <csantosb@HIDDEN>
Date: Tue, 18 Mar 2025 16:45:00 +0100
Message-ID: <63bf77a7f1202463433a72acf1de536c9e3a2505.1742312700.git.csantosb@HIDDEN>
X-Mailer: git-send-email 2.48.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

* 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

Message sent to guix-patches@HIDDEN:


X-Loop: help-debbugs@HIDDEN
Subject: [bug#77067] QA review for 77067
References: <c815c7f4a486b1c14a89131875c9f31db3f59c89.1742206893.git.csantosb@HIDDEN>
In-Reply-To: <c815c7f4a486b1c14a89131875c9f31db3f59c89.1742206893.git.csantosb@HIDDEN>
Resent-From: Nicolas Graves <ngraves@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Wed, 26 Mar 2025 23:09:02 +0000
Resent-Message-ID: <handler.77067.B77067.174303054112430 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 77067
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 77067 <at> debbugs.gnu.org
Cc: csantosb@HIDDEN
Received: via spool by 77067-submit <at> debbugs.gnu.org id=B77067.174303054112430
          (code B ref 77067); Wed, 26 Mar 2025 23:09:02 +0000
Received: (at 77067) by debbugs.gnu.org; 26 Mar 2025 23:09:01 +0000
Received: from localhost ([127.0.0.1]:44856 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1txZro-0003EH-MT
	for submit <at> debbugs.gnu.org; Wed, 26 Mar 2025 19:09:01 -0400
Received: from 7.mo563.mail-out.ovh.net ([46.105.59.58]:36211)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <ngraves@HIDDEN>)
 id 1txZrk-0003D2-2J
 for 77067 <at> debbugs.gnu.org; Wed, 26 Mar 2025 19:08:58 -0400
Received: from director2.derp.mail-out.ovh.net
 (director2.derp.mail-out.ovh.net [79.137.60.36])
 by mo563.mail-out.ovh.net (Postfix) with ESMTPS id 4ZNMsx5RT6z1bmr;
 Wed, 26 Mar 2025 23:08:53 +0000 (UTC)
Received: from director2.derp.mail-out.ovh.net
 (director2.derp.mail-out.ovh.net. [127.0.0.1])
 by director2.derp.mail-out.ovh.net (inspect_sender_mail_agent) with SMTP
 for <77067 <at> debbugs.gnu.org>; Wed, 26 Mar 2025 23:08:53 +0000 (UTC)
Received: from mta2.priv.ovhmail-u1.ea.mail.ovh.net (unknown [10.110.188.181])
 by director2.derp.mail-out.ovh.net (Postfix) with ESMTPS id
 4ZNMsx4Zktzy6x; Wed, 26 Mar 2025 23:08:53 +0000 (UTC)
Received: from ngraves.fr (unknown [10.1.6.4])
 by mta2.priv.ovhmail-u1.ea.mail.ovh.net (Postfix) with ESMTPSA id 2930FBA3DC1; 
 Wed, 26 Mar 2025 23:08:53 +0000 (UTC)
Authentication-Results: garm.ovh; auth=pass
 (GARM-109S003e7119055-3659-492f-843e-3ed63b25f711,
 FF6789543678BDA5F4AE6323C2F62FAAD9213E50) smtp.auth=ngraves@HIDDEN
X-OVh-ClientIp: 90.92.117.144
From: Nicolas Graves <ngraves@HIDDEN>
Date: Thu, 27 Mar 2025 00:08:52 +0100
Message-ID: <87h63fv18b.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain
X-Ovh-Tracer-Id: 9873297762167743187
X-VR-SPAMSTATE: OK
X-VR-SPAMSCORE: 0
X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeefvddrtddtgdduieeikeduucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucenucfjughrpefhvfevufffkfggtgesthdtredttddttdenucfhrhhomheppfhitgholhgrshcuifhrrghvvghsuceonhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrqeenucggtffrrghtthgvrhhnpedtveeigedtvdetteejueejfeefffevleefgeeuueffveduiedujeevtdektdelkeenucffohhmrghinhepghhnuhdrohhrghenucfkphepuddvjedrtddrtddruddpledtrdelvddruddujedrudeggeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepihhnvghtpeduvdejrddtrddtrddupdhmrghilhhfrhhomhepnhhgrhgrvhgvshesnhhgrhgrvhgvshdrfhhrpdhnsggprhgtphhtthhopedvpdhrtghpthhtohepjeejtdeijeesuggvsggsuhhgshdrghhnuhdrohhrghdprhgtphhtthhopegtshgrnhhtohhssgesihhnvhgvnhhtrghtihdrohhrghdpoffvtefjohhsthepmhhoheeifegmpdhmohguvgepshhmthhpohhuth
DKIM-Signature: a=rsa-sha256; bh=KxC2WU4FyppYrhAc1ErqcczZ+suPckxKZRk2acZYmFM=; 
 c=relaxed/relaxed; d=ngraves.fr; h=From;
 s=ovhmo4487190-selector1; t=1743030533; v=1;
 b=IixxBNUNmgh7+qlK+kVMbroA2/bdOfp2cCLrAQIxXyiLntgfNe317bduF5indNvpNSSCdqru
 K1C41FBDBz1TU+Q9L3B4yDeOl21gH9p5uwYZTep8+y1BmJ8YcRWEkp7d6+PfgHJ93r9R3gzVpK8
 8h1XTZx3RdcC4Y/Cxug6j7ba3YmOGd/G9kJ+RmcaSTLG4+JQRtwRTQC16ByYRPEJuWz15uBmtrF
 7Ct1Y4kO5lIOrKhEKr3zu5xFr8nXaUf1uOcUfs/BTqjnATgd7i9NBtlTqMQKp/RoSUElrOChrJw
 bgpGl+ZsqRlrnRjCDsiBPaC6DXgAwuLWQPS0IJorSBjng==
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

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

Message sent to guix-patches@HIDDEN:


X-Loop: help-debbugs@HIDDEN
Subject: [bug#77067] [PATCH v2] gnu: icestorm: Update to 0.0-5.7fbf8c0.
References: <c815c7f4a486b1c14a89131875c9f31db3f59c89.1742206893.git.csantosb@HIDDEN>
In-Reply-To: <c815c7f4a486b1c14a89131875c9f31db3f59c89.1742206893.git.csantosb@HIDDEN>
Resent-From: Cayetano Santos <csantosb@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Thu, 27 Mar 2025 08:19:02 +0000
Resent-Message-ID: <handler.77067.B77067.174306351923236 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 77067
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 77067 <at> debbugs.gnu.org
Cc: Cayetano Santos <csantosb@HIDDEN>
Received: via spool by 77067-submit <at> debbugs.gnu.org id=B77067.174306351923236
          (code B ref 77067); Thu, 27 Mar 2025 08:19:02 +0000
Received: (at 77067) by debbugs.gnu.org; 27 Mar 2025 08:18:39 +0000
Received: from localhost ([127.0.0.1]:47275 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1txiRg-00062G-Bh
	for submit <at> debbugs.gnu.org; Thu, 27 Mar 2025 04:18:38 -0400
Received: from confino.investici.org ([93.190.126.19]:23241)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <csantosb@HIDDEN>)
 id 1txiRc-00061A-Ds
 for 77067 <at> debbugs.gnu.org; Thu, 27 Mar 2025 04:18:34 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inventati.org;
 s=stigmate; t=1743063509;
 bh=XT7DGzs4ZXx8aEKjCKYri84zuFeTm4eS3tMn5SXssvw=;
 h=From:To:Cc:Subject:Date:From;
 b=nG9fwJ8zFSjuLy0NlX2RTwUJmrDX600MvwyAoqCO208bvVvR4cLHT2X6wdMVLV8MG
 6p5vUIi+/hLnWNbw3qb1kOlgOsB8Ec6ZhDn3pDccIaPCMWJdhXZNrYbfKoqmtuRHz/
 pTu4Kt1smmuPRuVkA6vL8muROL1EOzTOoWcb5KI0=
Received: from mx1.investici.org (unknown [127.0.0.1])
 by confino.investici.org (Postfix) with ESMTP id 4ZNc4569jqz11FC;
 Thu, 27 Mar 2025 08:18:29 +0000 (UTC)
Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19])
 (Authenticated sender: cayetano.santos@HIDDEN) by localhost (Postfix)
 with ESMTPSA id 4ZNc455590z11F8; 
 Thu, 27 Mar 2025 08:18:29 +0000 (UTC)
From: Cayetano Santos <csantosb@HIDDEN>
Date: Thu, 27 Mar 2025 09:18:01 +0100
Message-ID: <a92ef6ba874fe716de11e58a927451a470836351.1743063481.git.csantosb@HIDDEN>
X-Mailer: git-send-email 2.49.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.5 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.5 (-)

* 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

Message sent to guix-patches@HIDDEN:


X-Loop: help-debbugs@HIDDEN
Subject: [bug#77067] QA review for 77067
Resent-From: Cayetano Santos <csantosb@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Thu, 27 Mar 2025 08:20:04 +0000
Resent-Message-ID: <handler.77067.B77067.174306359423918 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 77067
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Nicolas Graves <ngraves@HIDDEN>
Cc: 77067 <at> debbugs.gnu.org
Received: via spool by 77067-submit <at> debbugs.gnu.org id=B77067.174306359423918
          (code B ref 77067); Thu, 27 Mar 2025 08:20:04 +0000
Received: (at 77067) by debbugs.gnu.org; 27 Mar 2025 08:19:54 +0000
Received: from localhost ([127.0.0.1]:47279 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1txiSv-0006Da-JP
	for submit <at> debbugs.gnu.org; Thu, 27 Mar 2025 04:19:54 -0400
Received: from devianza.investici.org ([2c0f:f930:0:4::108]:25037)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <csantosb@HIDDEN>)
 id 1txiSt-0006Cn-9I
 for 77067 <at> debbugs.gnu.org; Thu, 27 Mar 2025 04:19:52 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inventati.org;
 s=stigmate; t=1743063587;
 bh=tQ3JHNAdEqn3ZTpzcBs2gja2U+drEhjx5aUnRkxUv3s=;
 h=From:To:Cc:Subject:In-Reply-To:References:Date:From;
 b=dFhpaSRcj1i1NfukJev+2TENqDj3EFbWC62hIQUJEvJgs8vt7jUu4XEsNcndNkPEG
 Wb77ZHKEKwvXX8dUtbzDE+Zibl/5RhQgMeXGF44O6Cw+2VZMy5nnMXTt8j6yruHLXF
 RUMQ/U6WjEi2p2Hg1EEx7CAZ/yJ508pnI2hTbN0I=
Received: from mx2.investici.org (unknown [127.0.0.1])
 by devianza.investici.org (Postfix) with ESMTP id 4ZNc5b5m4tz6vGC;
 Thu, 27 Mar 2025 08:19:47 +0000 (UTC)
Received: from [198.167.222.108] (mx2.investici.org [198.167.222.108])
 (Authenticated sender: cayetano.santos@HIDDEN) by localhost (Postfix)
 with ESMTPSA id 4ZNc5b4Dh5z6vCK; 
 Thu, 27 Mar 2025 08:19:47 +0000 (UTC)
From: Cayetano Santos <csantosb@HIDDEN>
In-Reply-To: <87h63fv18b.fsf@HIDDEN> (Nicolas Graves's message of "Thu, 27
 Mar 2025 00:08:52 +0100")
References: <87h63fv18b.fsf@HIDDEN>
User-Agent: mu4e 1.12.9; emacs 29.4
Date: Thu, 27 Mar 2025 09:19:45 +0100
Message-ID: <877c4aga1q.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
 micalg=pgp-sha512; protocol="application/pgp-signature"
X-Spam-Score: -0.7 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)

--=-=-=
Content-Type: text/plain


>Thu 27 Mar 2025 at 00:08, Nicolas Graves <ngraves@HIDDEN> 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.

--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iI0EARYKADUWIQTMuBhC+dcFjs1nN3q/XN9N9r9mggUCZ+UKIhccY3NhbnRvc2JA
aW52ZW50YXRpLm9yZwAKCRC/XN9N9r9mgrH+APsHdx0HFn9aOgwpiyQNZCEuO9ly
B7lIkx7icJ1iL3QRWwEAnP6n+8ebzd/hYM0uAWJTcRyBe/8MpeBNTsUY6QJCgQw=
=/mzl
-----END PGP SIGNATURE-----
--=-=-=--

Message sent to csantosb@HIDDEN, ekaitz@HIDDEN, maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:


X-Loop: help-debbugs@HIDDEN
Subject: [bug#77067] [PATCH v3] gnu: icestorm: Update to 0.0-5.3cdcf4b.
References: <c815c7f4a486b1c14a89131875c9f31db3f59c89.1742206893.git.csantosb@HIDDEN>
In-Reply-To: <c815c7f4a486b1c14a89131875c9f31db3f59c89.1742206893.git.csantosb@HIDDEN>
Resent-From: Cayetano Santos <csantosb@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: csantosb@HIDDEN, ekaitz@HIDDEN, maxim.cournoyer@HIDDEN, guix-patches@HIDDEN
Resent-Date: Thu, 10 Apr 2025 10:34:02 +0000
Resent-Message-ID: <handler.77067.B77067.17442812355937 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 77067
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: 77067 <at> debbugs.gnu.org
Cc: Cayetano Santos <csantosb@HIDDEN>, Cayetano Santos <csantosb@HIDDEN>, Ekaitz Zarraga <ekaitz@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>
X-Debbugs-Original-Xcc: Cayetano Santos <csantosb@HIDDEN>, Ekaitz Zarraga <ekaitz@HIDDEN>, Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Received: via spool by 77067-submit <at> debbugs.gnu.org id=B77067.17442812355937
          (code B ref 77067); Thu, 10 Apr 2025 10:34:02 +0000
Received: (at 77067) by debbugs.gnu.org; 10 Apr 2025 10:33:55 +0000
Received: from localhost ([127.0.0.1]:44059 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1u2pEI-0001Xh-A6
	for submit <at> debbugs.gnu.org; Thu, 10 Apr 2025 06:33:54 -0400
Received: from confino.investici.org ([93.190.126.19]:38805)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
 (Exim 4.84_2) (envelope-from <csantosb@HIDDEN>)
 id 1u2pEE-0001XV-VQ
 for 77067 <at> debbugs.gnu.org; Thu, 10 Apr 2025 06:33:52 -0400
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inventati.org;
 s=stigmate; t=1744281228;
 bh=cePJCmfBlN6l9kt9CPoIILqR8MwCgTIDzFKas6Cw11s=;
 h=From:To:Cc:Subject:Date:From;
 b=qKauJwl8bTGxzZIZuDXJt8uQxc3U+u0u82LD7ShQ51PkD/qGakrTa2MlDuKKLo6I2
 yFM4SDfUisqyuP1oW7wsME0U8z3oEegXiqtGzaa610Jn3K1iQxFR3p+o/eG+jlmCKn
 ZfwsO/SsGSslrSXUaBzyTUm7gcs5+elT+wrw0mP4=
Received: from mx1.investici.org (unknown [127.0.0.1])
 by confino.investici.org (Postfix) with ESMTP id 4ZYGPm4v6Xz11WG;
 Thu, 10 Apr 2025 10:33:48 +0000 (UTC)
Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19])
 (Authenticated sender: cayetano.santos@HIDDEN) by localhost (Postfix)
 with ESMTPSA id 4ZYGPm3tP5z11V2; 
 Thu, 10 Apr 2025 10:33:48 +0000 (UTC)
From: Cayetano Santos <csantosb@HIDDEN>
Date: Thu, 10 Apr 2025 12:32:59 +0200
Message-ID: <70195b2e71c81651588ddde2783cf04715bd50fa.1744281179.git.csantosb@HIDDEN>
X-Mailer: git-send-email 2.49.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: -0.5 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.5 (-)

* gnu/packages/fpga.scm (icestorm): Update to 0.0-5.3cdcf4b.

Change-Id: I545ac91c94a97989c3a1494479d36cb5bb46930d

[source]: Update url.
[arguments]<#:phases>: Add make-info to produce info document using included makefile.
[arguments]<#:phases>: Update /usr/local substitutions in makefiles.
[arguments]<#:tests>: Tests require nextpnr-ice40, which depends on this package.
[arguments]<#:make-flags>: Update CC, CXX and PREFIX variables.
[native-inputs]: Replaced old style, add requirements for buildig the documentation.
[homepage]: Update url.
[synopsys]: Improve.
[description]: Improve.

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..8afaccf62c 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 "3cdcf4b009bb8681ab7e2e09d65043f04334b60e")
+        (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 "0ygp6cj7grlnyji572kx215p2mw4crllskif9g795f390bp38g68"))))
+      (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: 07c9a4273152deb128006b5ac2087d5fe30a5927
--
2.49.0

Message received at control <at> debbugs.gnu.org:


Received: (at control) by debbugs.gnu.org; 23 Apr 2025 01:42:21 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Apr 22 21:42:21 2025
Received: from localhost ([127.0.0.1]:50799 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1u7P81-0005zq-6D
	for submit <at> debbugs.gnu.org; Tue, 22 Apr 2025 21:42:21 -0400
Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]:58657)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>)
 id 1u7P7z-0005zY-0G
 for control <at> debbugs.gnu.org; Tue, 22 Apr 2025 21:42:19 -0400
Received: by mail-pl1-x633.google.com with SMTP id
 d9443c01a7336-22409077c06so81990405ad.1
 for <control <at> debbugs.gnu.org>; Tue, 22 Apr 2025 18:42:18 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1745372532; x=1745977332; darn=debbugs.gnu.org;
 h=subject:from:to:message-id:date:from:to:cc:subject:date:message-id
 :reply-to; bh=IeF3Zl5ZiBpaT3tXrm2eEFT/GRiNyeeSA6UJtLGh5Q0=;
 b=K+KVlkTog8VONgMqlwok/3MNFsRqMGY0VJxg82WFMj0fCixb8qDB+XWx0ILtR79V05
 pbtHAA5TCyCT8vlTbUb44IuSPWv8mP8Nm0hw1EeUQHDcRoHPUbLXA6wBR9GmcI3I3Rzp
 lO6Geja9aiOfhapPSPceKJfyqARNnGuPiMj99QfEpQk9WQmaIYOXkNesskpmaSpaK1Yn
 hHBW5nKJaz0odrBQMFMikzZAU1t7BAfzXTFtykX1ZphyF2Tp4NfIpVs71J2h1pxBhq7i
 NUTIaeGLgcBUj0WEZChuy0U9GSjS2LjKWaC1Vn5/baNbLHa6+QG9mzq0rWh3QIvZDSIs
 imdA==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1745372532; x=1745977332;
 h=subject:from:to:message-id:date:x-gm-message-state:from:to:cc
 :subject:date:message-id:reply-to;
 bh=IeF3Zl5ZiBpaT3tXrm2eEFT/GRiNyeeSA6UJtLGh5Q0=;
 b=YST2D4K5IF4CIsM0+gIUYoDD6GvqHiFgaTZbHZiKtaaKuKDqeXBGJxQy+PvzKoy0UZ
 RLTzV5ma4tf43qUiNHGB/H5nMAhyauIiFpXrWib+DXucnHh4TY/1yhJDSAQ5OpNSgsO2
 AnGYKxXKfLYuH7oyBaX2hhIA1VjLlQAG8ZPQme79vcOyZMBqJ4klIEMtJiChPsnsVRKp
 iTbr2UWKEiaLbZ1hItILQhw9kFQ7FSXHoVAmohgGdn/+pTgne55Ob9jqUp/6uKMMvjEW
 LwsbAxSRJ7Sp6GwwB60rwLBd1Hulk/sbw/QnMX4e0l3WcGoU+YUMUUBUFBhNhZwQyc/+
 Kcaw==
X-Gm-Message-State: AOJu0Ywbnn7fCvJ4B17jwf+Ebo7AiGgw3q1OE3+W7Lo+h1fS8FNJ95cw
 JPEuvM5TVLQOJYg2fZcwHKPs+i35DUglyNd445OnU90r1xLYcvzMlGa/g4hD
X-Gm-Gg: ASbGncvMlotCLtk3sQilUPTPLE1qji+UWWlrbrc3k/K1/RBUSzCnpgKHu1xAj+3BNfV
 Kq4phBTiL88iSx6iETB9DfOwOE21pM2jJ+L8ntdXQr9pN1HG/uOa/KkyBBrTK4R0yN3d9Uh2SWl
 woLd4d9EAMVuqdGL0TivZ0KMyw27ClLOa8+ib8A2FeCyrhA+g5DnTHmVNiDpC4GKs8bAcZ+UMJV
 MAhWlTpjhAM8q14acHKNdB2J6nKHN6q29qb5F/WP7NKWHi7EhbWXVX+RfLk791mj2hdWt8Qz6/Q
 kFnZns/LRsAMRyk8eHK8sN+QVjruxBOoJQnvJpg=
X-Google-Smtp-Source: AGHT+IFSH3t8iJA98XHyhoZNfuKevjfZBy5lptwBB91It3tth2pFTOWCegl9aUORVePQto4fmybvWQ==
X-Received: by 2002:a17:902:e5c6:b0:224:f12:3734 with SMTP id
 d9443c01a7336-22c535adfb7mr244551545ad.30.1745372532298; 
 Tue, 22 Apr 2025 18:42:12 -0700 (PDT)
Received: from terra ([2405:6586:be0:0:83c8:d31d:2cec:f542])
 by smtp.gmail.com with ESMTPSA id
 d9443c01a7336-22c50bf5627sm92681835ad.92.2025.04.22.18.42.11
 for <control <at> debbugs.gnu.org>
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Tue, 22 Apr 2025 18:42:11 -0700 (PDT)
Date: Wed, 23 Apr 2025 10:42:09 +0900
Message-Id: <87frhz1wni.fsf@HIDDEN>
To: control <at> debbugs.gnu.org
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Subject: control message for bug #77067
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: control
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)

close 77067 
quit

Message sent to guix-patches@HIDDEN:


X-Loop: help-debbugs@HIDDEN
Subject: [bug#77067] [PATCH] gnu: icestorm: Update to 0.0-5.7fbf8c0.
Resent-From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: guix-patches@HIDDEN
Resent-Date: Wed, 23 Apr 2025 01:43:02 +0000
Resent-Message-ID: <handler.77067.D77067.174537252423021 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 77067
X-GNU-PR-Package: guix-patches
X-GNU-PR-Keywords: patch
To: Cayetano Santos <csantosb@HIDDEN>
Cc: 77067-done <at> debbugs.gnu.org, Ekaitz Zarraga <ekaitz@HIDDEN>
Received: via spool by 77067-done <at> debbugs.gnu.org id=D77067.174537252423021
          (code D ref 77067); Wed, 23 Apr 2025 01:43:02 +0000
Received: (at 77067-done) by debbugs.gnu.org; 23 Apr 2025 01:42:04 +0000
Received: from localhost ([127.0.0.1]:50796 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.84_2)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1u7P7k-0005zC-2C
	for submit <at> debbugs.gnu.org; Tue, 22 Apr 2025 21:42:04 -0400
Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]:49413)
 by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
 (Exim 4.84_2) (envelope-from <maxim.cournoyer@HIDDEN>)
 id 1u7P7c-0005yX-VV
 for 77067-done <at> debbugs.gnu.org; Tue, 22 Apr 2025 21:41:59 -0400
Received: by mail-pf1-x431.google.com with SMTP id
 d2e1a72fcca58-736a72220edso5933765b3a.3
 for <77067-done <at> debbugs.gnu.org>; Tue, 22 Apr 2025 18:41:56 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=gmail.com; s=20230601; t=1745372510; x=1745977310; darn=debbugs.gnu.org;
 h=mime-version:user-agent:message-id:date:references:in-reply-to
 :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to;
 bh=5fiQiN7oNRreVjVG1EnTN1LuQJeE7q2me1/N0kvAk5o=;
 b=KrWtWsAPWyzfdlz7W9kS72uJ2dmjkDIcobiTpo7/NzpUm/AAwe0IjJrRx+CNy8Ki23
 uofstMEsV2wiHMoo/tsaVzXrI5samtd6gfzOb8yaqDmc0sbMa82we3DIYjj52PV/VxVi
 hX06OcmyjK1l64gNfCUEbsC6/YqOtT9qO+jJ+A1jGp8gwYAUf8f0Shnym8KMsTfhz3I8
 M9WaXCNxNgk4yB4aeylQOppi00IBYUSM9JHuKCIRjsCbmglWqv28v7zEhzp0QcPeWo/9
 T4wYevaWuK9DNisqfdwlMs0X75u1WpWwC2rSVPVsEahP+AHFqHtZs9VSZ4ouIh8j31Vz
 J7/w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
 d=1e100.net; s=20230601; t=1745372510; x=1745977310;
 h=mime-version:user-agent:message-id:date:references:in-reply-to
 :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date
 :message-id:reply-to;
 bh=5fiQiN7oNRreVjVG1EnTN1LuQJeE7q2me1/N0kvAk5o=;
 b=wGEkRP2WDY0arXmAQI4AKg9d95itdp2ogWmOr878P1M+Jx3YmCI3QZWHo3wvWtzaJy
 LJnac415bta3sZDMOaEVWBYjgvqg+P1EnbNUHklfrGoAPs8ihT3O+N0LHJao1vtVUBzO
 6YnzOvBYZ+DzmjIW/mhGsK1DuWQH7hjetfIrJKnw1ow2qZRA///XiGMJbKmq37B8FZNQ
 coMuzkRXO6QfORBfMzbB2SZaW8Mnb4BAR4EjgM1717gwTshLGKgjFEGKpAu5RtIX4GUi
 BoUGsTGHxJ13s/SyrvbWE0HlC817hf8SOBXIb3unqnTm2bm7LwQosfNzM1NGR4en5WD7
 wQvg==
X-Gm-Message-State: AOJu0YxfdFPQEmzAzNLdVRKuuqJvq/uNeMU4BECkWJSX5sy34eXwRROi
 WWrHZ+qs5LXnNqVJRiWqDHyJ67e1BgRwW0x57LeSsZ7/jtyin/VMU5j8NeVs
X-Gm-Gg: ASbGncuvEgk1rBXkoCdbd+CYI66MMP5tYYpLFjrSGXaHkRquvQMWR07o57QgeKX4ivp
 BUAgNti7fwV21d3L3yNnpdDU/eC5X9Fl/DglMo5JrrHmvPFl9zTWG7Bc3NsKys77MnMDqrpkBzv
 MY57V8C8uYhqFn4NyhPhP6oHdzsC17uOUH47W69lo076z6jn/FVIPfBPoephbvS78iRZVHkytRM
 wOnr+BHwQSslzZq0yESO8Sd9w0nwC6queEZ2/Oll1Khzel+QVxtFK8w+ZV44WYYSe/2Sq/bhTHW
 W6ZiA4QOR6CdDp2EytfpVTWcIoz289NXirPUZNQ=
X-Google-Smtp-Source: AGHT+IEN+zdrJDvbnPO21VEeJ1jMV2SRZzkULV/s0UfZ1bjfS7nRAay1agifs54kCLjfuRPU1K/6gA==
X-Received: by 2002:a05:6a00:8d93:b0:73b:71a9:a5ad with SMTP id
 d2e1a72fcca58-73dc15a06bamr23223288b3a.16.1745372510080; 
 Tue, 22 Apr 2025 18:41:50 -0700 (PDT)
Received: from terra ([2405:6586:be0:0:83c8:d31d:2cec:f542])
 by smtp.gmail.com with ESMTPSA id
 d2e1a72fcca58-73dbfa5d084sm9660016b3a.103.2025.04.22.18.41.48
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Tue, 22 Apr 2025 18:41:49 -0700 (PDT)
From: Maxim Cournoyer <maxim.cournoyer@HIDDEN>
In-Reply-To: <70195b2e71c81651588ddde2783cf04715bd50fa.1744281179.git.csantosb@HIDDEN>
 (Cayetano Santos's message of "Thu, 10 Apr 2025 12:32:59 +0200")
References: <c815c7f4a486b1c14a89131875c9f31db3f59c89.1742206893.git.csantosb@HIDDEN>
 <70195b2e71c81651588ddde2783cf04715bd50fa.1744281179.git.csantosb@HIDDEN>
Date: Wed, 23 Apr 2025 10:41:46 +0900
Message-ID: <87h62f1wo5.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Spam-Score: 0.2 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, 
 <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.8 (/)

Hello,

Cayetano Santos <csantosb@HIDDEN> writes:

> * gnu/packages/fpga.scm (icestorm): Update to 0.0-5.3cdcf4b.
>
> Change-Id: I545ac91c94a97989c3a1494479d36cb5bb46930d
>
> [source]: Update url.
> [arguments]<#:phases>: Add make-info to produce info document using included makefile.
> [arguments]<#:phases>: Update /usr/local substitutions in makefiles.
> [arguments]<#:tests>: Tests require nextpnr-ice40, which depends on this package.
> [arguments]<#:make-flags>: Update CC, CXX and PREFIX variables.

The maximum column width to use in Guix is 80.  You do not need to
repeat the [arguments] here.  I've rewritten your changelog to something
like this, for example:

--8<---------------cut here---------------start------------->8---
* gnu/packages/fpga.scm (icestorm): Update to 0.0-5.3cdcf4b.
[source]: Update URL.
[arguments] <#:phases> {make-info}: New phase.
{fix-usr-local}: Update substitutions.
<#:tests>: Update comment.
<#:make-flags>: Update CC, CXX and PREFIX variables.
[native-inputs]: Use new style.  Add texinfo, python-sphinx and
python-sphinx-rtd-theme.
[homepage]: Update URL.
[description]: Improve.
--8<---------------cut here---------------end--------------->8---


> [native-inputs]: Replaced old style, add requirements for buildig the documentation.
> [homepage]: Update url.
> [synopsys]: Improve.
> [description]: Improve.
>
> Change-Id: I22d8adb52daac893bf7436fd86fefe0df18c7bf9

The change-id is meant to be listed only once; ideally it should remain
static from the first to the last revision submitted (that's its
purpose, to be a stable identifier for a series being reviewed).

> ---
>  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..8afaccf62c 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 "3cdcf4b009bb8681ab7e2e09d65043f04334b60e")
> +        (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 "0ygp6cj7grlnyji572kx215p2mw4crllskif9g795f390bp38g68"))))
> +      (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))))

I've done these adjustment on top:

--8<---------------cut here---------------start------------->8---
modified   gnu/packages/fpga.scm
@@ -288,7 +288,7 @@ (define-public icestorm
       (build-system gnu-build-system)
       (arguments
        (list
-        #:tests? #f ; tests require nextpr-ice40, will be run in there
+        #:tests? #f               ;avoid a cyclic dependency with nextpr-ice40
         #:make-flags
         #~(list (string-append "CC="
                                #$(cc-for-target))
@@ -321,14 +321,13 @@ (define-public icestorm
                                      "/share/info/projecticestorm-figures")))))
             (delete 'configure))))
       (inputs (list libftdi))
-      (native-inputs (list python
-                           pkg-config
-                           ;; doc
-                           texinfo
+      (native-inputs (list pkg-config
+                           python
                            python-sphinx
-                           python-sphinx-rtd-theme))
+                           python-sphinx-rtd-theme
+                           texinfo))
       (home-page "https://prjicestorm.readthedocs.io/")
-      (synopsis "Project IceStorm")
+      (synopsis "Bitstream tools for Lattice iCE40 FPGAs")
       (description
        "Project IceStorm aims at documenting the bitstream format of
 Lattice iCE40 FPGAs and providing simple tools for analyzing and creating bitstream
--8<---------------cut here---------------end--------------->8---

The synopsis should describe what this *is* precisely, so the above
seems more useful.  I don't see value in splitting what native-inputs
are used for anymore; this makes it harder to maintain in the long run,
and its obvious that sphinx dependencies are used for generating doc.

And pushed.  Thank you!

-- 
Maxim
Last modified: Wed, 23 Apr 2025 01:45:01 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.