From patchwork Sun May 11 20:17:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cayetano Santos X-Patchwork-Id: 42534 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 AC50927BC4A; Sun, 11 May 2025 21:23:28 +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=unavailable 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 5840527BC49 for ; Sun, 11 May 2025 21:23:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uEDCY-0006vh-0Q; Sun, 11 May 2025 16:23:10 -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 1uEDCS-0006vR-SH for guix-patches@gnu.org; Sun, 11 May 2025 16:23:04 -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 1uEDCS-0005AZ-JK for guix-patches@gnu.org; Sun, 11 May 2025 16:23:04 -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:Subject; bh=GXncxpwahH2EHc2D7EvrqBpWcGlObptYHBgyyWE19zw=; b=NOtqRZr0RODz6Zz9qyREL1JmdErgaGGQRDVgU6Qlz2BRD03A0+AwmmwFVZvIGRG2OLWL+/1dQRdwI/4fuwDJEMWy61+8yXFm9G8UFjWfuzli5WpS9cmML6C+c9C1Hb3HWamMXwvAzSyKeyFeBzE7yJz73V0Ty1pXn3a2J+YkwWug6yYqOQYDtLINrFdONnEp6sPWxIjTGkeG4uFacuE141ZJTDgP7cwH5YSFTWV7xDdgMW2dHa53Bkk0IyFn7YLxqo5bIW3nBnoC1zg9KeYcMNlRE1EmituM42aC26nECTnRBbv5a5w7UWvdMpWi8cn0wfkOXQEPtYm7/l6W61m43w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uEDCQ-0004se-Qd; Sun, 11 May 2025 16:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78385] [PATCH electronics-team] gnu: yosys: Improve package style. 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: Sun, 11 May 2025 20:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 78385 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78385@debbugs.gnu.org Cc: Cayetano Santos , Cayetano Santos , Ekaitz Zarraga , Gabriel Wicki , Maxim Cournoyer X-Debbugs-Original-To: guix-patches@gnu.org X-Debbugs-Original-Xcc: Cayetano Santos , Ekaitz Zarraga , Gabriel Wicki , Maxim Cournoyer Received: via spool by submit@debbugs.gnu.org id=B.174699496618647 (code B ref -1); Sun, 11 May 2025 20:23:02 +0000 Received: (at submit) by debbugs.gnu.org; 11 May 2025 20:22:46 +0000 Received: from localhost ([127.0.0.1]:43483 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uEDC7-0004qe-9o for submit@debbugs.gnu.org; Sun, 11 May 2025 16:22:46 -0400 Received: from lists.gnu.org ([2001:470:142::17]:54820) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1uEDC3-0004q3-Rr for submit@debbugs.gnu.org; Sun, 11 May 2025 16:22:40 -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 1uEDBw-0006tj-Ho for guix-patches@gnu.org; Sun, 11 May 2025 16:22:32 -0400 Received: from latitanza.investici.org ([2001:888:2000:56::19]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uEDBs-00059b-MP for guix-patches@gnu.org; Sun, 11 May 2025 16:22:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=inventati.org; s=stigmate; t=1746994943; bh=GXncxpwahH2EHc2D7EvrqBpWcGlObptYHBgyyWE19zw=; h=From:To:Cc:Subject:Date:From; b=mOsrGselzoYEdAy9k0uPIue/37mbDLfwwu/Ey9h84Q5JmMQ43wFVow8zlqROhFFGk 16ZisjcN2XPqPe9RWXon22FJ3yoMi2gu3Durhem8WsEq8GpoSZ1fhT1HyrCtAdK+8P g1a/w9JX3ZTfRikiP6QVOXpM636S/7dEKUAwpTcc= Received: from mx3.investici.org (unknown [127.0.0.1]) by latitanza.investici.org (Postfix) with ESMTP id 4ZwZ0b1HbqzGp90; Sun, 11 May 2025 20:22:23 +0000 (UTC) Received: from [82.94.249.234] (mx3.investici.org [82.94.249.234]) (Authenticated sender: cayetano.santos@inventati.org) by localhost (Postfix) with ESMTPSA id 4ZwZ0Z5qxXzGp9P; Sun, 11 May 2025 20:22:22 +0000 (UTC) Date: Sun, 11 May 2025 22:17:21 +0200 Message-ID: <9534194559e114b0bcbfccb36de133b82bbe18c0.1746994641.git.csantosb@inventati.org> X-Mailer: git-send-email 2.49.0 MIME-Version: 1.0 Received-SPF: pass client-ip=2001:888:2000:56::19; envelope-from=csantosb@inventati.org; helo=latitanza.investici.org X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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 (yosys): Improve package style. Change-Id: Ifa88e523d1637ba05166000056830faa53b45706 --- [arguments] <#:phases> {fix-paths}: Replace search-input-file by this-package-input. {use-external-abc}: Move to fix-paths phase. gnu/packages/fpga.scm | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) base-commit: 300d29e69988caf23684f08effa51f621c7ec083 -- 2.49.0 diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 2298dde595..b1f53560a8 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -205,34 +205,33 @@ (define-public yosys #:phases #~(modify-phases %standard-phases (add-before 'configure 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) + (lambda _ (substitute* "backends/smt2/smtio.py" (("\\['z3") - (string-append "['" - (search-input-file inputs "bin/z3")))) + (string-append "['" #$(this-package-input "z3") "/bin/z3"))) (substitute* "kernel/fstdata.cc" (("vcd2fst") - (search-input-file inputs "bin/vcd2fst"))) + (string-append #$(this-package-input "gtkwave") + "/bin/vcd2fst"))) (substitute* "kernel/driver.cc" (("^#include \"libs/cxxopts/include/cxxopts.hpp\"") "#include ")) (substitute* '("passes/cmds/show.cc" "passes/cmds/viz.cc") (("exec xdot") - (string-append "exec " - (search-input-file inputs "bin/xdot"))) + (string-append "exec " #$(this-package-input "xdot") + "/bin/xdot")) (("dot -") - (string-append (search-input-file inputs "bin/dot") " -")) + (string-append #$(this-package-input "graphviz") "/bin/dot -")) (("fuser") - (search-input-file inputs "bin/fuser"))))) - (replace 'configure - (lambda* (#:key make-flags #:allow-other-keys) - (apply invoke "make" "config-gcc" make-flags))) - (add-after 'configure 'use-external-abc - (lambda* (#:key inputs #:allow-other-keys) + (string-append #$(this-package-input "psmisc") "/bin/fuser"))) (substitute* '("Makefile") (("ABCEXTERNAL \\?=") (string-append "ABCEXTERNAL = " - (search-input-file inputs "/bin/abc")))))) + #$(this-package-input "abc-yosyshq") + "/bin/abc"))))) + (replace 'configure + (lambda* (#:key make-flags #:allow-other-keys) + (apply invoke "make" "config-gcc" make-flags))) (add-after 'install 'add-symbolic-link (lambda* (#:key inputs #:allow-other-keys) ;; Previously this package provided a copy of the "abc"