From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id 0GJHAzUMu2PPVgAAbAwnHQ (envelope-from ) for ; Sun, 08 Jan 2023 19:32:21 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id iJhGAjUMu2OAaAEAG6o9tA (envelope-from ) for ; Sun, 08 Jan 2023 19:32:21 +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 A2821423C8 for ; Sun, 8 Jan 2023 19:32:20 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pEaSk-0003xF-H2; Sun, 08 Jan 2023 13:32:06 -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 1pEaSh-0003w0-Jm for guix-patches@gnu.org; Sun, 08 Jan 2023 13:32:03 -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 1pEaSg-0005Gu-Se 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 1pEaSg-0002Lo-OV for guix-patches@gnu.org; Sun, 08 Jan 2023 13:32:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60429] [PATCH v2 4/5] gnu: yosys: Propagate external dependencies. Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Jan 2023 18:32:02 +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.16732027098973 (code B ref 60429); Sun, 08 Jan 2023 18:32:02 +0000 Received: (at 60429) by debbugs.gnu.org; 8 Jan 2023 18:31:49 +0000 Received: from localhost ([127.0.0.1]:34660 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pEaSS-0002KZ-Ep for submit@debbugs.gnu.org; Sun, 08 Jan 2023 13:31:48 -0500 Received: from mailout.easymail.ca ([64.68.200.34]:46904) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pEaSN-0002Jg-Dd for 60429@debbugs.gnu.org; Sun, 08 Jan 2023 13:31:45 -0500 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 488CD67790 for <60429@debbugs.gnu.org>; Sun, 8 Jan 2023 18:31:38 +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 RqvQ4EbwgO0a for <60429@debbugs.gnu.org>; Sun, 8 Jan 2023 18:31:38 +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 B83C36774B for <60429@debbugs.gnu.org>; Sun, 8 Jan 2023 18:31:37 +0000 (UTC) From: Simon South Date: Sun, 8 Jan 2023 13:31:30 -0500 Message-Id: <62b19db61f34b63e37ba204fd9691b97d5c245bb.1673202235.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-Seal: i=1; s=key1; d=yhetil.org; t=1673202740; a=rsa-sha256; cv=none; b=nLijkeO2lh/5AtVd6KWjFOTAr69ap8gMEg8x7Wv/2XExk2HNhfw9l5cxgEi9nqJTL0f83h Rm/IcedtGxy9PkX03w83DqN2l6Wj2sNylXDpRn5gpQXLv5OG7Cz4R/BNhtcfCdx3rxW4vR uJvmb9IUaTSrvSOS/YlpaJm0GuicL8jRY/UuoIMzp4ewygwhuvC5qnTLxIdpaP1SfbXEam iPJBTIce9e2gbnLEnuvGco/CMCm3lxIVjKeqS39zh1QnGzNmcK3bTxcDRaoBvo5NFBQ6Of BxnokpMM2umflN/3P7QPvuZ4iq6VI5wp34yjJwRuDoDorQPkVNlmvMcA5tCBCA== 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-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1673202740; 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=aBhzGqVN4EtRrKEOvTDXGSqJNP3H3cqXGbG6AlAgWFIQk1iw2T9tc0ZsnPxP3AiuCHTOMO tHGlt0mTW3CkHBqJbi+al7RZwZqnPE8qFX1mFj8QK0ODGmhp82dVgQOrJAKK2BAM0YvCyf V4hdfKV5IRRfpYhxGDcPAyyUE9RsBgk2sa5zbGYulsqOxkRyVPEapQd8yM+D+RaIBVn1Mq QFw4CsR1ekWr0XC/2EavZb6x7iHKVXKawQyhCQAwr94t8cXwfB86Ac6L0kPYPVT2vjxxvW Y3yPSvSIynOjp/gP5cYv/c+WlRl5/4lm8XgVk9ky7GTxLQuQXEgVxNMDpY5xlQ== X-Spam-Score: -0.87 X-Migadu-Queue-Id: A2821423C8 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: scn0.migadu.com X-Migadu-Spam-Score: -0.87 X-TUID: FCYDzks+GlK2 * 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