diff options
author | Marius Bakke <mbakke@fastmail.com> | 2020-03-27 00:12:15 +0100 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2020-03-27 00:12:15 +0100 |
commit | 18af6870370226b4d502d7372844e7f2aded5887 (patch) | |
tree | 749d93209bd0cb9710ccaae2207df670f37eaa36 /gnu/packages/fpga.scm | |
parent | 0ab8ad46322bea331ed5f5592843ba35e7f38b37 (diff) | |
parent | 3089b70d766bd9ec70e1464867130b7b864fbe17 (diff) |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/icu4c.scm
gnu/packages/man.scm
gnu/packages/python-xyz.scm
guix/scripts/environment.scm
guix/scripts/pack.scm
guix/scripts/package.scm
guix/scripts/pull.scm
guix/store.scm
Diffstat (limited to 'gnu/packages/fpga.scm')
-rw-r--r-- | gnu/packages/fpga.scm | 44 |
1 files changed, 41 insertions, 3 deletions
diff --git a/gnu/packages/fpga.scm b/gnu/packages/fpga.scm index dca67ad3ca..8f34ef8282 100644 --- a/gnu/packages/fpga.scm +++ b/gnu/packages/fpga.scm @@ -44,6 +44,9 @@ #:use-module (gnu packages gperf) #:use-module (gnu packages gawk) #:use-module (gnu packages version-control) + #:use-module (gnu packages qt) + #:use-module (gnu packages boost) + #:use-module (gnu packages algebra) #:use-module (gnu packages libftdi)) (define-public abc @@ -212,8 +215,8 @@ For synthesis, the compiler generates netlists in the desired format.") (license license:isc))) (define-public icestorm - (let ((commit "c0cbae88ab47a3879aacf80d53b6a85710682a6b") - (revision "2")) + (let ((commit "0ec00d892a91cc68e45479b46161f649caea2933") + (revision "3")) (package (name "icestorm") (version (git-version "0.0" revision commit)) @@ -225,7 +228,7 @@ For synthesis, the compiler generates netlists in the desired format.") (file-name (git-file-name name version)) (sha256 (base32 - "0bqm0rpywm64yvbq75klpyzb1g9sdsp1kvdlyqg4hvm8jw9w8lya")))) + "1qlh99fafb7xga702k64fmc9m700nsddrfgcq4x8qn8fplsb64f1")))) (build-system gnu-build-system) (arguments `(#:tests? #f ; no unit tests that don't need an FPGA exist. @@ -256,6 +259,41 @@ For synthesis, the compiler generates netlists in the desired format.") Includes the actual FTDI connector.") (license license:isc)))) +(define-public nextpnr-ice40 + (let [(commit "c192ba261d77ad7f0a744fb90b01e4a5b63938c4") + (revision "0")] + (package + (name "nextpnr-ice40") + (version (git-version "0.0.0" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "git://github.com/YosysHQ/nextpnr") + (commit commit))) + (sha256 + (base32 + "0g2ar1z89b31qw5vgqj2rrcv9rzncs94184dgcsrz19p866654mf")))) + (inputs + `(("qtbase" ,qtbase) + ("boost" ,boost-with-python3) + ("yosys" ,yosys) + ("eigen" ,eigen) + ("python" ,python) + ("icestorm" ,icestorm))) + (build-system cmake-build-system) + (arguments + `(#:configure-flags `("-DARCH=ice40" + ,(string-append "-DICEBOX_ROOT=" + (assoc-ref %build-inputs "icestorm") + "/share/icebox")) + #:tests? #f)) + (synopsis "Place-and-Route tool for FPGAs") + (description "nextpnr aims to be a vendor neutral, timing driven, +FOSS FPGA place and route tool. ") + (home-page "https://github.com/YosysHQ/nextpnr") + (license license:expat)))) + (define-public arachne-pnr (let ((commit "840bdfdeb38809f9f6af4d89dd7b22959b176fdd") (revision "2")) |