From patchwork Sun Jan 8 18:31:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 45936 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 E7B8427BBED; Sun, 8 Jan 2023 18:32:42 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 24D7627BBE9 for ; Sun, 8 Jan 2023 18:32:42 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pEaTH-000457-KA; Sun, 08 Jan 2023 13:32:39 -0500 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 1pEaSi-0003wf-1j for guix-patches@gnu.org; Sun, 08 Jan 2023 13:32:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pEaSh-0005HT-Pc for guix-patches@gnu.org; Sun, 08 Jan 2023 13:32:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pEaSh-0002M2-Kj for guix-patches@gnu.org; Sun, 08 Jan 2023 13:32:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60429] [PATCH v2 5/5] gnu: yosys: Update to 0.25. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Jan 2023 18:32:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60429 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60429@debbugs.gnu.org Received: via spool by 60429-submit@debbugs.gnu.org id=B60429.16732027138997 (code B ref 60429); Sun, 08 Jan 2023 18:32:03 +0000 Received: (at 60429) by debbugs.gnu.org; 8 Jan 2023 18:31:53 +0000 Received: from localhost ([127.0.0.1]:34665 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pEaSW-0002L2-Hg for submit@debbugs.gnu.org; Sun, 08 Jan 2023 13:31:53 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:47014) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pEaST-0002Jr-9b for 60429@debbugs.gnu.org; Sun, 08 Jan 2023 13:31:49 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 971E66774B for <60429@debbugs.gnu.org>; Sun, 8 Jan 2023 18:31:40 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo09-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo09-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mvnN7mi0xUBv for <60429@debbugs.gnu.org>; Sun, 8 Jan 2023 18:31:40 +0000 (UTC) Received: from localhost.localdomain (23-233-96-72.cpe.pppoe.ca [23.233.96.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id D6B54678C5 for <60429@debbugs.gnu.org>; Sun, 8 Jan 2023 18:31:37 +0000 (UTC) From: Simon South Date: Sun, 8 Jan 2023 13:31:31 -0500 Message-Id: <69832a7e061412efc3ef6b0148815534a513b28d.1673202235.git.simon@simonsouth.net> X-Mailer: git-send-email 2.38.1 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: , 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 (yosys): Update to 0.25. [arguments]: Remove obsolete "fix-iverilog-references" phase. [inputs]: Add zlib. [propagated-inputs]: Add gtkwave, python, python-click. --- gnu/packages/fpga.scm | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 785d385621..45cf0e74cf 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -137,16 +137,15 @@ (define-public iverilog (define-public yosys (package (name "yosys") - (version "0.9") + (version "0.25") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/YosysHQ/yosys") - (commit (string-append "yosys-" version)) - (recursive? #t))) ; for the ‘iverilog’ submodule + (commit (string-append "yosys-" version)))) (sha256 - (base32 - "0lb9r055h8y1vj2z8gm4ip0v06j5mk7f9zx9gi67kkqb7g4rhjli")) + (base32 + "1j5slm7m02q6n0yv6f3ihv2rgrc4krzcdz6g8v6jmj0gwgh9xi5h")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments @@ -164,26 +163,6 @@ (define-public yosys (lambda _ (substitute* '("./Makefile") (("ABCEXTERNAL \\?=") "ABCEXTERNAL = abc")))) - (add-before 'check 'fix-iverilog-references - (lambda* (#:key inputs native-inputs #:allow-other-keys) - (let ((iverilog (search-input-file (or native-inputs inputs) - "/bin/iverilog"))) - (substitute* '("./manual/CHAPTER_StateOfTheArt/synth.sh" - "./manual/CHAPTER_StateOfTheArt/validate_tb.sh" - "./techlibs/ice40/tests/test_bram.sh" - "./techlibs/ice40/tests/test_ffs.sh" - "./techlibs/xilinx/tests/bram1.sh" - "./techlibs/xilinx/tests/bram2.sh" - "./tests/bram/run-single.sh" - "./tests/realmath/run-test.sh" - "./tests/simple/run-test.sh" - "./tests/techmap/mem_simple_4x1_runtest.sh" - "./tests/tools/autotest.sh" - "./tests/vloghtb/common.sh") - (("if ! which iverilog") "if ! true") - (("iverilog ") (string-append iverilog " ")) - (("iverilog_bin=\".*\"") (string-append "iverilog_bin=\"" - iverilog "\"")))))) (add-after 'install 'add-symbolic-link (lambda* (#:key inputs #:allow-other-keys) ;; Previously this package provided a copy of the "abc" @@ -203,11 +182,15 @@ (define-public yosys (inputs (list libffi readline - tcl)) + tcl + zlib)) (propagated-inputs (list abc graphviz ; for dot + gtkwave ; for vcd2fst psmisc ; for fuser + python + python-click xdot z3)) ; should be in path for yosys-smtbmc (home-page "https://yosyshq.net/yosys/")