From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id ICu7CJkLr2OaZAEAbAwnHQ (envelope-from ) for ; Fri, 30 Dec 2022 17:02:33 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id qJHCCJkLr2N7wwAA9RJhRA (envelope-from ) for ; Fri, 30 Dec 2022 17:02:33 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id DA63438B77 for ; Fri, 30 Dec 2022 17:02:32 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pBHph-0000WH-Ei; Fri, 30 Dec 2022 11:02:09 -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 1pBHpb-0000V6-OW for guix-patches@gnu.org; Fri, 30 Dec 2022 11:02:05 -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 1pBHpb-0005xk-Bj for guix-patches@gnu.org; Fri, 30 Dec 2022 11:02:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pBHpb-0000aB-6v for guix-patches@gnu.org; Fri, 30 Dec 2022 11:02:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60429] [PATCH 4/5] gnu: yosys: Propagate external dependencies. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 30 Dec 2022 16:02: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.16724160662147 (code B ref 60429); Fri, 30 Dec 2022 16:02:03 +0000 Received: (at 60429) by debbugs.gnu.org; 30 Dec 2022 16:01:06 +0000 Received: from localhost ([127.0.0.1]:35971 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBHof-0000YS-9R for submit@debbugs.gnu.org; Fri, 30 Dec 2022 11:01:05 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:41962) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pBHoY-0000Wz-07 for 60429@debbugs.gnu.org; Fri, 30 Dec 2022 11:00:58 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id D79CBE7B69 for <60429@debbugs.gnu.org>; Fri, 30 Dec 2022 16:00:52 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo08-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo08-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TRmRkEHKDQBN for <60429@debbugs.gnu.org>; Fri, 30 Dec 2022 16:00:52 +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 574B4E7B75 for <60429@debbugs.gnu.org>; Fri, 30 Dec 2022 16:00:52 +0000 (UTC) From: Simon South Date: Fri, 30 Dec 2022 11:00:48 -0500 Message-Id: <477fccd0f411dc2e6cccd91106116e6d71fc58f9.1672412713.git.simon@simonsouth.net> X-Mailer: git-send-email 2.38.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1672416152; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=pu6dt/MsBHH3OJQqQgtCILkr8yplo+BcEmN2sZkdUTM=; b=mLLqSCz8AGU9PoSa4vWSfChwmHtYLlUyHi8cJQWpxJh2K/2YoLTPBIAotNZvgH0Coc8Fwd Ma/H3EvtiXc72loVN9mRo+m2DfhhS4bKmYm+b8q3aKx1POJ4zJnbjkNdwf1qBMycwwS7Od ASN3sNelW5DQjjJVmhzw1zePhq2jvZHCkxSqFHx7LDB1s/55iQBtY4pRaWBdxOzrZGBvQq 28HLKxwuiemusbR0/q3tVLNWnpU9CYaFaegaNG1H/h5gs7jioSVZX6UXYa/joafd1ukfOH wPUljKM3OMfcHNBpn/KwG635qkjfJS/ZPJAojZ59uOo0kanRanb78zlobFSJbg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1672416152; a=rsa-sha256; cv=none; b=EyF40aqbAu1g4Rt9AYALSwgRF+s+XzvGryV/cR76FcIY79vicJeoVc7xXMz4chLeid9Kne vFgtuCbAXSsc9rrCnFgZzTj70BuXxNweLD0v4FvbvkzBdCivkTLZxCuhWi5CZQQTorNyqB UMgOv1miv/kbCvzDaDspXJj0pwrYzZuT2LcWFf5BNOMDMGV1Xjtfcvm7XC0hKe6SQ0RVgY xjGAPIPsg3PZ6EpRviyHWZNaRGKD9qlzUfY45k7koh0DTJUlnoqXg21xwbLl0ek5jiicmI FW6gwt06fKyQGCetFnnRjm0Xqjt1tdggK5kL7TlAhPTvct4wnySLV+iFPwBjiQ== X-Spam-Score: -0.23 X-Migadu-Queue-Id: DA63438B77 Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none X-Migadu-Scanner: scn1.migadu.com X-Migadu-Spam-Score: -0.23 X-TUID: t3KybjqW0HoG * gnu/packages/fpga.scm (yosys)[inputs]: Move graphviz, psmisc, xdot from here... [propagated-inputs]: ...to here, to ensure the availability at runtime of executables invoked by yosys' "show" command. [arguments]: Remove now-obsolete "fix-paths" phase. --- gnu/packages/fpga.scm | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index 8effebd921..785d385621 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -157,16 +157,6 @@ (define-public yosys (string-append "PREFIX=" #$output)) #:phases #~(modify-phases %standard-phases - (add-before 'configure 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "./passes/cmds/show.cc" - (("exec xdot") - (string-append "exec " (search-input-file inputs - "/bin/xdot"))) - (("dot -") - (string-append (search-input-file inputs "/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))) @@ -211,14 +201,14 @@ (define-public yosys python tcl)) ; tclsh for the tests (inputs - (list graphviz - libffi - psmisc + (list libffi readline - tcl - xdot)) + tcl)) (propagated-inputs (list abc + graphviz ; for dot + psmisc ; for fuser + xdot z3)) ; should be in path for yosys-smtbmc (home-page "https://yosyshq.net/yosys/") (synopsis "FPGA Verilog RTL synthesizer") -- 2.38.1