yosys: 2020.03.24 -> 2020.06.11

Also includes a bump to `abc-verifier`.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2020-06-11 22:43:44 -05:00
parent 9b42c852be
commit 13e52db31e
No known key found for this signature in database
GPG Key ID: 25D2038DEB08021D
2 changed files with 9 additions and 6 deletions

View File

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "abc-verifier"; pname = "abc-verifier";
version = "2020.03.05"; version = "2020.04.30";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "berkeley-abc"; owner = "berkeley-abc";
repo = "abc"; repo = "abc";
rev = "ed90ce20df9c7c4d6e1db5d3f786f9b52e06bab1"; rev = "fd2c9b1c19216f6b756f88b18f5ca67b759ca128";
sha256 = "01sw67pkrb6wzflkxbkxzwsnli3nvp0yxwp3j1ngb3c0j86ri437"; sha256 = "1d18pkpsx0nlzl3a6lyfdnpk4kixjmgswy6cp5fbrkpp4rf1gahi";
}; };
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];

View File

@ -1,5 +1,6 @@
{ stdenv { stdenv
, abc-verifier , abc-verifier
, bash
, bison , bison
, fetchFromGitHub , fetchFromGitHub
, flex , flex
@ -15,13 +16,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "yosys"; pname = "yosys";
version = "2020.03.24"; version = "2020.06.11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "YosysHQ"; owner = "YosysHQ";
repo = "yosys"; repo = "yosys";
rev = "c9555c9adeba886a308c60615ac794ec20d9276e"; rev = "a1785e988b2b51dac32985dd6b0afdcedc6bda1d";
sha256 = "1fh118fv06jyfmkx6zy0w2k0rjj22m0ffyll3k5giaw8zzaf0j3a"; sha256 = "0987f5vm2zb0i02c3vlw21gihky2cfj5l9b78ddzhxfiv0qfkdfp";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;
@ -38,6 +39,8 @@ stdenv.mkDerivation rec {
--replace 'LD = gcc' 'LD = $(CXX)' \ --replace 'LD = gcc' 'LD = $(CXX)' \
--replace 'ABCMKARGS = CC="$(CXX)" CXX="$(CXX)"' 'ABCMKARGS =' \ --replace 'ABCMKARGS = CC="$(CXX)" CXX="$(CXX)"' 'ABCMKARGS =' \
--replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 src.rev}' --replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 src.rev}'
substituteInPlace ./misc/yosys-config.in \
--replace '/bin/bash' '${bash}/bin/bash'
patchShebangs tests patchShebangs tests
''; '';