[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/12: gnu: yosys: Do not propagate any inputs.
From: |
guix-commits |
Subject: |
04/12: gnu: yosys: Do not propagate any inputs. |
Date: |
Sat, 11 Feb 2023 15:35:05 -0500 (EST) |
cbaines pushed a commit to branch master
in repository guix.
commit ade3bfd0361bfd62ef8faef6eb1ae9f776f6148b
Author: Simon South <simon@simonsouth.net>
AuthorDate: Fri Feb 10 08:16:54 2023 -0500
gnu: yosys: Do not propagate any inputs.
* gnu/packages/fpga.scm (yosys)[arguments]<#:phases>: Patch reference to z3
in
"fix-paths" phase; in "use-external-abc" phase, use complete path to "abc"
executable in store.
[propagated-inputs]: Remove, moving abc and z3 from here...
[inputs]: ...to here.
Signed-off-by: Christopher Baines <mail@cbaines.net>
---
gnu/packages/fpga.scm | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm
index 7b3c522bf7..4a01714e81 100644
--- a/gnu/packages/fpga.scm
+++ b/gnu/packages/fpga.scm
@@ -159,6 +159,9 @@ For synthesis, the compiler generates netlists in the
desired format.")
#~(modify-phases %standard-phases
(add-before 'configure 'fix-paths
(lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "./backends/smt2/smtio.py"
+ (("\\['z3")
+ (string-append "['" (search-input-file inputs "/bin/z3"))))
(substitute* "./passes/cmds/show.cc"
(("exec xdot")
(string-append "exec " (search-input-file inputs
@@ -171,9 +174,11 @@ For synthesis, the compiler generates netlists in the
desired format.")
(lambda* (#:key make-flags #:allow-other-keys)
(apply invoke "make" "config-gcc" make-flags)))
(add-after 'configure 'use-external-abc
- (lambda _
+ (lambda* (#:key inputs #:allow-other-keys)
(substitute* '("./Makefile")
- (("ABCEXTERNAL \\?=") "ABCEXTERNAL = abc"))))
+ (("ABCEXTERNAL \\?=")
+ (string-append "ABCEXTERNAL = "
+ (search-input-file inputs "/bin/abc"))))))
(add-before 'check 'fix-iverilog-references
(lambda* (#:key inputs native-inputs #:allow-other-keys)
(let ((iverilog (search-input-file (or native-inputs inputs)
@@ -211,15 +216,14 @@ For synthesis, the compiler generates netlists in the
desired format.")
python
tcl)) ; tclsh for the tests
(inputs
- (list graphviz
+ (list abc
+ graphviz
libffi
psmisc
readline
tcl
- xdot))
- (propagated-inputs
- (list abc
- z3)) ; should be in path for yosys-smtbmc
+ xdot
+ z3))
(home-page "https://yosyshq.net/yosys/")
(synopsis "FPGA Verilog RTL synthesizer")
(description "Yosys synthesizes Verilog-2005.")
- branch master updated (55839e3537 -> 5345cf2fbf), guix-commits, 2023/02/11
- 05/12: gnu: yosys: Update to 0.26., guix-commits, 2023/02/11
- 01/12: download: Add bordeaux.guix.gnu.org as a content addressed mirror., guix-commits, 2023/02/11
- 07/12: gnu: libavif: Add pixbuf-loader output., guix-commits, 2023/02/11
- 03/12: gnu: nar-herder: Update to 0-16.f62a2b3., guix-commits, 2023/02/11
- 12/12: gnu: ruby-3.2: Update to 3.2.1, guix-commits, 2023/02/11
- 11/12: gnu: libtorrent-rasterbar: Update to 1.2.18., guix-commits, 2023/02/11
- 02/12: gnu: guix-data-service: Update to 0.0.1-38.6be113f., guix-commits, 2023/02/11
- 04/12: gnu: yosys: Do not propagate any inputs.,
guix-commits <=
- 06/12: gnu: libavif: Update to 0.11.1., guix-commits, 2023/02/11
- 08/12: gnu: footswitch: Update to 1.0-0.e455d67., guix-commits, 2023/02/11
- 10/12: gnu: iwd: Update to 2.3., guix-commits, 2023/02/11
- 09/12: gnu: ell: Update to 0.56., guix-commits, 2023/02/11