GNU bug report logs - #78369
[PATCH electronics-team] gnu: prjtrellis: Update to 1.4-0.898329d.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 78369 in the body.
You can then email your comments to 78369 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

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 electronics-team] gnu: prjtrellis: Update to 1.4-0.898329d.
Date: Sun, 11 May 2025 12:41:57 +0200

* gnu/packages/electronics.scm (prjtrellis): Update to 1.4-0.898329d.

Change-Id: I7773415ee875fe266e523ee8fda25467db1b85f5
---
 gnu/packages/electronics.scm | 95 +++++++++++++++++++-----------------
 1 file changed, 49 insertions(+), 46 deletions(-)

diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm
index da37a9fb33..f7134fac8e 100644
--- a/gnu/packages/electronics.scm
+++ b/gnu/packages/electronics.scm
@@ -423,50 +423,53 @@ (define-public openboardview
     (license license:expat)))
 
 (define-public prjtrellis
-  (package
-    (name "prjtrellis")
-    (version "1.4")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/YosysHQ/prjtrellis/")
-             (commit version)
-             ;; Pull the bitstream database for ECP5 devices; this is useful
-             ;; only by prjtrellis: there is no need to package it separately.
-             (recursive? #t)))
-       (file-name (git-file-name name version))
-       (modules '((guix build utils)))
-       (snippet
-        ;; Remove bundled source code for which Guix has packages.
-        '(with-directory-excursion "libtrellis/3rdparty"
-           (for-each delete-file-recursively
-                     '("pybind11"))))
-       (sha256
-        (base32 "0c3asdfrjmnc6q3vawn3nfghgg43iajwy2zb8kck9d3wrypbhlmc"))))
-    (build-system cmake-build-system)
-    (arguments
-     (list
-      ;; The examples test directory requires nextpnr, using this package as a
-      ;; backend, which is provided by nextpnr-ecp5: the tests are to be run
-      ;; in this later package.
-      #:tests? #f
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'chdir
-            (lambda _
-              (chdir "libtrellis")))
-          ;; point to pybind11 include dir
-          (add-after 'chdir 'setenv-pybind11
-            (lambda* (#:key inputs #:allow-other-keys)
-              (setenv "PYBIND11_INCLUDE_DIR"
-                      (string-append #$(this-package-input "pybind11")
-                                     "/include/pybind11")))))))
-    (native-inputs (list python))
-    (inputs (list openocd boost pybind11))
-    (synopsis "Placement and routing for ECP5 FPGAs")
-    (description
-     "Project Trellis is a Nextpnr backend compatible with ECP5 FPGAs.
+  ;; Last release is 2 years old.
+  (let ((commit "898329dddf6ce6463299973081f109d645b9c55f")
+        (revision "0"))
+    (package
+      (name "prjtrellis")
+      (version (git-version "1.4" revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/YosysHQ/prjtrellis/")
+               (commit commit)
+               ;; Pull the bitstream database for ECP5 devices; this is useful
+               ;; only by prjtrellis: there is no need to package it separately.
+               (recursive? #t)))
+         (file-name (git-file-name name version))
+         (modules '((guix build utils)))
+         (snippet
+          ;; Remove bundled source code for which Guix has packages.
+          '(with-directory-excursion "libtrellis/3rdparty"
+             (for-each delete-file-recursively
+                       '("pybind11"))))
+         (sha256
+          (base32 "1qljgn7rxz114vki21rms70zi9rgr4gw7crdfihxx1n68zgv60gg"))))
+      (build-system cmake-build-system)
+      (arguments
+       (list
+        ;; The examples test directory requires nextpnr, using this package as a
+        ;; backend, which is provided by nextpnr-ecp5: the tests are to be run
+        ;; in this later package.
+        #:tests? #f
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-after 'unpack 'chdir
+              (lambda _
+                (chdir "libtrellis")))
+            ;; point to pybind11 include dir
+            (add-after 'chdir 'setenv-pybind11
+              (lambda* (#:key inputs #:allow-other-keys)
+                (setenv "PYBIND11_INCLUDE_DIR"
+                        (string-append #$(this-package-input "pybind11")
+                                       "/include/pybind11")))))))
+      (native-inputs (list python))
+      (inputs (list openocd boost pybind11))
+      (synopsis "Placement and routing for ECP5 FPGAs")
+      (description
+       "Project Trellis is a Nextpnr backend compatible with ECP5 FPGAs.
 The following features are currently available:
 @itemize
 @item logic slice functionality, including carries
@@ -478,8 +481,8 @@ (define-public prjtrellis
 @item global networks and PLLs
 @item transcievers (DCUs.)
 @end itemize")
-    (home-page "https://github.com/YosysHQ/prjtrellis/")
-    (license license:expat)))
+      (home-page "https://github.com/YosysHQ/prjtrellis/")
+      (license license:expat))))
 
 (define-public opensta
   ;; There are no releases, we use last commit.

base-commit: 4fe484ee7e9d598a9d0a249c375b75a14b95d1b4
-- 
2.49.0

Message #8 received at 78369 <at> debbugs.gnu.org (full text, mbox):

From: Gabriel Wicki <gabriel <at> erlikon.ch>
To: Cayetano Santos <csantosb <at> inventati.org>
Cc: 78369 <at> debbugs.gnu.org, Maxim Cournoyer <maxim.cournoyer <at> gmail.com>,
 Ekaitz Zarraga <ekaitz <at> elenq.tech>
Subject: Re: [bug#78369] [PATCH electronics-team] gnu: prjtrellis: Update to
 1.4-0.898329d.
Date: Mon, 12 May 2025 13:45:19 +0200

Hi!

On Sun, May 11, 2025 at 12:41:57PM +0200, Cayetano Santos wrote:
> +               ;; Pull the bitstream database for ECP5 devices; this is useful
> +               ;; only by prjtrellis: there is no need to package it separately.
*this is useful for prjtrellis only
would be the (more) correct English phrasing.

> +        ;; The examples test directory requires nextpnr, using this package as a
> +        ;; backend, which is provided by nextpnr-ecp5: the tests are to be run
> +        ;; in this later package.
This seems like an overly complicated phrasing that I am not sure I
understand correctly.  Where are the tests run, actually?  Package
nextpnr does not depend on this package IIUC.

The patch looks good, increasing the quality of the code comments would
be great, though.  Would you mind sending in an updated version of this patch?

Thanks for your time and effort!
gabber

Message #13 received at 78369-done <at> debbugs.gnu.org (full text, mbox):

From: Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
To: Cayetano Santos <csantosb <at> inventati.org>
Cc: 78369-done <at> debbugs.gnu.org, Gabriel Wicki <gabriel <at> erlikon.ch>,
 Ekaitz Zarraga <ekaitz <at> elenq.tech>
Subject: Re: [bug#78369] [PATCH electronics-team] gnu: prjtrellis: Update to
 1.4-0.898329d.
Date: Thu, 15 May 2025 11:10:36 +0900

Hi,

Cayetano Santos <csantosb <at> inventati.org> writes:

> * gnu/packages/electronics.scm (prjtrellis): Update to 1.4-0.898329d.

I've made the following changes:

--8<---------------cut here---------------start------------->8---
1 file changed, 7 insertions(+), 12 deletions(-)
gnu/packages/electronics.scm | 19 +++++++------------

modified   gnu/packages/electronics.scm
@@ -423,7 +423,7 @@ (define-public openboardview
     (license license:expat)))
 
 (define-public prjtrellis
-  ;; Last release is 2 years old.
+  ;; The last release is 2 years old; use the latest commit for now.
   (let ((commit "898329dddf6ce6463299973081f109d645b9c55f")
         (revision "0"))
     (package
@@ -450,21 +450,16 @@ (define-public prjtrellis
       (build-system cmake-build-system)
       (arguments
        (list
-        ;; The examples test directory requires nextpnr, using this package as a
-        ;; backend, which is provided by nextpnr-ecp5: the tests are to be run
-        ;; in this later package.
-        #:tests? #f
+        #:tests? #f                     ;no test suite
+        #:configure-flags
+        #~(list (string-append "-DPYBIND11_INCLUDE_DIR="
+                               (search-input-directory %build-inputs
+                                                       "include/pybind11")))
         #:phases
         #~(modify-phases %standard-phases
             (add-after 'unpack 'chdir
               (lambda _
-                (chdir "libtrellis")))
-            ;; point to pybind11 include dir
-            (add-after 'chdir 'setenv-pybind11
-              (lambda* (#:key inputs #:allow-other-keys)
-                (setenv "PYBIND11_INCLUDE_DIR"
-                        (string-append #$(this-package-input "pybind11")
-                                       "/include/pybind11")))))))
+                (chdir "libtrellis"))))))
       (native-inputs (list python))
       (inputs (list openocd boost pybind11))
       (synopsis "Placement and routing for ECP5 FPGAs")

--8<---------------cut here---------------end--------------->8---

And pushed!

-- 
Thanks,
Maxim

Previous Next

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