apteryx pushed a commit to branch master
in repository guix.
commit 77802617c3702e6b5bc5d9f41d20e6383e55c52f
Author: Maxim Cournoyer <maxim.courno...@gmail.com>
AuthorDate: Mon May 12 14:34:12 2025 +0900
gnu: nextpnr-ice40. Rename to nextpnr an deprecate it.
* gnu/packages/fpga.scm (nextpnr-ice40): Rename to...
(nextpnr): ... this.
[configure-flage]: Add 'generic' to -DARCH flag.
[inputs]: Add corrosion.
(nextpnr-ice40): Define as a deprecated alias of nextpnr.
Change-Id: Ic3476a6a4220ec20191897a6efb3d4aa347b51c2
Co-authored-by: Cayetano Santos <csant...@inventati.org>
---
gnu/packages/fpga.scm | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm
index 22f38b7886..2019700d72 100644
--- a/gnu/packages/fpga.scm
+++ b/gnu/packages/fpga.scm
@@ -12,6 +12,7 @@
;;; Copyright © 2024 Jakob Kirsch <jakob.kir...@web.de>
;;; Copyright © 2025 Zheng Junjie <873216...@qq.com>
;;; Copyright © 2025 Cayetano Santos <csant...@inventati.org>
+;;; Copyright © 2025 Maxim Cournoyer <maxim.courno...@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -32,6 +33,7 @@
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix gexp)
#:use-module (guix packages)
+ #:use-module (guix deprecation)
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix utils)
@@ -356,9 +358,9 @@ Lattice iCE40 FPGAs and providing simple tools for
analyzing and creating bitstr
files.")
(license license:isc))))
-(define-public nextpnr-ice40
+(define-public nextpnr
(package
- (name "nextpnr-ice40")
+ (name "nextpnr")
(version "0.8")
(source
(origin
@@ -406,7 +408,7 @@ files.")
(list
#:cmake cmake ;CMake 3.25 or higher is required.
#:configure-flags
- #~(list "-DARCH=ice40"
+ #~(list "-DARCH=generic;ice40" ;TODO: enable more architectures?
"-DBUILD_GUI=ON"
"-DUSE_OPENMP=ON"
"-DBUILD_TESTS=ON"
@@ -431,6 +433,7 @@ files.")
sanitizers-cmake))
(inputs
(list boost
+ corrosion
eigen
icestorm
pybind11
@@ -444,6 +447,9 @@ files.")
(home-page "https://github.com/YosysHQ/nextpnr/";)
(license license:isc)))
+(define-public nextpnr-ice40
+ (deprecated-package "nextpnr-ice40" nextpnr))
+
(define-public gtkwave
(package
(name "gtkwave")
