From a6151294db89c8409965eb3e3d70ccced60aabed Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 8 Nov 2022 10:49:14 +0100 Subject: [PATCH] yosys: 0.22 -> 0.23 https://github.com/YosysHQ/yosys/releases/tag/yosys-0.23 The protobuf backend was removed in https://github.com/YosysHQ/yosys/pull/3508. --- pkgs/development/compilers/yosys/default.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/yosys/default.nix b/pkgs/development/compilers/yosys/default.nix index 34c76b48384e..62bd8b15d1ad 100644 --- a/pkgs/development/compilers/yosys/default.nix +++ b/pkgs/development/compilers/yosys/default.nix @@ -8,7 +8,6 @@ , libffi , makeWrapper , pkg-config -, protobuf , python3 , readline , symlinkJoin @@ -72,13 +71,13 @@ let in stdenv.mkDerivation rec { pname = "yosys"; - version = "0.22"; + version = "0.23"; src = fetchFromGitHub { owner = "YosysHQ"; repo = "yosys"; rev = "${pname}-${version}"; - hash = "sha256-us4GiulqkzcwD2iuNXB5eTd3iqgUdvj9Nd2p/9TJerQ="; + hash = "sha256-mOakdXhSij8k4Eo7RwpKjd59IkNjw31NNFDJtL6Adgo="; }; enableParallelBuilding = true; @@ -87,14 +86,13 @@ in stdenv.mkDerivation rec { tcl readline libffi - protobuf zlib (python3.withPackages (pp: with pp; [ click ])) ]; - makeFlags = [ "ENABLE_PROTOBUF=1" "PREFIX=${placeholder "out"}"]; + makeFlags = [ "PREFIX=${placeholder "out"}"]; patches = [ ./plugin-search-dirs.patch @@ -116,9 +114,6 @@ in stdenv.mkDerivation rec { make config-${if stdenv.cc.isClang or false then "clang" else "gcc"} echo 'ABCEXTERNAL = ${abc-verifier}/bin/abc' >> Makefile.conf - # we have to do this ourselves for some reason... - (cd misc && ${protobuf}/bin/protoc --cpp_out ../backends/protobuf/ ./yosys.proto) - if ! grep -q "ABCREV = ${shortAbcRev}" Makefile; then echo "ERROR: yosys isn't compatible with the provided abc (${shortAbcRev}), failing." exit 1