@@ -1,49 +1,54 @@
1−{ stdenv, fetchFromGitHub, python3, cmake, boost }:
1+{ stdenv, fetchFromGitHub
2+, python3, boost
3+, cmake
4+}:
25
36let
4− trellisdb = fetchFromGitHub {
5− owner = "SymbiFlow";
6− repo = "prjtrellis-db";
7− rev = "06b429ddb7fd8ec1e3f2b35de2e94b4853cf2835";
8− sha256 = "07bsgw5x3gq0jcn9j4g7q9xvibvz6j2arjnvgyrxnrg30ri9q173";
9− };
7+ boostWithPython3 = boost.override { python = python3; enablePython = true; };
108in
119stdenv.mkDerivation rec {
1210 name = "trellis-${version}";
13− version = "2018.08.01";
11+ version = "2018.12.20";
1412
15− buildInputs = [
16− (boost.override { python = python3; enablePython = true; })
13+ srcs = [
14+ (fetchFromGitHub {
15+ owner = "symbiflow";
16+ repo = "prjtrellis";
17+ rev = "b947028a6ac6494b6000c6e1ab5aa0db813e8544";
18+ sha256 = "14dcsl2drx3xaqvpawp0j7088cijxcr5018yji48rmbl85763aw9";
19+ name = "trellis";
20+ })
21+ (fetchFromGitHub {
22+ owner = "symbiflow";
23+ repo = "prjtrellis-db";
24+ rev = "670d04f0b8412193d5e974eea67f2bb7355aa1ec";
25+ sha256 = "1hm385rg1jq9qbq63g5134gq9xpfadvpahxvzwpv0q543brkg730";
26+ name = "database";
27+ })
1728 ];
29+ sourceRoot = "trellis";
1830
19− nativeBuildInputs = [
20− cmake python3
21− ];
31+ buildInputs = [ boostWithPython3 ];
32+ nativeBuildInputs = [ cmake python3 ];
2233
23− src = fetchFromGitHub {
24− owner = "SymbiFlow";
25− repo = "prjtrellis";
26− rev = "fff9532fe59bf9e38b44f029ce4a06c607a9ee78";
27− sha256 = "0ycw9fjf6428sf5x8x5szn8fha79610nf7nn8kmibgmz9868yv30";
28− };
34+ preConfigure = with builtins; ''
35+ rmdir database && ln -sfv ${elemAt srcs 1} ./database
2936
30− preConfigure = ''
3137 source environment.sh
32− cp -RT "${trellisdb}" database
3338 cd libtrellis
3439 '';
3540
36− meta = {
37− description = "Documentation and tools for Lattice ECP5 FPGAs";
41+ meta = with stdenv.lib; {
42+ description = "Documentation and bitstream tools for Lattice ECP5 FPGAs";
3843 longDescription = ''
3944 Project Trellis documents the Lattice ECP5 architecture
4045 to enable development of open-source tools. Its goal is
4146 to provide sufficient information to develop a free and
4247 open Verilog to bitstream toolchain for these devices.
4348 '';
44− homepage = https://github.com/SymbiFlow/prjtrellis;
45− license = stdenv.lib.licenses.isc;
46− maintainers = with stdenv.lib.maintainers; [ q3k ];
47− platforms = stdenv.lib.platforms.linux;
49+ homepage = https://github.com/symbiflow/prjtrellis;
50+ license = stdenv.lib.licenses.isc;
51+ maintainers = with maintainers; [ q3k thoughtpolice ];
52+ platforms = stdenv.lib.platforms.linux;
4853 };
4954}