From patchwork Thu Apr 10 10:32:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cayetano Santos X-Patchwork-Id: 41531 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 7608A27BC4B; Thu, 10 Apr 2025 11:34:20 +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=-7.3 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED,URIBL_CSS_A 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 18EAC27BC49 for ; Thu, 10 Apr 2025 11:34:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u2pET-0006Nv-Pf; Thu, 10 Apr 2025 06:34:05 -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 1u2pER-0006M1-4H for guix-patches@gnu.org; Thu, 10 Apr 2025 06:34:03 -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 1u2pEQ-0002mE-Rm for guix-patches@gnu.org; Thu, 10 Apr 2025 06:34:02 -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:Date:From:To:In-Reply-To:References:Subject; bh=cePJCmfBlN6l9kt9CPoIILqR8MwCgTIDzFKas6Cw11s=; b=p+XcGEdZ9Hr5w/wJjLaQ/obg4tlVKM5OChQAXyOpaIM4Zuohpyfg+PRwpfxRa7/Ior6Qt7TgsIql+cGUFFOQsY1CVs2IU579d2vXWEPHKDK+acDU58maE4JbKP3TsFBzn5gqca0ZWHuxYEO/ADtHPCa1e9UqGR92aDRNULHcyPLFJ1+Atabkbp8L+UjDmYXKv4fmJa0OLyY+Q6Kru/Zqhjgo1tc6EiUk0uDPcDwXhBt6/eHTJtiqRjKfguKW9B7kgVyWd8rfeyI1JOFndD0UVF9hbJbOHrHL16X2UtGC+PejtTFZa3EVA3t4ofobJeiKFTXOFFMtFDvz2ZP49lDZvw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u2pEQ-0001Y7-BM; Thu, 10 Apr 2025 06:34:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#77067] [PATCH v3] gnu: icestorm: Update to 0.0-5.3cdcf4b. References: In-Reply-To: Resent-From: Cayetano Santos Original-Sender: "Debbugs-submit" Resent-CC: csantosb@inventati.org, ekaitz@elenq.tech, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Thu, 10 Apr 2025 10:34:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 77067 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 77067@debbugs.gnu.org Cc: Cayetano Santos , Cayetano Santos , Ekaitz Zarraga , Maxim Cournoyer X-Debbugs-Original-Xcc: Cayetano Santos , Ekaitz Zarraga , Maxim Cournoyer Received: via spool by 77067-submit@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 ) id 1u2pEI-0001Xh-A6 for submit@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 ) id 1u2pEE-0001XV-VQ for 77067@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@inventati.org) by localhost (Postfix) with ESMTPSA id 4ZYGPm3tP5z11V2; Thu, 10 Apr 2025 10:33:48 +0000 (UTC) Date: Thu, 10 Apr 2025 12:32:59 +0200 Message-ID: <70195b2e71c81651588ddde2783cf04715bd50fa.1744281179.git.csantosb@inventati.org> X-Mailer: git-send-email 2.49.0 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 (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(-) base-commit: 07c9a4273152deb128006b5ac2087d5fe30a5927 -- 2.49.0 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")