Fix cumulus

This commit is contained in:
Las Safin 2021-09-03 12:50:39 +00:00
parent 658db5ab58
commit a3a738c0ff
No known key found for this signature in database
GPG Key ID: E7FA928911B61ED6
4 changed files with 36 additions and 25 deletions

View File

@ -80,14 +80,14 @@
${CMAKE_CURRENT_SOURCE_DIR}/plugins/alpha/macro/macro.py ${CMAKE_CURRENT_SOURCE_DIR}/plugins/alpha/macro/macro.py
) )
install ( FILES ${pySources} DESTINATION ${PYTHON_SITE_PACKAGES}/cumulus ) install ( FILES ${pySources} DESTINATION ${PYTHON_SITE_PACKAGES} )
install ( FILES ${pyPlugins} DESTINATION ${PYTHON_SITE_PACKAGES}/cumulus/plugins ) install ( FILES ${pyPlugins} DESTINATION ${PYTHON_SITE_PACKAGES}/plugins )
install ( FILES ${pyPluginCTS} DESTINATION ${PYTHON_SITE_PACKAGES}/cumulus/plugins/cts ) install ( FILES ${pyPluginCTS} DESTINATION ${PYTHON_SITE_PACKAGES}/plugins/cts )
install ( FILES ${pyPluginC2C} DESTINATION ${PYTHON_SITE_PACKAGES}/cumulus/plugins/core2chip ) install ( FILES ${pyPluginC2C} DESTINATION ${PYTHON_SITE_PACKAGES}/plugins/core2chip )
install ( FILES ${pyPluginChip} DESTINATION ${PYTHON_SITE_PACKAGES}/cumulus/plugins/chip ) install ( FILES ${pyPluginChip} DESTINATION ${PYTHON_SITE_PACKAGES}/plugins/chip )
install ( FILES ${pyPluginAlpha} DESTINATION ${PYTHON_SITE_PACKAGES}/cumulus/plugins/alpha ) install ( FILES ${pyPluginAlpha} DESTINATION ${PYTHON_SITE_PACKAGES}/plugins/alpha )
install ( FILES ${pyPluginAlphaBlock} DESTINATION ${PYTHON_SITE_PACKAGES}/cumulus/plugins/alpha/block ) install ( FILES ${pyPluginAlphaBlock} DESTINATION ${PYTHON_SITE_PACKAGES}/plugins/alpha/block )
install ( FILES ${pyPluginAlphaC2C} DESTINATION ${PYTHON_SITE_PACKAGES}/cumulus/plugins/alpha/core2chip ) install ( FILES ${pyPluginAlphaC2C} DESTINATION ${PYTHON_SITE_PACKAGES}/plugins/alpha/core2chip )
install ( FILES ${pyPluginAlphaChip} DESTINATION ${PYTHON_SITE_PACKAGES}/cumulus/plugins/alpha/chip ) install ( FILES ${pyPluginAlphaChip} DESTINATION ${PYTHON_SITE_PACKAGES}/plugins/alpha/chip )
install ( FILES ${pyPluginAlphaMacro} DESTINATION ${PYTHON_SITE_PACKAGES}/cumulus/plugins/alpha/macro ) install ( FILES ${pyPluginAlphaMacro} DESTINATION ${PYTHON_SITE_PACKAGES}/plugins/alpha/macro )
install ( PROGRAMS ${pyTools} DESTINATION bin ) install ( PROGRAMS ${pyTools} DESTINATION bin )

View File

@ -58,11 +58,11 @@
pythonComponents = [ pythonComponents = [
"vlsisapd" "hurricane" "crlcore" "flute" "etesian" "vlsisapd" "hurricane" "crlcore" "flute" "etesian"
"anabatic" "katana" "bora" "katabatic" "kite" "anabatic" "katana" "bora" "katabatic" "kite"
"tutorial" "unicorn" "oroshi" "tutorial" "unicorn" "oroshi" "cumulus"
]; ];
components = pythonComponents ++ [ components = pythonComponents ++ [
"lefdef" "bootstrap" "cumulus" "coloquinte" "lefdef" "bootstrap" "coloquinte"
"equinox" "knik" "ispd" "karakaze" "nimbus" "equinox" "knik" "ispd" "karakaze" "nimbus"
"metis" "mauka" "solstice" "stratus1" "metis" "mauka" "solstice" "stratus1"
"documentation" "unittests" "alliance-check-toolkit" "documentation" "unittests" "alliance-check-toolkit"

View File

@ -1,10 +1,10 @@
{ alliance-src, ... }: { alliance-src, ... }:
{ stdenv, coriolis-unicorn, coriolis-crlcore, python2Packages, alliance, yosys }: { stdenv, coriolis-unicorn, coriolis-cumulus, python2Packages, alliance, yosys }:
let let
env = python2Packages.python.buildEnv.override { env = python2Packages.python.buildEnv.override {
extraLibs = [ coriolis-unicorn ]; extraLibs = [ coriolis-unicorn coriolis-cumulus ];
}; };
in stdenv.mkDerivation { in stdenv.mkDerivation {
pname = "alliance-check-toolkit"; pname = "alliance-check-toolkit";

View File

@ -1,16 +1,27 @@
{ version, meta }: { generic, ... }:
{ lib, stdenv, cmake, ninja, python2 let pkg =
, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane { lib, coriolis-vlsisapd, coriolis-hurricane, coriolis-crlcore
, coriolis-crlcore }: , coriolis-etesian, coriolis-anabatic, coriolis-katana
, coriolis-unicorn }:
{
name = "cumulus";
stdenv.mkDerivation { src = ../cumulus;
pname = "coriolis-cumulus";
src = ../cumulus; postInstall = ''
# for import check
mkdir -p /build/coriolistop/etc/coriolis2
export CORIOLIS_TOP=/build/coriolistop
'';
buildInputs = [ python2 coriolis-bootstrap coriolis-vlsisapd coriolis-hurricane coriolis-crlcore ]; propagatedBuildInputs = [
nativeBuildInputs = [ cmake ninja ]; coriolis-vlsisapd coriolis-hurricane coriolis-crlcore
coriolis-etesian coriolis-anabatic coriolis-katana
coriolis-unicorn
];
pythonImportsCheck = [ "plugins" ];
inherit version meta; meta.license = lib.licenses.gpl2Plus;
} };
in generic pkg