Received: (at 78385) by debbugs.gnu.org; 12 May 2025 11:22:12 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Mon May 12 07:22:12 2025 Received: from localhost ([127.0.0.1]:50766 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1uEREZ-0003ZL-Ui for submit <at> debbugs.gnu.org; Mon, 12 May 2025 07:22:12 -0400 Received: from cotopaxi.ee.ethz.ch ([129.132.148.196]:37633) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from <gabriel@HIDDEN>) id 1uEREW-0003Yq-6K for 78385 <at> debbugs.gnu.org; Mon, 12 May 2025 07:22:09 -0400 Received: from coney (mob-194-230-148-150.cgn.sunrise.net [194.230.148.150]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: gabriel) by cotopaxi.ee.ethz.ch (Postfix) with ESMTPSA id 761E71FFFF; Mon, 12 May 2025 13:22:00 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=erlikon.ch; s=20250312; t=1747048920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=EJ4L+RFMnv9aRKMaWFohGu+rcaUabYuEGxvjxHKXNFg=; b=MHlozZkJM9g1cLZZnIhRcz/aefq4lB+mIyDVq42wdfHUKGV9WrnEZVl9tl4n3kUSa+fwmP 6rMIa+H0efKVI76IaGdht4fjrG1I3kQO3dc7Wd6LubO0tAbvsMrudHd6hBi913HROfqxtl G2aiDeSu0UHrSOKRLPHsNXNCrhvQBj7NifR6vxeW0uhMSG+1yn5oRiQQJNQX/6jGIQ0y9k Pa33AqbST+N/Pg/9n8vytEra7pOIZ/DtrG6lS5k7JCRH53Mie16yOrOzYeZDI1vyYPw3HH Z4AugvWOJh3GXK5AnGw0kqM+6XC3psF3hQOuZo2f30/YngzmKFITGc5CIE/VeF59CPcLHh VynCnVvVYlq8aLFnais7FD00Sq+l4DoplxHkR1r5iviAdLwGiNMSK0ny8wEWZPaCbk2fAu 3WI9MCcRobtqwirZ+O4Wr8SoUY3izEKjjlRGgPQyK17d7VKX7lkGcptDeYYHZzxJjosyXP D9tzgLwuW6/xmyvNvOPx9VvAVbd0g/Uded2niIH+EmgTsDRiDfvA//RKUhTpr+9H79mPFJ Pgwz2sVNjqZs+CDNvObllsF6z9b3EoRjQHqGrr4FyqjqX/P1N0e+vLmL2z70EaGsvrI6sd HAH/I9WIMNiNrR1CTr+PDZqTCCbXgYlQXH8RZrMviPeXq/mJcVTkQ= Date: Mon, 12 May 2025 13:21:51 +0200 From: Gabriel Wicki <gabriel@HIDDEN> To: Cayetano Santos <csantosb@HIDDEN> Subject: Re: [bug#78385] [PATCH electronics-team] gnu: yosys: Improve package style. Message-ID: <surjkfroji44fl5gikj3x6odhvkoaizhmzvizngh4ofxujhymx@5mv6kdad7ywy> References: <9534194559e114b0bcbfccb36de133b82bbe18c0.1746994641.git.csantosb@HIDDEN> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <9534194559e114b0bcbfccb36de133b82bbe18c0.1746994641.git.csantosb@HIDDEN> X-Spam-Score: 0.0 (/) X-Debbugs-Envelope-To: 78385 Cc: Maxim Cournoyer <maxim.cournoyer@HIDDEN>, Ekaitz Zarraga <ekaitz@HIDDEN>, 78385 <at> debbugs.gnu.org X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.0 (-) LGTM Thanks for your time and effort!
guix-patches@HIDDEN:bug#78385; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 11 May 2025 20:22:46 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Sun May 11 16:22:46 2025
Received: from localhost ([127.0.0.1]:43483 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1uEDC7-0004qe-9o
for submit <at> 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 <csantosb@HIDDEN>)
id 1uEDC3-0004q3-Rr
for submit <at> 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 <csantosb@HIDDEN>)
id 1uEDBw-0006tj-Ho
for guix-patches@HIDDEN; 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 <csantosb@HIDDEN>)
id 1uEDBs-00059b-MP
for guix-patches@HIDDEN; 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@HIDDEN) by localhost (Postfix)
with ESMTPSA id 4ZwZ0Z5qxXzGp9P;
Sun, 11 May 2025 20:22:22 +0000 (UTC)
From: Cayetano Santos <csantosb@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH electronics-team] gnu: yosys: Improve package style.
Date: Sun, 11 May 2025 22:17:21 +0200
Message-ID: <9534194559e114b0bcbfccb36de133b82bbe18c0.1746994641.git.csantosb@HIDDEN>
X-Mailer: git-send-email 2.49.0
MIME-Version: 1.0
X-Debbugs-Cc: Cayetano Santos <csantosb@HIDDEN>,
Ekaitz Zarraga <ekaitz@HIDDEN>, Gabriel Wicki <gabriel@HIDDEN>,
Maxim Cournoyer <maxim.cournoyer@HIDDEN>
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2001:888:2000:56::19;
envelope-from=csantosb@HIDDEN; 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-Spam-Score: 0.9 (/)
X-Debbugs-Envelope-To: submit
Cc: Cayetano Santos <csantosb@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.1 (/)
* 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(-)
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 <cxxopts.hpp>"))
(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"
base-commit: 300d29e69988caf23684f08effa51f621c7ec083
--
2.49.0
Cayetano Santos <csantosb@HIDDEN>:csantosb@HIDDEN, ekaitz@HIDDEN, gabriel@HIDDEN, maxim.cournoyer@HIDDEN, guix-patches@HIDDEN.
Full text available.csantosb@HIDDEN, ekaitz@HIDDEN, gabriel@HIDDEN, maxim.cournoyer@HIDDEN, guix-patches@HIDDEN:bug#78385; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.