public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

trellis: 2019.10.13 -> 2020.02.04

Browse Source 
This also fixes the package to actually install the databases required
for nextpnr, oops...
This commit is contained in:
Emily 2020-02-08 15:32:03 +00:00 committed by Austin Seipp
parent c2fd1a9418
commit f43d9bf5ed
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/tools/trellis/default.nix
View File

@ -8,24 +8,24 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "trellis"; pname = "trellis";
version = "2019.10.13"; version = "2020.02.04";
# git describe --tags # git describe --tags
realVersion = with stdenv.lib; with builtins; realVersion = with stdenv.lib; with builtins;
"1.0-95-g${substring 0 7 (elemAt srcs 0).rev}"; "1.0-130-g${substring 0 7 (elemAt srcs 0).rev}";
srcs = [ srcs = [
(fetchFromGitHub { (fetchFromGitHub {
owner = "SymbiFlow"; owner = "SymbiFlow";
repo = "prjtrellis"; repo = "prjtrellis";
rev = "e2e10bfdfaa29fed5d19e83dc7460be9880f5af4"; rev = "4e4b95c8e03583d48d76d1229f9c7825e2ee5be1";
sha256 = "0l59nliv75rdxnajl2plilib0r0bzbr3qqzc88cdal841x1m0izs"; sha256 = "02kg48393bjiys56r62b4ks2xvfarw9phi5bips2xsnj9c99pmg0";
name = "trellis"; name = "trellis";
}) })
(fetchFromGitHub { (fetchFromGitHub {
owner = "SymbiFlow"; owner = "SymbiFlow";
repo = "prjtrellis-db"; repo = "prjtrellis-db";
rev = "5b5bb70bae13e6b8c971b4b2d26931f4a64b51bc"; rev = "717478b757a702bbc7e3e11a5fbecee2a64f7922";
sha256 = "1fi963zdny3gxdvq564037qs22i7b4y7mxc3yij2a1ww8rzrnpdj"; sha256 = "0q4j8qz3m2hissn2a82ck542cx62bp4f0wwzl3g22yv59i13yg83";
name = "trellis-database"; name = "trellis-database";
}) })
]; ];
@ -33,7 +33,12 @@ stdenv.mkDerivation rec {
buildInputs = [ boostWithPython3 ]; buildInputs = [ boostWithPython3 ];
nativeBuildInputs = [ cmake python3 ]; nativeBuildInputs = [ cmake python3 ];
cmakeFlags = [ "-DCURRENT_GIT_VERSION=${realVersion}" ]; cmakeFlags = [
"-DCURRENT_GIT_VERSION=${realVersion}"
# TODO: should this be in stdenv instead?
"-DCMAKE_INSTALL_DATADIR=${placeholder "out"}/share"
];
enableParallelBuilding = true;
preConfigure = with builtins; '' preConfigure = with builtins; ''
rmdir database && ln -sfv ${elemAt srcs 1} ./database rmdir database && ln -sfv ${elemAt srcs 1} ./database
@ -50,7 +55,7 @@ stdenv.mkDerivation rec {
to provide sufficient information to develop a free and to provide sufficient information to develop a free and
open Verilog to bitstream toolchain for these devices. open Verilog to bitstream toolchain for these devices.
''; '';
homepage = https://github.com/symbiflow/prjtrellis; homepage = https://github.com/SymbiFlow/prjtrellis;
license = stdenv.lib.licenses.isc; license = stdenv.lib.licenses.isc;
maintainers = with maintainers; [ q3k thoughtpolice emily ]; maintainers = with maintainers; [ q3k thoughtpolice emily ];
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;