unicorn, tutorial, kite, katabatic, bora

This commit is contained in:
Las Safin 2021-08-29 19:58:10 +00:00
parent eeba236c36
commit b5b4f0a633
No known key found for this signature in database
GPG Key ID: E7FA928911B61ED6
8 changed files with 99 additions and 121 deletions

View File

@ -39,15 +39,15 @@
pythonComponents = [ pythonComponents = [
"vlsisapd" "hurricane" "crlcore" "flute" "etesian" "vlsisapd" "hurricane" "crlcore" "flute" "etesian"
"anabatic" "katana" "anabatic" "katana" "bora" "katabatic" "kite"
"tutorial" "unicorn"
]; ];
components = pythonComponents ++ [ components = pythonComponents ++ [
"lefdef" "bootstrap" "cumulus" "coloquinte" "lefdef" "bootstrap" "cumulus" "coloquinte"
"bora" "equinox" "knik" "katabatic" "ispd" "equinox" "knik" "ispd" "karakaze" "nimbus"
"karakaze" "kite" "nimbus" "metis" "mauka" "oroshi" "metis" "mauka" "oroshi" "solstice" "stratus1"
"solstice" "stratus1" "tutorial" "unicorn" "documentation" "documentation" "unittests"
"unittests"
]; ];
commonArgs = { inherit version meta generic; }; commonArgs = { inherit version meta generic; };

View File

@ -1,25 +1,19 @@
{ version, meta }: { generic, ... }:
{ lib, stdenv, cmake, ninja, python2, boost let pkg =
, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane { coriolis-vlsisapd, coriolis-hurricane
, coriolis-crlcore, qt4, coriolis-katana , coriolis-crlcore, qt4, coriolis-katana
, coriolis-flute, coriolis-anabatic , coriolis-flute, coriolis-anabatic
, coriolis-lefdef, qwt6_qt4, doxygen }: , coriolis-lefdef, qwt6_qt4, doxygen }:
{
let boostWithPython = boost.override { enablePython = true; python = python2; }; in name = "bora";
src = ../bora;
stdenv.mkDerivation { buildInputs = [
pname = "coriolis-bora"; coriolis-vlsisapd coriolis-hurricane coriolis-crlcore
coriolis-katana qt4 coriolis-flute coriolis-anabatic
src = ../bora; coriolis-lefdef qwt6_qt4
];
buildInputs = [ nativeBuildInputs = [ doxygen ];
python2 boostWithPython coriolis-bootstrap pythonImportsCheck = "Bora";
coriolis-vlsisapd coriolis-hurricane coriolis-crlcore };
coriolis-katana qt4 coriolis-flute coriolis-anabatic in generic pkg
coriolis-lefdef qwt6_qt4
];
nativeBuildInputs = [ cmake ninja doxygen ];
inherit version meta;
}

View File

@ -8,6 +8,9 @@ let pkg =
qt4 coriolis-coloquinte coriolis-vlsisapd qt4 coriolis-coloquinte coriolis-vlsisapd
coriolis-hurricane coriolis-crlcore coriolis-hurricane coriolis-crlcore
]; ];
propagatedBuildInputs = [
coriolis-coloquinte
];
nativeBuildInputs = [ doxygen ]; nativeBuildInputs = [ doxygen ];
pythonImportsCheck = [ "Etesian" ]; pythonImportsCheck = [ "Etesian" ];
}; };

View File

@ -7,6 +7,7 @@ let f =
, src , src
, buildInputs ? [] , buildInputs ? []
, nativeBuildInputs ? [] , nativeBuildInputs ? []
, propagatedBuildInputs ? []
, pythonImportsCheck , pythonImportsCheck
}: }:
let let
@ -19,6 +20,7 @@ let f =
coriolis-bootstrap cmake ninja coriolis-bootstrap cmake ninja
python2Packages.pythonImportsCheckHook python2Packages.pythonImportsCheckHook
] ++ nativeBuildInputs; ] ++ nativeBuildInputs;
inherit propagatedBuildInputs;
preInstall = '' preInstall = ''
export PYTHONPATH="$out/${python2Packages.python.sitePackages}:$PYTHONPATH" export PYTHONPATH="$out/${python2Packages.python.sitePackages}:$PYTHONPATH"

View File

@ -1,23 +1,18 @@
{ version, meta }: { generic, ... }:
{ lib, stdenv, cmake, ninja, python2, boost let pkg =
, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane { coriolis-vlsisapd, coriolis-hurricane
, coriolis-crlcore, coriolis-flute, coriolis-knik , coriolis-crlcore, coriolis-flute, coriolis-knik
, qt4, doxygen }: , qt4, doxygen }:
{
name = "katabatic";
src = ../katabatic;
let boostWithPython = boost.override { enablePython = true; python = python2; }; in buildInputs = [
coriolis-vlsisapd coriolis-hurricane coriolis-crlcore
stdenv.mkDerivation { coriolis-flute coriolis-knik qt4
pname = "coriolis-katabatic"; ];
nativeBuildInputs = [ doxygen ];
src = ../katabatic; pythonImportsCheck = [ "Katabatic" ];
};
buildInputs = [ in generic pkg
python2 boostWithPython coriolis-bootstrap
coriolis-vlsisapd coriolis-hurricane coriolis-crlcore
coriolis-flute coriolis-knik qt4
];
nativeBuildInputs = [ cmake ninja doxygen ];
inherit version meta;
}

View File

@ -1,24 +1,18 @@
{ version, meta }: { generic, ... }:
{ lib, stdenv, cmake, ninja, python2, boost let pkg =
, coriolis-lefdef, coriolis-knik, coriolis-katabatic { coriolis-lefdef, coriolis-knik, coriolis-katabatic
, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane , coriolis-vlsisapd, coriolis-hurricane
, coriolis-crlcore, qt4, coriolis-flute, libxml2, doxygen }: , coriolis-crlcore, qt4, coriolis-flute, libxml2, doxygen }:
{
let boostWithPython = boost.override { enablePython = true; python = python2; }; in name = "kite";
src = ../kite;
stdenv.mkDerivation { buildInputs = [
pname = "coriolis-kite"; coriolis-vlsisapd coriolis-hurricane coriolis-crlcore
coriolis-katabatic qt4 coriolis-flute coriolis-knik libxml2
src = ../kite; coriolis-lefdef
];
buildInputs = [ nativeBuildInputs = [ doxygen ];
python2 boostWithPython coriolis-bootstrap pythonImportsCheck = [ "Kite" ];
coriolis-vlsisapd coriolis-hurricane coriolis-crlcore };
coriolis-katabatic qt4 coriolis-flute coriolis-knik libxml2 in generic pkg
coriolis-lefdef
];
nativeBuildInputs = [ cmake ninja doxygen ];
inherit version meta;
}

View File

@ -1,23 +1,18 @@
{ version, meta }: { generic, ... }:
{ lib, stdenv, cmake, ninja, python2, boost let pkg =
, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane { coriolis-vlsisapd, coriolis-hurricane
, coriolis-crlcore, qt4, coriolis-lefdef, libxml2 , coriolis-crlcore, qt4, coriolis-lefdef, libxml2
, doxygen }: , doxygen }:
{
name = "tutorial";
src = ../tutorial;
let boostWithPython = boost.override { enablePython = true; python = python2; }; in buildInputs = [
coriolis-vlsisapd coriolis-hurricane coriolis-crlcore
stdenv.mkDerivation { coriolis-lefdef libxml2 qt4
pname = "coriolis-tutorial"; ];
nativeBuildInputs = [ doxygen ];
src = ../tutorial; pythonImportsCheck = [ "Tutorial" ];
};
buildInputs = [ in generic pkg
python2 boostWithPython coriolis-bootstrap
coriolis-vlsisapd coriolis-hurricane coriolis-crlcore
coriolis-lefdef libxml2 qt4
];
nativeBuildInputs = [ cmake ninja doxygen ];
inherit version meta;
}

View File

@ -1,29 +1,24 @@
{ version, meta }: { generic, ... }:
{ lib, stdenv, cmake, ninja, python2, boost let pkg =
, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane { coriolis-vlsisapd, coriolis-hurricane
, coriolis-crlcore, qt4, coriolis-katana , coriolis-crlcore, qt4, coriolis-katana
, coriolis-flute, coriolis-anabatic, coriolis-coloquinte , coriolis-flute, coriolis-anabatic, coriolis-coloquinte
, coriolis-lefdef, coriolis-knik, coriolis-kite , coriolis-lefdef, coriolis-knik, coriolis-kite
, coriolis-katabatic, coriolis-etesian, coriolis-equinox , coriolis-katabatic, coriolis-etesian, coriolis-equinox
, coriolis-solstice, libxml2, doxygen }: , coriolis-solstice, libxml2, doxygen }:
{
name = "unicorn";
src = ../unicorn;
let boostWithPython = boost.override { enablePython = true; python = python2; }; in buildInputs = [
coriolis-vlsisapd coriolis-hurricane coriolis-crlcore
stdenv.mkDerivation { coriolis-katana qt4 coriolis-flute coriolis-anabatic
pname = "coriolis-unicorn"; coriolis-lefdef libxml2 coriolis-knik coriolis-kite
coriolis-katabatic coriolis-etesian coriolis-equinox
src = ../unicorn; coriolis-solstice
];
buildInputs = [ nativeBuildInputs = [ doxygen ];
python2 boostWithPython coriolis-bootstrap pythonImportsCheck = [ "Unicorn" ];
coriolis-vlsisapd coriolis-hurricane coriolis-crlcore };
coriolis-katana qt4 coriolis-flute coriolis-anabatic in generic pkg
coriolis-lefdef libxml2 coriolis-knik coriolis-kite
coriolis-katabatic coriolis-etesian coriolis-equinox
coriolis-solstice
];
nativeBuildInputs = [ cmake ninja doxygen ];
inherit version meta;
}