From c9325119f2c4c65270e6fd945655f94592841cef Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 2 Dec 2020 06:52:53 -0600 Subject: trellis: 2020.11.07 -> 2020.11.25 Signed-off-by: Austin Seipp --- pkgs/development/tools/trellis/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'pkgs/development/tools') diff --git a/pkgs/development/tools/trellis/default.nix b/pkgs/development/tools/trellis/default.nix index 89287b2ac4fa..c9884a8eacd8 100644 --- a/pkgs/development/tools/trellis/default.nix +++ b/pkgs/development/tools/trellis/default.nix @@ -3,23 +3,20 @@ , cmake }: -let - boostWithPython3 = boost.override { python = python3; enablePython = true; }; -in stdenv.mkDerivation rec { pname = "trellis"; - version = "2020.11.07"; + version = "2020.11.25"; # git describe --tags realVersion = with stdenv.lib; with builtins; - "1.0-469-g${substring 0 7 (elemAt srcs 0).rev}"; + "1.0-476-g${substring 0 7 (elemAt srcs 0).rev}"; srcs = [ (fetchFromGitHub { owner = "SymbiFlow"; repo = "prjtrellis"; - rev = "b013a135a9b95c18ece559e19aa73ad6c84446c9"; - sha256 = "09bx30jm9bgdxmbxf49a27spg4yd1nk5r5mympq7xi28hq1xwjnf"; + rev = "a441cd9d0390648e96bf27096626eb2c904096de"; + sha256 = "1rsck44n4mf9v3vfac51ksrhcs84s7q297nq1kjkzzvmsx09gd9k"; name = "trellis"; }) @@ -33,7 +30,7 @@ stdenv.mkDerivation rec { ]; sourceRoot = "trellis"; - buildInputs = [ boostWithPython3 ]; + buildInputs = [ boost ]; nativeBuildInputs = [ cmake python3 ]; cmakeFlags = [ "-DCURRENT_GIT_VERSION=${realVersion}" -- cgit v1.2.3