unofficial mirror of guix-devel@gnu.org 
 help / color / mirror / code / Atom feed
* [PATCH v3 0/6] Add FPGA Tools
@ 2016-09-27  0:04 Danny Milosavljevic
  2016-09-27  0:04 ` [PATCH v3 1/6] gnu: Add abc Danny Milosavljevic
                   ` (6 more replies)
  0 siblings, 7 replies; 10+ messages in thread
From: Danny Milosavljevic @ 2016-09-27  0:04 UTC (permalink / raw)
  To: guix-devel

[-- Attachment #1: Type: text/plain, Size: 380 bytes --]

This patch adds FPGA tools.

Danny Milosavljevic (6):
  gnu: Add abc.
  gnu: Add iverilog.
  gnu: Add yosys.
  gnu: Add icestorm.
  gnu: Add arachne-pnr.
  gnu: Add gtkwave.

 gnu/local.mk          |   1 +
 gnu/packages/fpga.scm | 311 ++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 312 insertions(+)
 create mode 100644 gnu/packages/fpga.scm


^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH v3 1/6] gnu: Add abc.
  2016-09-27  0:04 [PATCH v3 0/6] Add FPGA Tools Danny Milosavljevic
@ 2016-09-27  0:04 ` Danny Milosavljevic
  2016-09-27  0:04 ` [PATCH v3 2/6] gnu: Add iverilog Danny Milosavljevic
                   ` (5 subsequent siblings)
  6 siblings, 0 replies; 10+ messages in thread
From: Danny Milosavljevic @ 2016-09-27  0:04 UTC (permalink / raw)
  To: guix-devel

[-- Attachment #1: Type: text/plain, Size: 282 bytes --]


* gnu/packages/fpga.scm: New file.
* gnu/packages/fpga.scm (abc): New variable.
---
 gnu/local.mk          |  1 +
 gnu/packages/fpga.scm | 75 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+)
 create mode 100644 gnu/packages/fpga.scm


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-abc.patch --]
[-- Type: text/x-patch; name="0001-gnu-Add-abc.patch", Size: 3670 bytes --]

diff --git a/gnu/local.mk b/gnu/local.mk
index c2cdf8b..b1158e9 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -127,6 +127,7 @@ GNU_SYSTEM_MODULES =				\
   %D%/packages/fltk.scm				\
   %D%/packages/fonts.scm			\
   %D%/packages/fontutils.scm			\
+  %D%/packages/fpga.scm				\
   %D%/packages/freedesktop.scm			\
   %D%/packages/freeipmi.scm			\
   %D%/packages/ftp.scm				\
diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm
new file mode 100644
index 0000000..f757a28
--- /dev/null
+++ b/gnu/packages/fpga.scm
@@ -0,0 +1,75 @@
+;;; GNU Guix --- Functional package management for GNU
+;;; Copyright © 2016 Danny Milosavljevic <dannym@scratchpost.org>
+;;;
+;;; This file is part of GNU Guix.
+;;;
+;;; GNU Guix is free software; you can redistribute it and/or modify it
+;;; under the terms of the GNU General Public License as published by
+;;; the Free Software Foundation; either version 3 of the License, or (at
+;;; your option) any later version.
+;;;
+;;; GNU Guix is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;; GNU General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU General Public License
+;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
+
+(define-module (gnu packages fpga)
+  #:use-module ((guix licenses) #:prefix license:)
+  #:use-module (guix packages)
+  #:use-module (guix download)
+  #:use-module (guix git-download)
+  #:use-module (guix build-system gnu)
+  #:use-module (guix build-system cmake)
+  #:use-module (gnu packages)
+  #:use-module (gnu packages pkg-config)
+  #:use-module (gnu packages tcl)
+  #:use-module (gnu packages readline)
+  #:use-module (gnu packages python)
+  #:use-module (gnu packages bison)
+  #:use-module (gnu packages flex)
+  #:use-module (gnu packages libffi)
+  #:use-module (gnu packages zip)
+  #:use-module (gnu packages perl)
+  #:use-module (gnu packages ghostscript)
+  #:use-module (gnu packages gawk)
+  #:use-module (gnu packages version-control)
+  #:use-module (gnu packages libftdi))
+
+(define-public abc
+ (let ((commit "5ae4b975c49c")
+       (revision "1"))
+  (package
+    (name "abc")
+    (version (string-append "0.0-" revision "-" (string-take commit 9)))
+    (source (origin
+              (method url-fetch)
+              (uri
+               (string-append "https://bitbucket.org/alanmi/abc/get/" commit ".zip"))
+              (file-name (string-append name "-" version "-checkout.zip"))
+              (sha256
+                (base32
+                   "1syygi1x40rdryih3galr4q8yg1w5bvdzl75hd27v1xq0l5bz3d0"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("unzip" ,unzip)))
+    (inputs
+     `(("readline" ,readline)))
+    (arguments
+     `(#:tests? #f ; no check target
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)
+         (replace 'install
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (out-bin (string-append out "/bin")))
+               (install-file "abc" out-bin)))))))
+    (home-page "http://people.eecs.berkeley.edu/~alanmi/abc/")
+    (synopsis "Sequential logic synthesis and formal verification")
+    (description "ABC is a program for sequential logic synthesis and
+formal verification.")
+    (license
+      (license:non-copyleft "https://fedoraproject.org/wiki/Licensing:MIT#Modern_Variants")))))

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCH v3 2/6] gnu: Add iverilog.
  2016-09-27  0:04 [PATCH v3 0/6] Add FPGA Tools Danny Milosavljevic
  2016-09-27  0:04 ` [PATCH v3 1/6] gnu: Add abc Danny Milosavljevic
@ 2016-09-27  0:04 ` Danny Milosavljevic
  2016-09-27  0:04 ` [PATCH v3 3/6] gnu: Add yosys Danny Milosavljevic
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 10+ messages in thread
From: Danny Milosavljevic @ 2016-09-27  0:04 UTC (permalink / raw)
  To: guix-devel

[-- Attachment #1: Type: text/plain, Size: 160 bytes --]


* gnu/packages/fpga.scm (iverilog): New variable.
---
 gnu/packages/fpga.scm | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0002-gnu-Add-iverilog.patch --]
[-- Type: text/x-patch; name="0002-gnu-Add-iverilog.patch", Size: 1740 bytes --]

diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm
index f757a28..1d1c981 100644
--- a/gnu/packages/fpga.scm
+++ b/gnu/packages/fpga.scm
@@ -73,3 +73,38 @@
 formal verification.")
     (license
       (license:non-copyleft "https://fedoraproject.org/wiki/Licensing:MIT#Modern_Variants")))))
+
+(define-public iverilog
+  (package
+    (name "iverilog")
+    (version "10.1.1")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (string-append "ftp://ftp.icarus.com/pub/eda/verilog/v10/"
+                              "verilog-" version ".tar.gz"))
+              (sha256
+                (base32
+                   "1nnassxvq30rnn0r2p85rkb2zwxk97p109y13x3vr365wzgpbapx"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("flex" ,flex)
+       ("bison" ,bison)
+       ("ghostscript" ,ghostscript))) ; ps2pdf
+    (home-page "http://iverilog.icarus.com/")
+    (synopsis "FPGA Verilog simulation and synthesis tool")
+    (description "Icarus Verilog is a Verilog simulation and synthesis tool.
+It operates as a compiler, compiling source code written in Verilog
+(IEEE-1364) into some target format.
+For batch simulation, the compiler can generate an intermediate form
+called vvp assembly.
+This intermediate form is executed by the ``vvp'' command.
+For synthesis, the compiler generates netlists in the desired format.")
+    ;; GPL2 only because of:
+    ;; - ./driver/iverilog.man.in
+    ;; - ./iverilog-vpi.man.in
+    ;; - ./tgt-fpga/iverilog-fpga.man
+    ;; - ./vvp/vvp.man.in
+    ;; Otherwise would be GPL2+.
+    ;; You have to accept both GPL2 and LGPL2.1+.
+    (license (list license:gpl2 license:lgpl2.1+))))

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCH v3 3/6] gnu: Add yosys.
  2016-09-27  0:04 [PATCH v3 0/6] Add FPGA Tools Danny Milosavljevic
  2016-09-27  0:04 ` [PATCH v3 1/6] gnu: Add abc Danny Milosavljevic
  2016-09-27  0:04 ` [PATCH v3 2/6] gnu: Add iverilog Danny Milosavljevic
@ 2016-09-27  0:04 ` Danny Milosavljevic
  2016-09-27  0:04 ` [PATCH v3 4/6] gnu: Add icestorm Danny Milosavljevic
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 10+ messages in thread
From: Danny Milosavljevic @ 2016-09-27  0:04 UTC (permalink / raw)
  To: guix-devel

[-- Attachment #1: Type: text/plain, Size: 173 bytes --]


* gnu/packages/fpga.scm (yosys): New variable.
---
 gnu/packages/fpga.scm | 81 +++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0003-gnu-Add-yosys.patch --]
[-- Type: text/x-patch; name="0003-gnu-Add-yosys.patch", Size: 4450 bytes --]

diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm
index 1d1c981..763d746 100644
--- a/gnu/packages/fpga.scm
+++ b/gnu/packages/fpga.scm
@@ -108,3 +108,84 @@ For synthesis, the compiler generates netlists in the desired format.")
     ;; Otherwise would be GPL2+.
     ;; You have to accept both GPL2 and LGPL2.1+.
     (license (list license:gpl2 license:lgpl2.1+))))
+
+(define-public yosys
+  (package
+    (name "yosys")
+    (version "0.6")
+    (source (origin
+              (method url-fetch)
+              (uri
+               (string-append "https://github.com/cliffordwolf/yosys/archive/"
+                              name "-" version ".tar.gz"))
+              (sha256
+                (base32
+                   "02j0c0m9dfyjccynalf0aggj6gy20k7iphpkg5cn6sdirlkv8gmx"))
+              (file-name (string-append name "-" version "-checkout.tar.gz"))
+              (modules '((guix build utils)))
+              (snippet
+                '(substitute* "Makefile"
+                   (("ABCREV = .*") "ABCREV = default\n")))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:test-target "test"
+       #:make-flags (list "CC=gcc"
+                          "CXX=g++"
+                          (string-append "PREFIX=" %output))
+       #:phases
+       (modify-phases %standard-phases
+         (replace 'configure
+           (lambda* (#:key inputs (make-flags '()) #:allow-other-keys)
+             (zero? (apply system* "make" "config-gcc" make-flags))))
+         (add-after 'configure 'prepare-abc
+           (lambda* (#:key inputs #:allow-other-keys)
+             (let* ((sourceabc (assoc-ref inputs "abc"))
+                    (sourcebin (string-append sourceabc "/bin"))
+                    (source (string-append sourcebin "/abc")))
+                   (mkdir-p "abc")
+                   (call-with-output-file "abc/Makefile"
+                     (lambda (port)
+                       (format port ".PHONY: all\nall:\n\tcp -f abc abc-default\n")))
+                   (copy-file source "abc/abc")
+                   (zero? (system* "chmod" "+w" "abc/abc")))))
+          (add-before 'check 'fix-iverilog-references
+             (lambda* (#:key inputs native-inputs #:allow-other-keys)
+               (let* ((xinputs (or native-inputs inputs))
+                      (xdirname (assoc-ref xinputs "iverilog"))
+                      (iverilog (string-append xdirname "/bin/iverilog")))
+                     (substitute* '("./manual/CHAPTER_StateOfTheArt/synth.sh"
+                                    "./manual/CHAPTER_StateOfTheArt/validate_tb.sh"
+                                    "./techlibs/ice40/tests/test_bram.sh"
+                                    "./techlibs/ice40/tests/test_ffs.sh"
+                                    "./techlibs/xilinx/tests/bram1.sh"
+                                    "./techlibs/xilinx/tests/bram2.sh"
+                                    "./tests/bram/run-single.sh"
+                                    "./tests/realmath/run-test.sh"
+                                    "./tests/simple/run-test.sh"
+                                    "./tests/techmap/mem_simple_4x1_runtest.sh"
+                                    "./tests/tools/autotest.sh"
+                                    "./tests/vloghtb/common.sh")
+                        (("if ! which iverilog") "if ! true")
+                        (("iverilog ") (string-append iverilog " "))
+                        (("iverilog_bin=\".*\"") (string-append "iverilog_bin=\""
+                                                                iverilog
+                                                                "\"")))))))))
+    ;; TODO add xdot [patch the path to it here] as soon as I find out where it is.
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("python" ,python)
+       ("bison" ,bison)
+       ("flex" ,flex)
+       ("gawk" , gawk) ; for the tests and "make" progress pretty-printing
+       ("tcl" ,tcl) ; tclsh for the tests
+       ("iverilog" ,iverilog) ; for the tests
+    ))
+    (inputs
+     `(("tcl" ,tcl)
+       ("readline" ,readline)
+       ("libffi" ,libffi)
+       ("abc" ,abc)))
+    (home-page "http://www.clifford.at/yosys/")
+    (synopsis "FPGA Verilog RTL synthesizer")
+    (description "Yosys synthesizes Verilog-2005.")
+    (license license:isc)))

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCH v3 4/6] gnu: Add icestorm.
  2016-09-27  0:04 [PATCH v3 0/6] Add FPGA Tools Danny Milosavljevic
                   ` (2 preceding siblings ...)
  2016-09-27  0:04 ` [PATCH v3 3/6] gnu: Add yosys Danny Milosavljevic
@ 2016-09-27  0:04 ` Danny Milosavljevic
  2016-09-27  0:04 ` [PATCH v3 5/6] gnu: Add arachne-pnr Danny Milosavljevic
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 10+ messages in thread
From: Danny Milosavljevic @ 2016-09-27  0:04 UTC (permalink / raw)
  To: guix-devel

[-- Attachment #1: Type: text/plain, Size: 163 bytes --]


* gnu/packages/fpga.scm (icestorm): New variable.
---
 gnu/packages/fpga.scm | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0004-gnu-Add-icestorm.patch --]
[-- Type: text/x-patch; name="0004-gnu-Add-icestorm.patch", Size: 1946 bytes --]

diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm
index 763d746..8c41cd3 100644
--- a/gnu/packages/fpga.scm
+++ b/gnu/packages/fpga.scm
@@ -189,3 +189,41 @@ For synthesis, the compiler generates netlists in the desired format.")
     (synopsis "FPGA Verilog RTL synthesizer")
     (description "Yosys synthesizes Verilog-2005.")
     (license license:isc)))
+
+(define-public icestorm
+  (let ((commit "12b2295c9087d94b75e374bb205ae4d76cf17e2f")
+        (revision "1"))
+   (package
+    (name "icestorm")
+    (version (string-append "0.0-" revision "-" (string-take commit 9)))
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/cliffordwolf/icestorm.git")
+                     (commit commit)))
+              (file-name (string-append name "-" version "-checkout"))
+              (sha256
+                (base32
+                   "1mmzlqvap6w8n4qzv3idvy51arkgn03692ssplwncy3akjrbsd2b"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:tests? #f ; no unit tests that don't need an FPGA exist.
+       #:make-flags (list "CC=gcc" "CXX=g++"
+                          (string-append "PREFIX=" (assoc-ref %outputs "out")))
+       #:phases
+        (modify-phases %standard-phases
+          (add-after 'unpack 'remove-usr-local
+            (lambda _
+              (substitute* "iceprog/Makefile"
+                (("-L/usr/local/lib") ""))))
+          (delete 'configure))))
+    (inputs
+      `(("libftdi" ,libftdi)))
+    (native-inputs
+      `(("python-3" ,python)
+        ("pkg-config" ,pkg-config)))
+    (home-page "http://www.clifford.at/icestorm/")
+    (synopsis "Project IceStorm - Lattice iCE40 FPGAs bitstream tools")
+    (description "Project IceStorm - Lattice iCE40 FPGAs Bitstream Tools. 
+Includes the actual FTDI connector.")
+    (license license:isc))))

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCH v3 5/6] gnu: Add arachne-pnr.
  2016-09-27  0:04 [PATCH v3 0/6] Add FPGA Tools Danny Milosavljevic
                   ` (3 preceding siblings ...)
  2016-09-27  0:04 ` [PATCH v3 4/6] gnu: Add icestorm Danny Milosavljevic
@ 2016-09-27  0:04 ` Danny Milosavljevic
  2016-09-27  0:05 ` [PATCH v3 6/6] gnu: Add gtkwave Danny Milosavljevic
  2016-09-29 22:39 ` [PATCH v3 0/6] Add FPGA Tools Theodoros Foradis
  6 siblings, 0 replies; 10+ messages in thread
From: Danny Milosavljevic @ 2016-09-27  0:04 UTC (permalink / raw)
  To: guix-devel

[-- Attachment #1: Type: text/plain, Size: 193 bytes --]


* gnu/packages/fpga.scm (arachne-pnr): New variable.
---
 gnu/packages/fpga.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 47 insertions(+), 2 deletions(-)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0005-gnu-Add-arachne-pnr.patch --]
[-- Type: text/x-patch; name="0005-gnu-Add-arachne-pnr.patch", Size: 3000 bytes --]

diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm
index 8c41cd3..43b71b7 100644
--- a/gnu/packages/fpga.scm
+++ b/gnu/packages/fpga.scm
@@ -215,6 +215,7 @@ For synthesis, the compiler generates netlists in the desired format.")
           (add-after 'unpack 'remove-usr-local
             (lambda _
               (substitute* "iceprog/Makefile"
+                (("-I/usr/local/include") "")
                 (("-L/usr/local/lib") ""))))
           (delete 'configure))))
     (inputs
@@ -224,6 +225,50 @@ For synthesis, the compiler generates netlists in the desired format.")
         ("pkg-config" ,pkg-config)))
     (home-page "http://www.clifford.at/icestorm/")
     (synopsis "Project IceStorm - Lattice iCE40 FPGAs bitstream tools")
-    (description "Project IceStorm - Lattice iCE40 FPGAs Bitstream Tools. 
-Includes the actual FTDI connector.")
+    (description "Project IceStorm - Lattice iCE40 FPGAs Bitstream Tools.
+ Includes the actual FTDI connector.")
     (license license:isc))))
+
+(define-public arachne-pnr
+  (let ((commit "52e69ed207342710080d85c7c639480e74a021d7")
+        (revision "1"))
+   (package
+    (name "arachne-pnr")
+    (version (string-append "0.0-" revision "-" (string-take commit 9)))
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                     (url "https://github.com/cseed/arachne-pnr.git")
+                     (commit commit)))
+              (file-name (string-append name "-" version "-checkout"))
+              (sha256
+                (base32
+                   "15bdw5yxj76lxrwksp6liwmr6l1x77isf4bs50ys9rsnmiwh8c3w"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:test-target "test"
+       #:phases (modify-phases %standard-phases
+       (replace 'configure
+         (lambda* (#:key outputs inputs #:allow-other-keys)
+           (substitute* '("Makefile")
+             (("DESTDIR = .*") (string-append "DESTDIR = "
+                                             (assoc-ref outputs "out")
+                                             "\n"))
+             (("ICEBOX = .*") (string-append "ICEBOX = "
+                                             (assoc-ref inputs "icestorm")
+                                             "/share/icebox\n")))
+           (substitute* '("./tests/fsm/generate.py"
+                          "./tests/combinatorial/generate.py")
+             (("#!/usr/bin/python") "#!/usr/bin/python2"))
+           #t)))))
+    (inputs
+     `(("icestorm" ,icestorm)))
+    (native-inputs
+     `(("git" ,git)  ; for determining its own version string
+       ("yosys" ,yosys) ; for tests
+       ("perl" ,perl) ; for shasum
+       ("python-2" ,python-2))) ; for tests
+    (home-page "https://github.com/cseed/arachne-pnr")
+    (synopsis "Place-and-Route tool for FPGAs")
+    (description "Arachne-PNR is a Place-and-Route Tool For FPGAs.")
+    (license license:gpl2))))

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [PATCH v3 6/6] gnu: Add gtkwave.
  2016-09-27  0:04 [PATCH v3 0/6] Add FPGA Tools Danny Milosavljevic
                   ` (4 preceding siblings ...)
  2016-09-27  0:04 ` [PATCH v3 5/6] gnu: Add arachne-pnr Danny Milosavljevic
@ 2016-09-27  0:05 ` Danny Milosavljevic
  2016-09-29 22:39 ` [PATCH v3 0/6] Add FPGA Tools Theodoros Foradis
  6 siblings, 0 replies; 10+ messages in thread
From: Danny Milosavljevic @ 2016-09-27  0:05 UTC (permalink / raw)
  To: guix-devel

[-- Attachment #1: Type: text/plain, Size: 161 bytes --]


* gnu/packages/fpga.scm (gtkwave): New variable.
---
 gnu/packages/fpga.scm | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0006-gnu-Add-gtkwave.patch --]
[-- Type: text/x-patch; name="0006-gnu-Add-gtkwave.patch", Size: 2193 bytes --]

diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm
index 43b71b7..fb970c4 100644
--- a/gnu/packages/fpga.scm
+++ b/gnu/packages/fpga.scm
@@ -30,10 +30,12 @@
   #:use-module (gnu packages python)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages flex)
+  #:use-module (gnu packages gtk)
   #:use-module (gnu packages libffi)
   #:use-module (gnu packages zip)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages ghostscript)
+  #:use-module (gnu packages gperf)
   #:use-module (gnu packages gawk)
   #:use-module (gnu packages version-control)
   #:use-module (gnu packages libftdi))
@@ -272,3 +274,38 @@ For synthesis, the compiler generates netlists in the desired format.")
     (synopsis "Place-and-Route tool for FPGAs")
     (description "Arachne-PNR is a Place-and-Route Tool For FPGAs.")
     (license license:gpl2))))
+
+(define-public gtkwave
+  (package
+    (name "gtkwave")
+    (version "3.3.76")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "http://gtkwave.sourceforge.net/"
+                                  name "-" version ".tar.gz"))
+              (sha256
+               (base32
+                "1vlvavszb1jwwiixiagld88agjrjg0ix8qa4xnxj4ziw0q87jbmn"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("gperf" ,gperf)
+       ("pkg-config" ,pkg-config)))
+    (inputs
+     `(("tcl" ,tcl)
+       ("tk" ,tk)
+       ("gtk+-2" ,gtk+-2)))
+    (arguments
+     `(#: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
+simulator trace files (FST).")
+    (home-page "http://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))))

^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [PATCH v3 0/6] Add FPGA Tools
  2016-09-27  0:04 [PATCH v3 0/6] Add FPGA Tools Danny Milosavljevic
                   ` (5 preceding siblings ...)
  2016-09-27  0:05 ` [PATCH v3 6/6] gnu: Add gtkwave Danny Milosavljevic
@ 2016-09-29 22:39 ` Theodoros Foradis
  2016-09-30  6:23   ` Danny Milosavljevic
  6 siblings, 1 reply; 10+ messages in thread
From: Theodoros Foradis @ 2016-09-29 22:39 UTC (permalink / raw)
  To: Danny Milosavljevic; +Cc: guix-devel


Danny Milosavljevic writes:

> This patch adds FPGA tools.
>
> Danny Milosavljevic (6):
>   gnu: Add abc.
>   gnu: Add iverilog.
>   gnu: Add yosys.
>   gnu: Add icestorm.
>   gnu: Add arachne-pnr.
>   gnu: Add gtkwave.
>
>  gnu/local.mk          |   1 +
>  gnu/packages/fpga.scm | 311 ++++++++++++++++++++++++++++++++++++++++++++++++++
>  2 files changed, 312 insertions(+)
>  create mode 100644 gnu/packages/fpga.scm

I tested the patches again, and they are working correctly after the fix in
libftdi. Should we still delete "-I/usr/local/include" from the makefile
of icestorm to ensure it doesn't build wrongly in non-guixsd systems or is
it unnecessary?

Gtkwave is fine as well. Maybe we would like to add it in
another file though (e.g. engineering.scm), in case it's used  with
other packages in the future.

Regards,
-- 
Theodoros Foradis

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH v3 0/6] Add FPGA Tools
  2016-09-29 22:39 ` [PATCH v3 0/6] Add FPGA Tools Theodoros Foradis
@ 2016-09-30  6:23   ` Danny Milosavljevic
  2016-10-08 14:31     ` Danny Milosavljevic
  0 siblings, 1 reply; 10+ messages in thread
From: Danny Milosavljevic @ 2016-09-30  6:23 UTC (permalink / raw)
  To: Theodoros Foradis; +Cc: guix-devel

> I tested the patches again, and they are working correctly after the fix in
> libftdi. Should we still delete "-I/usr/local/include" from the makefile
> of icestorm to ensure it doesn't build wrongly in non-guixsd systems or is
> it unnecessary?

Yes. I'm sorry, I thought I added the part removing that - but apparently not. It can be added when merging or I or anyone else can send an updated patchset - whichever we prefer. The change would be:

              (substitute* "iceprog/Makefile"
                (("-I/usr/local/include") "") ; added
                (("-L/usr/local/lib") ""))))

Should we have a phase checking that in Guix in the future (which just does "grep -r /usr ." in the package)? Maybe overkill but it would catch something like this automatically.

> Gtkwave is fine as well. Maybe we would like to add it in
> another file though (e.g. engineering.scm), in case it's used  with
> other packages in the future.

engineering.scm would be good to use for all FPGA tools. On the other hand, now you have all the packages for FPGA development in one place - which isn't bad either.

I guess putting just gtkwave there would be good. In any case, I don't have a preference because I don't use the categories for anything as a user anymore.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH v3 0/6] Add FPGA Tools
  2016-09-30  6:23   ` Danny Milosavljevic
@ 2016-10-08 14:31     ` Danny Milosavljevic
  0 siblings, 0 replies; 10+ messages in thread
From: Danny Milosavljevic @ 2016-10-08 14:31 UTC (permalink / raw)
  Cc: guix-devel

For the record, this patchset is still good and nothing has to be manually adjusted.

Ludo said:
>> (lambda _
>>   (substitute* "iceprog/Makefile"
>>     (("-L/usr/local/lib") "")
>>     (("-I/usr/local/include") ""))))  

>This is unnecessary unless you’re running “guix-daemon
>--disable-chroot”, in which case many things break along these lines
>anyway.

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2016-10-08 14:31 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-27  0:04 [PATCH v3 0/6] Add FPGA Tools Danny Milosavljevic
2016-09-27  0:04 ` [PATCH v3 1/6] gnu: Add abc Danny Milosavljevic
2016-09-27  0:04 ` [PATCH v3 2/6] gnu: Add iverilog Danny Milosavljevic
2016-09-27  0:04 ` [PATCH v3 3/6] gnu: Add yosys Danny Milosavljevic
2016-09-27  0:04 ` [PATCH v3 4/6] gnu: Add icestorm Danny Milosavljevic
2016-09-27  0:04 ` [PATCH v3 5/6] gnu: Add arachne-pnr Danny Milosavljevic
2016-09-27  0:05 ` [PATCH v3 6/6] gnu: Add gtkwave Danny Milosavljevic
2016-09-29 22:39 ` [PATCH v3 0/6] Add FPGA Tools Theodoros Foradis
2016-09-30  6:23   ` Danny Milosavljevic
2016-10-08 14:31     ` Danny Milosavljevic

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).