From patchwork Sat May 3 18:20:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cayetano Santos X-Patchwork-Id: 42277 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 44C8427BC4D; Sat, 3 May 2025 19:20:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7DA9A27BC49 for ; Sat, 3 May 2025 19:20:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uBHT6-0006Ot-TF; Sat, 03 May 2025 14:20:08 -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 ) id 1uBHT3-0006OJ-IU for guix-patches@gnu.org; Sat, 03 May 2025 14:20:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uBHT2-0002NX-Gd for guix-patches@gnu.org; Sat, 03 May 2025 14:20:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=gwbZahh5Het4T8WbC5cR1SWi/nxytf+8jpWuVxoZBKU=; b=MwQ+rC8DbmLXTZ43puX8X8medqW7y8RSh3PdolvmBK5da8sTZdMvQm/M71RVJHmmxoN0ZdCdS6QIiFfzAsGmh/N1V3QO0afAYH60YIF9O1PFnvpXbwdWcNgw9Ht0pcj1l/7SChurxmcApI1SbDJzm/68FGBsxDutf6sNZIYZfvFeSfvHgyR3Q33S+DuYVtRVkydiRGVkrl+Ce6m2jTSJgF+hx0YFMygmFxn0zmdvUMn0M1wBRrylglhwC14l3vWDMyOsjLVVo5/n8Yte6y385097byHvJE4tulUM+pJ3uY9dsFLraMJFecQfE6V8JHr7+fn1Q0C/QcoYFi0XCh7PCw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uBHSz-0006P4-TR; Sat, 03 May 2025 14:20:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78233] [PATCH 1/2] gnu: Add nextpnr. Resent-From: Cayetano Santos Original-Sender: "Debbugs-submit" Resent-CC: csantosb@inventati.org, ekaitz@elenq.tech, gabriel@erlikon.ch, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Sat, 03 May 2025 18:20:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78233 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78233@debbugs.gnu.org Cc: Cayetano Santos , Cayetano Santos , Ekaitz Zarraga , Gabriel Wicki , Maxim Cournoyer X-Debbugs-Original-Xcc: Cayetano Santos , Ekaitz Zarraga , Gabriel Wicki , Maxim Cournoyer Received: via spool by 78233-submit@debbugs.gnu.org id=B78233.174629639024574 (code B ref 78233); Sat, 03 May 2025 18:20:01 +0000 Received: (at 78233) by debbugs.gnu.org; 3 May 2025 18:19:50 +0000 Received: from localhost ([127.0.0.1]:43284 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uBHSn-0006OH-Vt for submit@debbugs.gnu.org; Sat, 03 May 2025 14:19:50 -0400 Received: from confino.investici.org ([93.190.126.19]:57231) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uBHSi-0006Nr-B5 for 78233@debbugs.gnu.org; Sat, 03 May 2025 14:19:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inventati.org; s=stigmate; t=1746296382; bh=gwbZahh5Het4T8WbC5cR1SWi/nxytf+8jpWuVxoZBKU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vxt3sjQJqmebEmUkv55qNUUbvl8CrnI8LmwiK6wAYyZUj0aPhStoWf9l3KjVMkxdb PkPq1k0x/FgMYZOcnjQ7mO7oaJsTBEY6/EW/geYLHdH3cAYrg+2nU0gc8v/zj26ch3 qDZS1hApxnIhqGra2c8VFN1DNdU3Tq1C/S3KP7qA= Received: from mx1.investici.org (unknown [127.0.0.1]) by confino.investici.org (Postfix) with ESMTP id 4Zqbfk231Sz11JG; Sat, 3 May 2025 18:19:42 +0000 (UTC) Received: from [93.190.126.19] (mx1.investici.org [93.190.126.19]) (Authenticated sender: cayetano.santos@inventati.org) by localhost (Postfix) with ESMTPSA id 4Zqbfj6hT5z11JF; Sat, 3 May 2025 18:19:41 +0000 (UTC) Date: Sat, 3 May 2025 20:20:05 +0200 Message-ID: <29af3cc1065ab7b7c02dc36d68fa845db37e22d1.1746294265.git.csantosb@inventati.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Cayetano Santos X-ACL-Warn: , Cayetano Santos via Guix-patches X-Patchwork-Original-From: Cayetano Santos via Guix-patches via From: Cayetano Santos Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/fpga.scm (nextpnr): New variable. Change-Id: Ic3476a6a4220ec20191897a6efb3d4aa347b51c2 --- gnu/packages/fpga.scm | 78 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 78 insertions(+) diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 2298dde595..9dbd1a4564 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -178,6 +178,84 @@ (define-public iverilog ;; You have to accept both GPL2 and LGPL2.1+. (license (list license:gpl2 license:lgpl2.1+)))) +(define nextpnr + (package + (name "nextpnr") + (version "0.8") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/YosysHQ/nextpnr/") + (commit (string-append "nextpnr-" version)) + ;; Required to get oourafft, json11, python-console and + ;; QtPropertyBrowser, not packaged in Guix. + (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 "3rdparty" + (for-each delete-file-recursively + '("googletest" "imgui" "pybind11" "qtimgui" + "sanitizers-cmake" "corrosion")))) + (sha256 + (base32 "0p53a2gl89hf3hfwdxs6pykxyrk82j4lqpwd1fqia2y0c9r2gjlm")))) + (build-system qt-build-system) + (arguments + (list + #:cmake cmake ;CMake 3.25 or higher is required + #:configure-flags + #~(list "-DBUILD_GUI=OFF" + "-DUSE_OPENMP=yes" + "-DBUILD_TESTS=ON" + (string-append "-DCURRENT_GIT_VERSION=nextpnr-" #$version) + "-DUSE_IPO=OFF") + #:phases + #~(modify-phases %standard-phases + ;; Remove references to unbundled code and link against external + ;; libraries instead. + (add-after 'unpack 'patch-source + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "CMakeLists.txt" + ;; Use the system sanitizers-cmake module. + (("\\$\\{CMAKE_SOURCE_DIR\\}/3rdparty/sanitizers-cmake/cmake") + (string-append #$(this-package-native-input "sanitizers-cmake") + "/share/sanitizers-cmake/cmake")) + ;; Use the system googletest module + (("^\\s+add_subdirectory\\(3rdparty/googletest.*") + "") + ;; Use the system corrosion module + (("^\\s+add_subdirectory\\(3rdparty/corrosion.*") + "") + ;; replace gtest_main by gtest + (("^(\\s+target_link_libraries.*)( gtest_main)" _ prefix suffix) + (string-append prefix " gtest"))) + ;; Use the system imgui module + (substitute* "gui/CMakeLists.txt" + (("\\$\\{CMAKE_SOURCE_DIR\\}(/3rdparty/imgui)") + (string-append #$(this-package-input "imgui") + "/include/imgui")) + (("\\$\\{CMAKE_SOURCE_DIR\\}(/3rdparty/qtimgui)") + (string-append #$(this-package-input "qtimgui") + "/include/qtimgui")) + (("^\\s+../3rdparty/(qt)?imgui.*") + ""))))))) + (native-inputs (list googletest sanitizers-cmake)) + (inputs (list boost + corrosion + eigen + imgui + pybind11 + python + qtbase-5 + qtimgui + qtwayland-5)) + (synopsis "Place-and-Route tool for FPGAs") + (description "Nextpnr is a portable FPGA place and route tool.") + (home-page "https://github.com/YosysHQ/nextpnr/") + (license license:asl2.0))) + (define-public yosys (package (name "yosys")