guix_mirror_bot pushed a commit to branch master
in repository guix.
commit a12b427252ea15f94b237cdfb211c044378f9384
Author: Cayetano Santos <[email protected]>
AuthorDate: Fri Oct 3 11:00:50 2025 +0200
Revert "gnu: nextpnr: Add icestorm and prjtrellis checks."
This reverts commit 9e299926c6922fa3d5988540ea9d1462c5c4d7d6.
Signed-off-by: Maxim Cournoyer <[email protected]>
---
gnu/packages/electronics.scm | 42 +++---------------------------------------
1 file changed, 3 insertions(+), 39 deletions(-)
diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm
index d50bec3877..9ae57c7840 100644
--- a/gnu/packages/electronics.scm
+++ b/gnu/packages/electronics.scm
@@ -921,10 +921,6 @@ which allows one to install the M8 firmware on any
Teensy.")
(string-append "-DTRELLIS_INSTALL_PREFIX="
#$(this-package-input "prjtrellis"))
"-DUSE_IPO=OFF")
- #:modules '((guix build qt-build-system)
- (guix build utils)
- (ice-9 ftw)
- (srfi srfi-26))
#:phases
#~(modify-phases %standard-phases
;; Required by himbaechel architecture, ng-ultra support.
@@ -951,42 +947,10 @@ which allows one to install the M8 firmware on any
Teensy.")
(("\\$\\{CMAKE_SOURCE_DIR}/3rdparty/sanitizers-cmake/cmake")
(string-append
#$(this-package-native-input "sanitizers-cmake")
- "/share/sanitizers-cmake/cmake")))))
- (add-after 'install 'run-icestorm-examples
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (setenv "PATH"
- (string-append #$output "/bin:" (getenv "PATH")))
- ;; Tests need write access.
- (copy-recursively
- (string-append
- #$(this-package-native-input "icestorm") "/examples")
- "/tmp/icestorm/examples")
- (with-directory-excursion "/tmp/icestorm/examples"
- (for-each
- (cut invoke "make" "-C" <>)
- (scandir "." (negate (cut member <> '("." "..")))))))))
- (add-after 'run-icestorm-examples 'run-prjtrellis-examples
- (lambda* (#:key tests? #:allow-other-keys)
- (when tests?
- (setenv "PATH"
- (string-append #$output "/bin:" (getenv "PATH")))
- ;; Tests need write access.
- (copy-recursively
- (string-append
- #$(this-package-native-input "prjtrellis") "/examples")
- "/tmp/prjtrellis/examples")
- (with-directory-excursion "/tmp/prjtrellis/examples"
- (for-each
- (cut invoke "make" "-C" <>)
- ;; Other tests require unavailable tools.
- (list "ecp5_evn" "tinyfpga_rev1"
- "tinyfpga_rev2" "versa5g")))))))))
+ "/share/sanitizers-cmake/cmake"))))))))
(native-inputs
- `(("icestorm" ,(package-source icestorm))
- ("googletest" ,googletest)
- ("prjtrellis" ,(package-source prjtrellis))
- ("sanitizers-cmake" ,sanitizers-cmake)))
+ (list googletest
+ sanitizers-cmake))
(inputs
(list apycula
boost