(address . 73847@debbugs.gnu.org)
4da57329e334056df0b3737abba826b1dad64c69.1733830924.git.csantosb@inventati.org
From: Cayetano Santos via Guix-patches via <guix-patches@gnu.org>
* gnu/packages/fpga.scm (gtkwave): Update to 3.4.0-0.0a800de.
Change-Id: I58db65ebdebe2388640012b6248d1d9cd4540dcb
Signed-off-by: Cayetano Santos <csantosb@inventati.org>
---
gnu/packages/fpga.scm | 65 ++++++++++++++++++++++---------------------
1 file changed, 33 insertions(+), 32 deletions(-)
Toggle diff (112 lines)
diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm
index e69169b980..2083d8fa7a 100644
--- a/gnu/packages/fpga.scm
+++ b/gnu/packages/fpga.scm
@@ -34,6 +34,7 @@ (define-module (gnu packages fpga)
#:use-module (guix utils)
#:use-module (guix build-system gnu)
#:use-module (guix build-system cmake)
+ #:use-module (guix build-system meson)
#:use-module (guix build-system python)
#:use-module (gnu packages)
#:use-module (gnu packages autotools)
@@ -42,16 +43,19 @@ (define-module (gnu packages fpga)
#:use-module (gnu packages bash)
#:use-module (gnu packages bison)
#:use-module (gnu packages boost)
+ #:use-module (gnu packages build-tools)
#:use-module (gnu packages check)
#:use-module (gnu packages cmake)
#:use-module (gnu packages compression)
#:use-module (gnu packages cpp)
#:use-module (gnu packages elf)
#:use-module (gnu packages flex)
+ #:use-module (gnu packages freedesktop)
#:use-module (gnu packages gawk)
#:use-module (gnu packages gdb)
#:use-module (gnu packages gettext)
#:use-module (gnu packages ghostscript)
+ #:use-module (gnu packages glib)
#:use-module (gnu packages gperf)
#:use-module (gnu packages graphviz)
#:use-module (gnu packages gtk)
@@ -68,7 +72,6 @@ (define-module (gnu packages fpga)
#:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
#:use-module (gnu packages readline)
- #:use-module (gnu packages tcl)
#:use-module (gnu packages version-control))
(define-public abc
@@ -361,38 +364,36 @@ (define-public arachne-pnr
(license license:gpl2))))
(define-public gtkwave
- (package
- (name "gtkwave")
- (version "3.3.121")
- (source
- (origin
- (method url-fetch)
- (uri (list (string-append "mirror://sourceforge/gtkwave/"
- "gtkwave-" version "/"
- "gtkwave-" version ".tar.gz")
- (string-append "https://gtkwave.sourceforge.net/"
- "gtkwave-" version ".tar.gz")))
- (sha256
- (base32 "15w3x3zx5klqg1vjkakixw9zwfnkib7gf376knf5sryakd3bc1av"))))
- (build-system gnu-build-system)
- (native-inputs
- (list gperf pkg-config))
- (inputs
- (list tcl tk gtk+-2))
- (arguments
- (list #:configure-flags
- #~(list (string-append "--with-tcl="
- (assoc-ref %build-inputs "tcl")
- "/lib")
- (string-append "--with-tk="
- (assoc-ref %build-inputs "tk")
- "/lib"))))
- (synopsis "Waveform viewer for FPGA simulator trace files")
- (description "This package is a waveform viewer for FPGA
+ (let ((commit "0a800de96255f7fb11beadb6729fdf670da76ecb")
+ (revision "0"))
+ (package
+ (name "gtkwave")
+ (version (git-version "3.4.0" revision commit))
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/gtkwave/gtkwave")
+ (commit commit)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "113psdcv6a1npfv40gs1cjf9ck342fp31pf4y8msvc2dhcr72l1b"))))
+ (build-system meson-build-system)
+ (native-inputs (list cmake-minimal
+ desktop-file-utils
+ flex
+ `(,glib "bin")
+ gobject-introspection
+ gperf
+ pkg-config))
+ (inputs (list gtk+ gtk
+ `(,gtk+ "bin")))
+ (synopsis "Waveform viewer for FPGA simulator trace files")
+ (description "This package is a waveform viewer for FPGA
simulator trace files (@dfn{FST}).")
- (home-page "https://gtkwave.sourceforge.net/")
- ;; Exception against free government use in tcl_np.c and tcl_np.h.
- (license (list license:gpl2+ license:expat license:tcl/tk))))
+ (home-page "https://github.com/gtkwave/gtkwave")
+ ;; Exception against free government use in tcl_np.c and tcl_np.h.
+ (license (list license:gpl2+ license:expat license:tcl/tk)))))
(define-public python-migen
(package
base-commit: 93e1586116f39a30ba1fcb67bd839a43533dfaf4
--
2.46.0