Merge master into staging-next

pkgs/development/compilers/prjxray-tools/default.nix

@@ -0,0 +1,29 @@
+{ stdenv
+, fetchFromGitHub
+, cmake
+}:
+
+stdenv.mkDerivation rec {
+  pname   = "prjxray-tools";
+  version = "0.1-2676-gac8d30e3";
+
+  src = fetchFromGitHub {
+    owner  = "SymbiFlow";
+    repo   = "prjxray";
+    fetchSubmodules = true;
+    rev    = "ac8d30e3fe2029122408888d2313844b3e0c265b";
+    sha256 = "1ag7dk12hdhip821crwinncp8vgyzs0r85l1h2vbgn61lnxc7f4h";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "Documenting the Xilinx 7-series bit-stream format";
+    homepage    = "https://github.com/SymbiFlow/prjxray";
+    license     = licenses.isc;
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ mcaju ];
+  };
+}

pkgs/development/compilers/symbiflow-vtr/default.nix

@@ -0,0 +1,40 @@
+{ stdenv
+, fetchFromGitHub
+, bison
+, cmake
+, flex
+, pkg-config
+}:
+
+stdenv.mkDerivation rec {
+  pname   = "symbiflow-vtr";
+  version = "8.0.0.rc2-4003-g8980e4621";
+
+  src = fetchFromGitHub {
+    owner  = "SymbiFlow";
+    repo   = "vtr-verilog-to-routing";
+    rev    = "8980e46218542888fac879961b13aa7b0fba8432";
+    sha256 = "1sq7f1f3dzfm48a9vq5nvp0zllby0nasm3pvqab70f4jaq0m1aaa";
+  };
+
+  nativeBuildInputs = [
+    bison
+    cmake
+    flex
+    pkg-config
+  ];
+
+  cmakeFlags = [
+    "-DWITH_ODIN=OFF"
+    "-DWITH_ABC=OFF"
+  ];
+
+  doCheck = true;
+
+  meta = with stdenv.lib; {
+    description = "SymbiFlow WIP changes for Verilog to Routing (VTR)";
+    homepage    = "https://github.com/SymbiFlow/vtr-verilog-to-routing";
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ mcaju ];
+  };
+}

pkgs/development/compilers/symbiflow-yosys-plugins/default.nix

@@ -0,0 +1,37 @@
+{ stdenv
+, fetchFromGitHub
+, symbiflow-yosys
+, zlib
+, readline
+}:
+
+stdenv.mkDerivation rec {
+  pname   = "symbiflow-yosys-plugins";
+  version = "1.0.0.7-0060-g7454cd6b";
+
+  src = fetchFromGitHub {
+    owner  = "SymbiFlow";
+    repo   = "yosys-symbiflow-plugins";
+    rev    = "7454cd6b5e4fd22854e2ada219a5e3c3a06e0717";
+    sha256 = "0r9r31p7fy4ylfrwvwlbivq5a03xrph34blxbxzx2c8bc02mbv0s";
+  };
+
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [ symbiflow-yosys ];
+
+  buildInputs = [
+    readline
+    zlib
+  ];
+
+  makeFlags = [ "PLUGINS_DIR=${placeholder "out"}/share/yosys/plugins" ];
+
+  meta = with stdenv.lib; {
+    description = "Yosys SymbiFlow Plugins";
+    homepage    = "https://github.com/SymbiFlow/yosys-symbiflow-plugins";
+    license     = licenses.isc;
+    platforms   = platforms.all;
+    maintainers = with maintainers; [ mcaju ];
+  };
+}

pkgs/development/compilers/symbiflow-yosys/default.nix

@@ -0,0 +1,37 @@
+{ stdenv
+, abc-verifier
+, fetchFromGitHub
+, yosys
+, plugins ? []
+}:
+
+let
+  localAbc-verifier = abc-verifier.overrideAttrs (_: rec {
+    pname = "abc-verifier";
+    version = "2020.06.22";
+
+    src = fetchFromGitHub {
+      owner  = "YosysHQ";
+      repo   = "abc";
+      rev    = "341db25668f3054c87aa3372c794e180f629af5d";
+      sha256 = "14cgv34vz5ljkcms6nrv19vqws2hs8bgjgffk5q03cbxnm2jxv5s";
+    };
+
+    passthru.rev = src.rev;
+  });
+in
+
+(yosys.overrideAttrs (oldAttrs: rec {
+  pname   = "symbiflow-yosys";
+  version = "0.9+2406";
+
+  src = fetchFromGitHub {
+    owner  = "SymbiFlow";
+    repo   = "yosys";
+    rev    = "d8b2d1a2b1a93057678cf49bb8f0329f191faba1";
+    sha256 = "1w8jnqzabvzixjllhb6ak2n2gmjvsn6qd996i7z70bsq5rgdkq9g";
+  };
+})).override {
+  abc-verifier = localAbc-verifier;
+  plugins = plugins;
+}

pkgs/development/compilers/yosys/default.nix

@@ -5,13 +5,14 @@
 , fetchFromGitHub
 , flex
 , libffi
-, pkgconfig
+, pkg-config
 , protobuf
 , python3
 , readline
 , tcl
 , verilog
 , zlib
+, plugins ? []
 }:
 
 # NOTE: as of late 2020, yosys has switched to an automation robot that
@@ -32,6 +33,8 @@
 # ultimately less confusing than using dates.
 
 stdenv.mkDerivation rec {
+  inherit plugins;
+
   pname   = "yosys";
   version = "0.9+3830";
 
@@ -43,21 +46,16 @@ stdenv.mkDerivation rec {
   };
 
   enableParallelBuilding = true;
-  nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ tcl readline libffi python3 bison flex protobuf zlib ];
+  nativeBuildInputs = [ pkg-config protobuf flex bison python3 ];
+  buildInputs = [ tcl readline libffi python3 protobuf zlib ];
 
   makeFlags = [ "ENABLE_PROTOBUF=1" "PREFIX=${placeholder "out"}"];
 
   patchPhase = ''
     substituteInPlace ./Makefile \
-      --replace 'CXX = clang' "" \
-      --replace 'LD = clang++' 'LD = $(CXX)' \
-      --replace 'CXX = gcc' "" \
-      --replace 'LD = gcc' 'LD = $(CXX)' \
-      --replace 'ABCMKARGS = CC="$(CXX)" CXX="$(CXX)"' 'ABCMKARGS =' \
       --replace 'echo UNKNOWN' 'echo ${builtins.substring 0 10 src.rev}'
-    substituteInPlace ./misc/yosys-config.in \
-      --replace '/bin/bash' '${bash}/bin/bash'
+    chmod +x ./misc/yosys-config.in
+    patchShebangs ./misc/yosys-config.in
     patchShebangs tests
   '';
 
@@ -76,8 +74,8 @@ stdenv.mkDerivation rec {
       exit 1
     fi
 
-    if ! grep -q "YOSYS_VER := ${version}" Makefile; then
-      echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package (${version}), failing."
+    if ! grep -q "YOSYS_VER := $version" Makefile; then
+      echo "ERROR: yosys version in Makefile isn't equivalent to version of the nix package ($version), failing."
       exit 1
     fi
   '';
@@ -94,7 +92,14 @@ stdenv.mkDerivation rec {
   # add a symlink to fake things so that both variants work the same way. this
   # is also needed at build time for the test suite.
   postBuild   = "ln -sfv ${abc-verifier}/bin/abc ./yosys-abc";
-  postInstall = "ln -sfv ${abc-verifier}/bin/abc $out/bin/yosys-abc";
+  postInstall = ''
+    ln -sfv ${abc-verifier}/bin/abc $out/bin/yosys-abc
+
+    mkdir -p $out/share/yosys/plugins
+    for plugin in $plugins; do
+        ln -sfv $plugin/share/yosys/plugins/* $out/share/yosys/plugins/
+    done
+  '';
 
   meta = with stdenv.lib; {
     description = "Open RTL synthesis framework and tools";