nix: Remove dependencies on vlsisapd

This commit is contained in:
Las Safin 2021-10-26 21:35:18 +00:00
parent af95f9f671
commit b02c387ed5
No known key found for this signature in database
GPG Key ID: E7FA928911B61ED6
24 changed files with 49 additions and 49 deletions

View File

@ -1,13 +1,13 @@
{ generic, ... }: { generic, ... }:
let pkg = let pkg =
{ doxygen, qt4, lib, coriolis-coloquinte, coriolis-vlsisapd { doxygen, qt4, lib, coriolis-coloquinte
, coriolis-hurricane, coriolis-crlcore , coriolis-hurricane, coriolis-crlcore
, coriolis-flute, coriolis-etesian }: , coriolis-flute, coriolis-etesian }:
{ {
name = "anabatic"; name = "anabatic";
src = ../anabatic; src = ../anabatic;
buildInputs = [ buildInputs = [
qt4 coriolis-coloquinte coriolis-vlsisapd qt4 coriolis-coloquinte
coriolis-hurricane coriolis-crlcore coriolis-hurricane coriolis-crlcore
coriolis-flute coriolis-etesian coriolis-flute coriolis-etesian
]; ];

View File

@ -1,7 +1,7 @@
{ generic, ... }: { generic, ... }:
let pkg = let pkg =
{ lib, coriolis-vlsisapd, coriolis-hurricane { lib, 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 }:
@ -9,7 +9,7 @@ let pkg =
name = "bora"; name = "bora";
src = ../bora; src = ../bora;
buildInputs = [ buildInputs = [
coriolis-vlsisapd coriolis-hurricane coriolis-crlcore coriolis-hurricane coriolis-crlcore
coriolis-katana qt4 coriolis-flute coriolis-anabatic coriolis-katana qt4 coriolis-flute coriolis-anabatic
coriolis-lefdef qwt6_qt4 coriolis-lefdef qwt6_qt4
]; ];

View File

@ -1,7 +1,7 @@
{ version, meta, ... }: { version, meta, ... }:
{ buildEnv { buildEnv
, coriolis-vlsisapd, coriolis-hurricane, coriolis-crlcore , coriolis-hurricane, coriolis-crlcore
, coriolis-anabatic, coriolis-katana, coriolis-bora , coriolis-anabatic, coriolis-katana, coriolis-bora
, coriolis-katabatic, coriolis-kite, coriolis-tutorial , coriolis-katabatic, coriolis-kite, coriolis-tutorial
, coriolis-unicorn, coriolis-oroshi, coriolis-cumulus , coriolis-unicorn, coriolis-oroshi, coriolis-cumulus
@ -18,7 +18,7 @@ buildEnv {
coriolis-etesian coriolis-anabatic coriolis-katana coriolis-etesian coriolis-anabatic coriolis-katana
coriolis-bora coriolis-katabatic coriolis-kite coriolis-bora coriolis-katabatic coriolis-kite
coriolis-tutorial coriolis-unicorn coriolis-oroshi coriolis-tutorial coriolis-unicorn coriolis-oroshi
coriolis-cumulus coriolis-lefdef coriolis-vlsisapd coriolis-cumulus coriolis-lefdef
coriolis-coloquinte coriolis-equinox coriolis-knik coriolis-coloquinte coriolis-equinox coriolis-knik
coriolis-karakaze coriolis-solstice coriolis-stratus1 coriolis-karakaze coriolis-solstice coriolis-stratus1
]; ];

View File

@ -1,11 +1,11 @@
{ generic, ... }: { generic, ... }:
let pkg = let pkg =
{ lib, libxml2, qt4, bison, flex, doxygen, coriolis-vlsisapd { lib, libxml2, qt4, bison, flex, doxygen
, coriolis-lefdef, coriolis-hurricane, python3Packages }: , coriolis-lefdef, coriolis-hurricane, python3Packages }:
rec { rec {
name = "crlcore"; name = "crlcore";
src = ../crlcore; src = ../crlcore;
propagatedBuildInputs = [ libxml2 qt4 coriolis-lefdef coriolis-vlsisapd coriolis-hurricane python3Packages.pyqt4 ]; propagatedBuildInputs = [ libxml2 qt4 coriolis-lefdef coriolis-hurricane python3Packages.pyqt4 ];
nativeBuildInputs = [ bison flex doxygen python3Packages.pyqt4 ]; nativeBuildInputs = [ bison flex doxygen python3Packages.pyqt4 ];
postInstall = '' postInstall = ''
ln -s crlcore/helpers $out/${python3Packages.python.sitePackages}/helpers ln -s crlcore/helpers $out/${python3Packages.python.sitePackages}/helpers

View File

@ -1,7 +1,7 @@
{ generic, ... }: { generic, ... }:
let pkg = let pkg =
{ lib, coriolis-vlsisapd, coriolis-hurricane, coriolis-crlcore { lib, coriolis-hurricane, coriolis-crlcore
, coriolis-etesian, coriolis-anabatic, coriolis-katana , coriolis-etesian, coriolis-anabatic, coriolis-katana
, coriolis-unicorn, python3Packages }: , coriolis-unicorn, python3Packages }:
{ {
@ -18,7 +18,7 @@ let pkg =
''; '';
propagatedBuildInputs = [ propagatedBuildInputs = [
coriolis-vlsisapd coriolis-hurricane coriolis-crlcore coriolis-hurricane coriolis-crlcore
coriolis-etesian coriolis-anabatic coriolis-katana coriolis-etesian coriolis-anabatic coriolis-katana
coriolis-unicorn coriolis-unicorn
]; ];

View File

@ -1,7 +1,7 @@
{ version, meta, ... }: { version, meta, ... }:
{ lib, stdenv, cmake, ninja, python3, boost { lib, stdenv, cmake, ninja, python3, boost
, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane , coriolis-bootstrap, coriolis-hurricane
, coriolis-crlcore, qt4 }: , coriolis-crlcore, qt4 }:
let boostWithPython = boost.override { enablePython = true; python = python3; }; in let boostWithPython = boost.override { enablePython = true; python = python3; }; in
@ -13,7 +13,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
python3 boostWithPython coriolis-bootstrap python3 boostWithPython coriolis-bootstrap
coriolis-vlsisapd coriolis-hurricane coriolis-crlcore coriolis-hurricane coriolis-crlcore
qt4 qt4
]; ];
nativeBuildInputs = [ cmake ninja ]; nativeBuildInputs = [ cmake ninja ];

View File

@ -1,12 +1,12 @@
{ generic, ... }: { generic, ... }:
let pkg = let pkg =
{ doxygen, qt4, coriolis-coloquinte, coriolis-vlsisapd, coriolis-hurricane { doxygen, qt4, coriolis-coloquinte, coriolis-hurricane
, lib, coriolis-crlcore }: , lib, coriolis-crlcore }:
{ {
name = "etesian"; name = "etesian";
src = ../etesian; src = ../etesian;
buildInputs = [ buildInputs = [
qt4 coriolis-coloquinte coriolis-vlsisapd qt4 coriolis-coloquinte
coriolis-hurricane coriolis-crlcore coriolis-hurricane coriolis-crlcore
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [

View File

@ -1,10 +1,10 @@
{ generic, ... }: { generic, ... }:
let pkg = let pkg =
{ lib, coriolis-vlsisapd, coriolis-hurricane, coriolis-crlcore }: { lib, coriolis-hurricane, coriolis-crlcore }:
{ {
name = "flute"; name = "flute";
src = ../flute; src = ../flute;
buildInputs = [ coriolis-vlsisapd coriolis-hurricane coriolis-crlcore ]; buildInputs = [ coriolis-hurricane coriolis-crlcore ];
nativeBuildInputs = [ ]; nativeBuildInputs = [ ];
pythonImportsCheck = [ "Flute" ]; pythonImportsCheck = [ "Flute" ];
meta.license = lib.licenses.gpl2Plus; meta.license = lib.licenses.gpl2Plus;

View File

@ -1,13 +1,13 @@
{ version, meta, generic, ... }: { version, meta, generic, ... }:
let pkg = let pkg =
{ lib, libxml2, bzip2, rapidjson, qt4, bison, flex, doxygen, coriolis-vlsisapd }: { lib, libxml2, bzip2, rapidjson, qt4, bison, flex, doxygen }:
{ {
name = "hurricane"; name = "hurricane";
src = ../hurricane; src = ../hurricane;
buildInputs = [ libxml2 qt4 bzip2 rapidjson coriolis-vlsisapd ]; buildInputs = [ libxml2 qt4 bzip2 rapidjson ];
nativeBuildInputs = [ bison flex doxygen ]; nativeBuildInputs = [ bison flex doxygen ];
pythonImportsCheck = [ "Viewer" "Hurricane" "Cfg2" "Analog" ]; pythonImportsCheck = [ "Viewer" "Hurricane" "Cfg" "Analog" ];
meta.license = lib.licenses.lgpl3Plus; meta.license = lib.licenses.lgpl3Plus;
}; };
in generic pkg in generic pkg

View File

@ -1,7 +1,7 @@
{ version, meta }: { version, meta }:
{ lib, stdenv, cmake, ninja, python3, boost { lib, stdenv, cmake, ninja, python3, boost
, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane , coriolis-bootstrap, coriolis-hurricane
, coriolis-crlcore, coriolis-flute, coriolis-knik , coriolis-crlcore, coriolis-flute, coriolis-knik
, coriolis-lefdef, coriolis-katabatic, libxml2, qt4 }: , coriolis-lefdef, coriolis-katabatic, libxml2, qt4 }:
@ -14,7 +14,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
python3 boostWithPython coriolis-bootstrap libxml2 python3 boostWithPython coriolis-bootstrap libxml2
coriolis-vlsisapd coriolis-hurricane coriolis-crlcore coriolis-hurricane coriolis-crlcore
coriolis-flute coriolis-knik coriolis-lefdef coriolis-flute coriolis-knik coriolis-lefdef
coriolis-katabatic qt4 coriolis-katabatic qt4
]; ];

View File

@ -2,13 +2,13 @@
let pkg = let pkg =
{ lib, coriolis-crlcore, coriolis-bora, coriolis-katana, coriolis-anabatic { lib, coriolis-crlcore, coriolis-bora, coriolis-katana, coriolis-anabatic
, coriolis-vlsisapd, coriolis-hurricane }: , coriolis-hurricane }:
{ {
name = "coriolis-karakaze"; name = "coriolis-karakaze";
src = ../karakaze; src = ../karakaze;
propagatedBuildInputs = [ propagatedBuildInputs = [
coriolis-vlsisapd coriolis-crlcore coriolis-hurricane coriolis-katana coriolis-crlcore coriolis-hurricane coriolis-katana
coriolis-bora coriolis-anabatic coriolis-bora coriolis-anabatic
]; ];
postInstall = '' postInstall = ''

View File

@ -1,7 +1,7 @@
{ generic, ... }: { generic, ... }:
let pkg = let pkg =
{ lib, coriolis-vlsisapd, coriolis-hurricane { lib, coriolis-hurricane
, coriolis-crlcore, coriolis-flute, coriolis-knik , coriolis-crlcore, coriolis-flute, coriolis-knik
, qt4, doxygen }: , qt4, doxygen }:
{ {
@ -9,7 +9,7 @@ let pkg =
src = ../katabatic; src = ../katabatic;
buildInputs = [ buildInputs = [
coriolis-vlsisapd coriolis-hurricane coriolis-crlcore coriolis-hurricane coriolis-crlcore
coriolis-flute coriolis-knik qt4 coriolis-flute coriolis-knik qt4
]; ];
nativeBuildInputs = [ doxygen ]; nativeBuildInputs = [ doxygen ];

View File

@ -1,6 +1,6 @@
{ generic, ... }: { generic, ... }:
let pkg = let pkg =
{ doxygen, qt4, lib, coriolis-coloquinte, coriolis-vlsisapd { doxygen, qt4, lib, coriolis-coloquinte
, coriolis-hurricane, coriolis-crlcore, libxml2 , coriolis-hurricane, coriolis-crlcore, libxml2
, coriolis-flute, coriolis-etesian, coriolis-lefdef , coriolis-flute, coriolis-etesian, coriolis-lefdef
, coriolis-anabatic }: , coriolis-anabatic }:
@ -8,7 +8,7 @@ let pkg =
name = "katana"; name = "katana";
src = ../katana; src = ../katana;
buildInputs = [ buildInputs = [
qt4 coriolis-coloquinte coriolis-vlsisapd qt4 coriolis-coloquinte
coriolis-hurricane coriolis-crlcore coriolis-hurricane coriolis-crlcore
coriolis-flute coriolis-etesian libxml2 coriolis-flute coriolis-etesian libxml2
coriolis-lefdef coriolis-anabatic coriolis-lefdef coriolis-anabatic

View File

@ -2,13 +2,13 @@
let pkg = let pkg =
{ lib, coriolis-lefdef, coriolis-knik, coriolis-katabatic { lib, coriolis-lefdef, coriolis-knik, coriolis-katabatic
, coriolis-vlsisapd, coriolis-hurricane , coriolis-hurricane
, coriolis-crlcore, qt4, coriolis-flute, libxml2, doxygen }: , coriolis-crlcore, qt4, coriolis-flute, libxml2, doxygen }:
{ {
name = "kite"; name = "kite";
src = ../kite; src = ../kite;
buildInputs = [ buildInputs = [
coriolis-vlsisapd coriolis-hurricane coriolis-crlcore coriolis-hurricane coriolis-crlcore
coriolis-katabatic qt4 coriolis-flute coriolis-knik libxml2 coriolis-katabatic qt4 coriolis-flute coriolis-knik libxml2
coriolis-lefdef coriolis-lefdef
]; ];

View File

@ -1,7 +1,7 @@
{ version, meta }: { version, meta }:
{ lib, stdenv, cmake, ninja, python3, boost { lib, stdenv, cmake, ninja, python3, boost
, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane , coriolis-bootstrap, coriolis-hurricane
, coriolis-crlcore, coriolis-flute, qt4 }: , coriolis-crlcore, coriolis-flute, qt4 }:
let boostWithPython = boost.override { enablePython = true; python = python3; }; in let boostWithPython = boost.override { enablePython = true; python = python3; }; in
@ -13,7 +13,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
python3 boostWithPython coriolis-bootstrap python3 boostWithPython coriolis-bootstrap
coriolis-vlsisapd coriolis-hurricane coriolis-crlcore coriolis-hurricane coriolis-crlcore
coriolis-flute qt4 coriolis-flute qt4
]; ];
nativeBuildInputs = [ cmake ninja ]; nativeBuildInputs = [ cmake ninja ];

View File

@ -1,7 +1,7 @@
{ version, meta }: { version, meta }:
{ lib, stdenv, cmake, ninja, python3, qt4, coriolis-crlcore { lib, stdenv, cmake, ninja, python3, qt4, coriolis-crlcore
, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane , coriolis-bootstrap, coriolis-hurricane
, coriolis-nimbus, coriolis-metis, doxygen, boost }: , coriolis-nimbus, coriolis-metis, doxygen, boost }:
let boostWithPython = boost.override { enablePython = true; python = python3; }; in let boostWithPython = boost.override { enablePython = true; python = python3; }; in
@ -12,7 +12,7 @@ stdenv.mkDerivation {
src = ../mauka; src = ../mauka;
buildInputs = [ buildInputs = [
python3 coriolis-bootstrap coriolis-vlsisapd coriolis-nimbus python3 coriolis-bootstrap coriolis-nimbus
coriolis-crlcore coriolis-hurricane qt4 boostWithPython coriolis-crlcore coriolis-hurricane qt4 boostWithPython
coriolis-metis coriolis-metis
]; ];

View File

@ -1,7 +1,7 @@
{ version, meta }: { version, meta }:
{ lib, stdenv, cmake, ninja, python3, qt4, coriolis-crlcore { lib, stdenv, cmake, ninja, python3, qt4, coriolis-crlcore
, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane , coriolis-bootstrap, coriolis-hurricane
, coriolis-nimbus, doxygen, boost }: , coriolis-nimbus, doxygen, boost }:
let boostWithPython = boost.override { enablePython = true; python = python3; }; in let boostWithPython = boost.override { enablePython = true; python = python3; }; in
@ -12,7 +12,7 @@ stdenv.mkDerivation {
src = ../metis; src = ../metis;
buildInputs = [ buildInputs = [
python3 coriolis-bootstrap coriolis-vlsisapd coriolis-nimbus python3 coriolis-bootstrap coriolis-nimbus
coriolis-crlcore coriolis-hurricane qt4 boostWithPython coriolis-crlcore coriolis-hurricane qt4 boostWithPython
]; ];
nativeBuildInputs = [ cmake ninja doxygen ]; nativeBuildInputs = [ cmake ninja doxygen ];

View File

@ -1,7 +1,7 @@
{ version, meta }: { version, meta }:
{ lib, stdenv, cmake, ninja, python3, qt4, coriolis-crlcore { lib, stdenv, cmake, ninja, python3, qt4, coriolis-crlcore
, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane , coriolis-bootstrap, coriolis-hurricane
, doxygen, boost }: , doxygen, boost }:
let boostWithPython = boost.override { enablePython = true; python = python3; }; in let boostWithPython = boost.override { enablePython = true; python = python3; }; in
@ -12,7 +12,7 @@ stdenv.mkDerivation {
src = ../nimbus; src = ../nimbus;
buildInputs = [ buildInputs = [
python3 coriolis-bootstrap coriolis-vlsisapd python3 coriolis-bootstrap
coriolis-crlcore coriolis-hurricane qt4 boostWithPython coriolis-crlcore coriolis-hurricane qt4 boostWithPython
]; ];
nativeBuildInputs = [ cmake ninja doxygen ]; nativeBuildInputs = [ cmake ninja doxygen ];

View File

@ -2,13 +2,13 @@
let pkg = let pkg =
{ qt4, coriolis-crlcore, doxygen, lib, python3Packages { qt4, coriolis-crlcore, doxygen, lib, python3Packages
, coriolis-vlsisapd, coriolis-hurricane }: , coriolis-hurricane }:
{ {
name = "oroshi"; name = "oroshi";
src = ../oroshi; src = ../oroshi;
propagatedBuildInputs = [ propagatedBuildInputs = [
coriolis-vlsisapd qt4 python3Packages.pyqt4 qt4 python3Packages.pyqt4
coriolis-crlcore coriolis-hurricane qt4 coriolis-crlcore coriolis-hurricane qt4
python3Packages.numpy python3Packages.numpy
]; ];

View File

@ -1,7 +1,7 @@
{ version, meta }: { version, meta }:
{ lib, stdenv, cmake, ninja, python3, qt4, coriolis-crlcore { lib, stdenv, cmake, ninja, python3, qt4, coriolis-crlcore
, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane , coriolis-bootstrap, coriolis-hurricane
, coriolis-equinox, boost }: , coriolis-equinox, boost }:
let boostWithPython = boost.override { enablePython = true; python = python3; }; in let boostWithPython = boost.override { enablePython = true; python = python3; }; in
@ -12,7 +12,7 @@ stdenv.mkDerivation {
src = ../solstice; src = ../solstice;
buildInputs = [ buildInputs = [
python3 coriolis-bootstrap coriolis-vlsisapd python3 coriolis-bootstrap
coriolis-crlcore coriolis-hurricane qt4 boostWithPython coriolis-crlcore coriolis-hurricane qt4 boostWithPython
coriolis-equinox coriolis-equinox
]; ];

View File

@ -1,14 +1,14 @@
{ generic, ... }: { generic, ... }:
let pkg = let pkg =
{ lib, coriolis-crlcore, coriolis-vlsisapd, coriolis-hurricane { lib, coriolis-crlcore, coriolis-hurricane
, python3Packages, coriolis-cumulus }: , python3Packages, coriolis-cumulus }:
{ {
name = "coriolis-stratus1"; name = "coriolis-stratus1";
src = ../stratus1; src = ../stratus1;
propagatedBuildInputs = [ propagatedBuildInputs = [
coriolis-vlsisapd coriolis-crlcore coriolis-hurricane coriolis-cumulus coriolis-crlcore coriolis-hurricane coriolis-cumulus
]; ];
postInstall = '' postInstall = ''
ln -s -t $out/${python3Packages.python.sitePackages} \ ln -s -t $out/${python3Packages.python.sitePackages} \

View File

@ -1,7 +1,7 @@
{ generic, ... }: { generic, ... }:
let pkg = let pkg =
{ lib, coriolis-vlsisapd, coriolis-hurricane { lib, coriolis-hurricane
, coriolis-crlcore, qt4, coriolis-lefdef, libxml2 , coriolis-crlcore, qt4, coriolis-lefdef, libxml2
, doxygen }: , doxygen }:
{ {
@ -9,7 +9,7 @@ let pkg =
src = ../tutorial; src = ../tutorial;
buildInputs = [ buildInputs = [
coriolis-vlsisapd coriolis-hurricane coriolis-crlcore coriolis-hurricane coriolis-crlcore
coriolis-lefdef libxml2 qt4 coriolis-lefdef libxml2 qt4
]; ];
nativeBuildInputs = [ doxygen ]; nativeBuildInputs = [ doxygen ];

View File

@ -1,7 +1,7 @@
{ generic, ... }: { generic, ... }:
let pkg = let pkg =
{ lib, coriolis-vlsisapd, coriolis-hurricane, coriolis-tutorial { lib, coriolis-hurricane, coriolis-tutorial
, coriolis-crlcore, qt4, coriolis-katana, coriolis-bora , coriolis-crlcore, qt4, coriolis-katana, coriolis-bora
, coriolis-flute, coriolis-anabatic, coriolis-coloquinte , coriolis-flute, coriolis-anabatic, coriolis-coloquinte
, coriolis-lefdef, coriolis-knik, coriolis-kite , coriolis-lefdef, coriolis-knik, coriolis-kite
@ -12,7 +12,7 @@ let pkg =
src = ../unicorn; src = ../unicorn;
propagatedBuildInputs = [ propagatedBuildInputs = [
coriolis-vlsisapd coriolis-hurricane coriolis-crlcore coriolis-hurricane coriolis-crlcore
coriolis-katana qt4 coriolis-flute coriolis-anabatic coriolis-katana qt4 coriolis-flute coriolis-anabatic
coriolis-lefdef libxml2 coriolis-knik coriolis-kite coriolis-lefdef libxml2 coriolis-knik coriolis-kite
coriolis-katabatic coriolis-etesian coriolis-equinox coriolis-katabatic coriolis-etesian coriolis-equinox

View File

@ -1,7 +1,7 @@
{ version, meta }: { version, meta }:
{ lib, stdenv, cmake, ninja, python3, boost { lib, stdenv, cmake, ninja, python3, boost
, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane , coriolis-bootstrap, coriolis-hurricane
, coriolis-crlcore, coriolis-lefdef, qt4 }: , coriolis-crlcore, coriolis-lefdef, qt4 }:
let boostWithPython = boost.override { enablePython = true; python = python3; }; in let boostWithPython = boost.override { enablePython = true; python = python3; }; in
@ -13,7 +13,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
python3 boostWithPython coriolis-bootstrap qt4 python3 boostWithPython coriolis-bootstrap qt4
coriolis-vlsisapd coriolis-hurricane coriolis-crlcore coriolis-hurricane coriolis-crlcore
coriolis-lefdef coriolis-lefdef
]; ];
nativeBuildInputs = [ cmake ninja ]; nativeBuildInputs = [ cmake ninja ];