diff options
author | Austin Seipp <aseipp@pobox.com> | 2018-02-14 00:15:48 -0600 |
---|---|---|
committer | Austin Seipp <aseipp@pobox.com> | 2018-02-14 00:31:13 -0600 |
commit | c2973f986d4fc5da938aaca158a8497751ef35f0 (patch) | |
tree | 545e4b1543d271a138856baf3064a675b63bc750 /pkgs/development/compilers/yosys | |
parent | 4b09bee83e921707c04c87bf75ef86e914d41a7d (diff) |
yosys: 2018.02.04 -> 2018.02.14
Also fixes 'yosys -V' output to give the correct Git SHA1 revision. Signed-off-by: Austin Seipp <aseipp@pobox.com>
Diffstat (limited to 'pkgs/development/compilers/yosys')
-rw-r--r-- | pkgs/development/compilers/yosys/default.nix | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index eb96acafb9e19..063fd71c0433d 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -2,18 +2,24 @@ , pkgconfig, tcl, readline, libffi, python3, bison, flex }: +with builtins; + stdenv.mkDerivation rec { name = "yosys-${version}"; - version = "2018.02.04"; + version = "2018.02.14"; srcs = [ (fetchFromGitHub { owner = "yosyshq"; repo = "yosys"; - rev = "0659d9eac7b546ee6f5acab46dbc83c91d556a34"; - sha256 = "1hy21gxcp3q3hlbh5sh46h2340r11fwalkb9if9sbpc9y3279njj"; + rev = "c1abd3b02cab235334342f3520e2535eb74c5792"; + sha256 = "0pzrplv4p0qzy115rg19lxv4w274iby337zfd7hhlinnpx3gzqvw"; name = "yosys"; }) + + # NOTE: the version of abc used here is synchronized with + # the one in the yosys Makefile of the version above; + # keep them the same for quality purposes. (fetchFromBitbucket { owner = "alanmi"; repo = "abc"; @@ -27,6 +33,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ tcl readline libffi python3 bison flex ]; + + patchPhase = '' + substituteInPlace ./Makefile \ + --replace 'echo UNKNOWN' 'echo ${substring 0 10 (elemAt srcs 0).rev}' + ''; + preBuild = '' chmod -R u+w ../yosys-abc ln -s ../yosys-abc abc |