From b02c387ed5ff921fe6947f6e455d1ca4ca335ae7 Mon Sep 17 00:00:00 2001 From: Las Safin Date: Tue, 26 Oct 2021 21:35:18 +0000 Subject: [PATCH] nix: Remove dependencies on vlsisapd --- nix/anabatic.nix | 4 ++-- nix/bora.nix | 4 ++-- nix/combined.nix | 4 ++-- nix/crlcore.nix | 4 ++-- nix/cumulus.nix | 4 ++-- nix/equinox.nix | 4 ++-- nix/etesian.nix | 4 ++-- nix/flute.nix | 4 ++-- nix/hurricane.nix | 6 +++--- nix/ispd.nix | 4 ++-- nix/karakaze.nix | 4 ++-- nix/katabatic.nix | 4 ++-- nix/katana.nix | 4 ++-- nix/kite.nix | 4 ++-- nix/knik.nix | 4 ++-- nix/mauka.nix | 4 ++-- nix/metis.nix | 4 ++-- nix/nimbus.nix | 4 ++-- nix/oroshi.nix | 4 ++-- nix/solstice.nix | 4 ++-- nix/stratus1.nix | 4 ++-- nix/tutorial.nix | 4 ++-- nix/unicorn.nix | 4 ++-- nix/unittests.nix | 4 ++-- 24 files changed, 49 insertions(+), 49 deletions(-) diff --git a/nix/anabatic.nix b/nix/anabatic.nix index 52f802b1..f8b171b6 100644 --- a/nix/anabatic.nix +++ b/nix/anabatic.nix @@ -1,13 +1,13 @@ { generic, ... }: let pkg = - { doxygen, qt4, lib, coriolis-coloquinte, coriolis-vlsisapd + { doxygen, qt4, lib, coriolis-coloquinte , coriolis-hurricane, coriolis-crlcore , coriolis-flute, coriolis-etesian }: { name = "anabatic"; src = ../anabatic; buildInputs = [ - qt4 coriolis-coloquinte coriolis-vlsisapd + qt4 coriolis-coloquinte coriolis-hurricane coriolis-crlcore coriolis-flute coriolis-etesian ]; diff --git a/nix/bora.nix b/nix/bora.nix index f17334fa..17760915 100644 --- a/nix/bora.nix +++ b/nix/bora.nix @@ -1,7 +1,7 @@ { generic, ... }: let pkg = - { lib, coriolis-vlsisapd, coriolis-hurricane + { lib, coriolis-hurricane , coriolis-crlcore, qt4, coriolis-katana , coriolis-flute, coriolis-anabatic , coriolis-lefdef, qwt6_qt4, doxygen }: @@ -9,7 +9,7 @@ let pkg = name = "bora"; src = ../bora; buildInputs = [ - coriolis-vlsisapd coriolis-hurricane coriolis-crlcore + coriolis-hurricane coriolis-crlcore coriolis-katana qt4 coriolis-flute coriolis-anabatic coriolis-lefdef qwt6_qt4 ]; diff --git a/nix/combined.nix b/nix/combined.nix index 9d3a038a..44f7261b 100644 --- a/nix/combined.nix +++ b/nix/combined.nix @@ -1,7 +1,7 @@ { version, meta, ... }: { buildEnv -, coriolis-vlsisapd, coriolis-hurricane, coriolis-crlcore +, coriolis-hurricane, coriolis-crlcore , coriolis-anabatic, coriolis-katana, coriolis-bora , coriolis-katabatic, coriolis-kite, coriolis-tutorial , coriolis-unicorn, coriolis-oroshi, coriolis-cumulus @@ -18,7 +18,7 @@ buildEnv { coriolis-etesian coriolis-anabatic coriolis-katana coriolis-bora coriolis-katabatic coriolis-kite coriolis-tutorial coriolis-unicorn coriolis-oroshi - coriolis-cumulus coriolis-lefdef coriolis-vlsisapd + coriolis-cumulus coriolis-lefdef coriolis-coloquinte coriolis-equinox coriolis-knik coriolis-karakaze coriolis-solstice coriolis-stratus1 ]; diff --git a/nix/crlcore.nix b/nix/crlcore.nix index c0e18e5c..433ec9c4 100644 --- a/nix/crlcore.nix +++ b/nix/crlcore.nix @@ -1,11 +1,11 @@ { generic, ... }: let pkg = - { lib, libxml2, qt4, bison, flex, doxygen, coriolis-vlsisapd + { lib, libxml2, qt4, bison, flex, doxygen , coriolis-lefdef, coriolis-hurricane, python3Packages }: rec { name = "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 ]; postInstall = '' ln -s crlcore/helpers $out/${python3Packages.python.sitePackages}/helpers diff --git a/nix/cumulus.nix b/nix/cumulus.nix index 7e4aae4f..b0b8f76d 100644 --- a/nix/cumulus.nix +++ b/nix/cumulus.nix @@ -1,7 +1,7 @@ { generic, ... }: let pkg = - { lib, coriolis-vlsisapd, coriolis-hurricane, coriolis-crlcore + { lib, coriolis-hurricane, coriolis-crlcore , coriolis-etesian, coriolis-anabatic, coriolis-katana , coriolis-unicorn, python3Packages }: { @@ -18,7 +18,7 @@ let pkg = ''; propagatedBuildInputs = [ - coriolis-vlsisapd coriolis-hurricane coriolis-crlcore + coriolis-hurricane coriolis-crlcore coriolis-etesian coriolis-anabatic coriolis-katana coriolis-unicorn ]; diff --git a/nix/equinox.nix b/nix/equinox.nix index f7946a18..b6fe65a0 100644 --- a/nix/equinox.nix +++ b/nix/equinox.nix @@ -1,7 +1,7 @@ { version, meta, ... }: { lib, stdenv, cmake, ninja, python3, boost -, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane +, coriolis-bootstrap, coriolis-hurricane , coriolis-crlcore, qt4 }: let boostWithPython = boost.override { enablePython = true; python = python3; }; in @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ python3 boostWithPython coriolis-bootstrap - coriolis-vlsisapd coriolis-hurricane coriolis-crlcore + coriolis-hurricane coriolis-crlcore qt4 ]; nativeBuildInputs = [ cmake ninja ]; diff --git a/nix/etesian.nix b/nix/etesian.nix index 1e7c12b7..5fc272e7 100644 --- a/nix/etesian.nix +++ b/nix/etesian.nix @@ -1,12 +1,12 @@ { generic, ... }: let pkg = - { doxygen, qt4, coriolis-coloquinte, coriolis-vlsisapd, coriolis-hurricane + { doxygen, qt4, coriolis-coloquinte, coriolis-hurricane , lib, coriolis-crlcore }: { name = "etesian"; src = ../etesian; buildInputs = [ - qt4 coriolis-coloquinte coriolis-vlsisapd + qt4 coriolis-coloquinte coriolis-hurricane coriolis-crlcore ]; propagatedBuildInputs = [ diff --git a/nix/flute.nix b/nix/flute.nix index 604cc3fc..aadb26f5 100644 --- a/nix/flute.nix +++ b/nix/flute.nix @@ -1,10 +1,10 @@ { generic, ... }: let pkg = - { lib, coriolis-vlsisapd, coriolis-hurricane, coriolis-crlcore }: + { lib, coriolis-hurricane, coriolis-crlcore }: { name = "flute"; src = ../flute; - buildInputs = [ coriolis-vlsisapd coriolis-hurricane coriolis-crlcore ]; + buildInputs = [ coriolis-hurricane coriolis-crlcore ]; nativeBuildInputs = [ ]; pythonImportsCheck = [ "Flute" ]; meta.license = lib.licenses.gpl2Plus; diff --git a/nix/hurricane.nix b/nix/hurricane.nix index 9ce5ab67..6626d244 100644 --- a/nix/hurricane.nix +++ b/nix/hurricane.nix @@ -1,13 +1,13 @@ { version, meta, generic, ... }: let pkg = - { lib, libxml2, bzip2, rapidjson, qt4, bison, flex, doxygen, coriolis-vlsisapd }: + { lib, libxml2, bzip2, rapidjson, qt4, bison, flex, doxygen }: { name = "hurricane"; src = ../hurricane; - buildInputs = [ libxml2 qt4 bzip2 rapidjson coriolis-vlsisapd ]; + buildInputs = [ libxml2 qt4 bzip2 rapidjson ]; nativeBuildInputs = [ bison flex doxygen ]; - pythonImportsCheck = [ "Viewer" "Hurricane" "Cfg2" "Analog" ]; + pythonImportsCheck = [ "Viewer" "Hurricane" "Cfg" "Analog" ]; meta.license = lib.licenses.lgpl3Plus; }; in generic pkg diff --git a/nix/ispd.nix b/nix/ispd.nix index 11bc92f8..c5a8aea4 100644 --- a/nix/ispd.nix +++ b/nix/ispd.nix @@ -1,7 +1,7 @@ { version, meta }: { lib, stdenv, cmake, ninja, python3, boost -, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane +, coriolis-bootstrap, coriolis-hurricane , coriolis-crlcore, coriolis-flute, coriolis-knik , coriolis-lefdef, coriolis-katabatic, libxml2, qt4 }: @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ python3 boostWithPython coriolis-bootstrap libxml2 - coriolis-vlsisapd coriolis-hurricane coriolis-crlcore + coriolis-hurricane coriolis-crlcore coriolis-flute coriolis-knik coriolis-lefdef coriolis-katabatic qt4 ]; diff --git a/nix/karakaze.nix b/nix/karakaze.nix index cdc24186..601c9fb4 100644 --- a/nix/karakaze.nix +++ b/nix/karakaze.nix @@ -2,13 +2,13 @@ let pkg = { lib, coriolis-crlcore, coriolis-bora, coriolis-katana, coriolis-anabatic - , coriolis-vlsisapd, coriolis-hurricane }: + , coriolis-hurricane }: { name = "coriolis-karakaze"; src = ../karakaze; propagatedBuildInputs = [ - coriolis-vlsisapd coriolis-crlcore coriolis-hurricane coriolis-katana + coriolis-crlcore coriolis-hurricane coriolis-katana coriolis-bora coriolis-anabatic ]; postInstall = '' diff --git a/nix/katabatic.nix b/nix/katabatic.nix index 0da14e5e..de17085c 100644 --- a/nix/katabatic.nix +++ b/nix/katabatic.nix @@ -1,7 +1,7 @@ { generic, ... }: let pkg = - { lib, coriolis-vlsisapd, coriolis-hurricane + { lib, coriolis-hurricane , coriolis-crlcore, coriolis-flute, coriolis-knik , qt4, doxygen }: { @@ -9,7 +9,7 @@ let pkg = src = ../katabatic; buildInputs = [ - coriolis-vlsisapd coriolis-hurricane coriolis-crlcore + coriolis-hurricane coriolis-crlcore coriolis-flute coriolis-knik qt4 ]; nativeBuildInputs = [ doxygen ]; diff --git a/nix/katana.nix b/nix/katana.nix index 3f2bc638..d770c203 100644 --- a/nix/katana.nix +++ b/nix/katana.nix @@ -1,6 +1,6 @@ { generic, ... }: let pkg = - { doxygen, qt4, lib, coriolis-coloquinte, coriolis-vlsisapd + { doxygen, qt4, lib, coriolis-coloquinte , coriolis-hurricane, coriolis-crlcore, libxml2 , coriolis-flute, coriolis-etesian, coriolis-lefdef , coriolis-anabatic }: @@ -8,7 +8,7 @@ let pkg = name = "katana"; src = ../katana; buildInputs = [ - qt4 coriolis-coloquinte coriolis-vlsisapd + qt4 coriolis-coloquinte coriolis-hurricane coriolis-crlcore coriolis-flute coriolis-etesian libxml2 coriolis-lefdef coriolis-anabatic diff --git a/nix/kite.nix b/nix/kite.nix index a06191ed..7a5b1122 100644 --- a/nix/kite.nix +++ b/nix/kite.nix @@ -2,13 +2,13 @@ let pkg = { lib, coriolis-lefdef, coriolis-knik, coriolis-katabatic - , coriolis-vlsisapd, coriolis-hurricane + , coriolis-hurricane , coriolis-crlcore, qt4, coriolis-flute, libxml2, doxygen }: { name = "kite"; src = ../kite; buildInputs = [ - coriolis-vlsisapd coriolis-hurricane coriolis-crlcore + coriolis-hurricane coriolis-crlcore coriolis-katabatic qt4 coriolis-flute coriolis-knik libxml2 coriolis-lefdef ]; diff --git a/nix/knik.nix b/nix/knik.nix index 8bc35b29..f0c2abf4 100644 --- a/nix/knik.nix +++ b/nix/knik.nix @@ -1,7 +1,7 @@ { version, meta }: { lib, stdenv, cmake, ninja, python3, boost -, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane +, coriolis-bootstrap, coriolis-hurricane , coriolis-crlcore, coriolis-flute, qt4 }: let boostWithPython = boost.override { enablePython = true; python = python3; }; in @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ python3 boostWithPython coriolis-bootstrap - coriolis-vlsisapd coriolis-hurricane coriolis-crlcore + coriolis-hurricane coriolis-crlcore coriolis-flute qt4 ]; nativeBuildInputs = [ cmake ninja ]; diff --git a/nix/mauka.nix b/nix/mauka.nix index 0c30a542..e1af01b3 100644 --- a/nix/mauka.nix +++ b/nix/mauka.nix @@ -1,7 +1,7 @@ { version, meta }: { lib, stdenv, cmake, ninja, python3, qt4, coriolis-crlcore -, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane +, coriolis-bootstrap, coriolis-hurricane , coriolis-nimbus, coriolis-metis, doxygen, boost }: let boostWithPython = boost.override { enablePython = true; python = python3; }; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = ../mauka; buildInputs = [ - python3 coriolis-bootstrap coriolis-vlsisapd coriolis-nimbus + python3 coriolis-bootstrap coriolis-nimbus coriolis-crlcore coriolis-hurricane qt4 boostWithPython coriolis-metis ]; diff --git a/nix/metis.nix b/nix/metis.nix index 5a7c1f15..3e2dedf7 100644 --- a/nix/metis.nix +++ b/nix/metis.nix @@ -1,7 +1,7 @@ { version, meta }: { lib, stdenv, cmake, ninja, python3, qt4, coriolis-crlcore -, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane +, coriolis-bootstrap, coriolis-hurricane , coriolis-nimbus, doxygen, boost }: let boostWithPython = boost.override { enablePython = true; python = python3; }; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = ../metis; buildInputs = [ - python3 coriolis-bootstrap coriolis-vlsisapd coriolis-nimbus + python3 coriolis-bootstrap coriolis-nimbus coriolis-crlcore coriolis-hurricane qt4 boostWithPython ]; nativeBuildInputs = [ cmake ninja doxygen ]; diff --git a/nix/nimbus.nix b/nix/nimbus.nix index 03d6c71c..a2ab4abb 100644 --- a/nix/nimbus.nix +++ b/nix/nimbus.nix @@ -1,7 +1,7 @@ { version, meta }: { lib, stdenv, cmake, ninja, python3, qt4, coriolis-crlcore -, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane +, coriolis-bootstrap, coriolis-hurricane , doxygen, boost }: let boostWithPython = boost.override { enablePython = true; python = python3; }; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = ../nimbus; buildInputs = [ - python3 coriolis-bootstrap coriolis-vlsisapd + python3 coriolis-bootstrap coriolis-crlcore coriolis-hurricane qt4 boostWithPython ]; nativeBuildInputs = [ cmake ninja doxygen ]; diff --git a/nix/oroshi.nix b/nix/oroshi.nix index 2766b0ab..35a2713e 100644 --- a/nix/oroshi.nix +++ b/nix/oroshi.nix @@ -2,13 +2,13 @@ let pkg = { qt4, coriolis-crlcore, doxygen, lib, python3Packages - , coriolis-vlsisapd, coriolis-hurricane }: + , coriolis-hurricane }: { name = "oroshi"; src = ../oroshi; propagatedBuildInputs = [ - coriolis-vlsisapd qt4 python3Packages.pyqt4 + qt4 python3Packages.pyqt4 coriolis-crlcore coriolis-hurricane qt4 python3Packages.numpy ]; diff --git a/nix/solstice.nix b/nix/solstice.nix index 77d11c03..d5c28b31 100644 --- a/nix/solstice.nix +++ b/nix/solstice.nix @@ -1,7 +1,7 @@ { version, meta }: { lib, stdenv, cmake, ninja, python3, qt4, coriolis-crlcore -, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane +, coriolis-bootstrap, coriolis-hurricane , coriolis-equinox, boost }: let boostWithPython = boost.override { enablePython = true; python = python3; }; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = ../solstice; buildInputs = [ - python3 coriolis-bootstrap coriolis-vlsisapd + python3 coriolis-bootstrap coriolis-crlcore coriolis-hurricane qt4 boostWithPython coriolis-equinox ]; diff --git a/nix/stratus1.nix b/nix/stratus1.nix index 21916a70..7cee0ea4 100644 --- a/nix/stratus1.nix +++ b/nix/stratus1.nix @@ -1,14 +1,14 @@ { generic, ... }: let pkg = - { lib, coriolis-crlcore, coriolis-vlsisapd, coriolis-hurricane + { lib, coriolis-crlcore, coriolis-hurricane , python3Packages, coriolis-cumulus }: { name = "coriolis-stratus1"; src = ../stratus1; propagatedBuildInputs = [ - coriolis-vlsisapd coriolis-crlcore coriolis-hurricane coriolis-cumulus + coriolis-crlcore coriolis-hurricane coriolis-cumulus ]; postInstall = '' ln -s -t $out/${python3Packages.python.sitePackages} \ diff --git a/nix/tutorial.nix b/nix/tutorial.nix index 265d879f..961153f0 100644 --- a/nix/tutorial.nix +++ b/nix/tutorial.nix @@ -1,7 +1,7 @@ { generic, ... }: let pkg = - { lib, coriolis-vlsisapd, coriolis-hurricane + { lib, coriolis-hurricane , coriolis-crlcore, qt4, coriolis-lefdef, libxml2 , doxygen }: { @@ -9,7 +9,7 @@ let pkg = src = ../tutorial; buildInputs = [ - coriolis-vlsisapd coriolis-hurricane coriolis-crlcore + coriolis-hurricane coriolis-crlcore coriolis-lefdef libxml2 qt4 ]; nativeBuildInputs = [ doxygen ]; diff --git a/nix/unicorn.nix b/nix/unicorn.nix index 39358c62..384cdf5c 100644 --- a/nix/unicorn.nix +++ b/nix/unicorn.nix @@ -1,7 +1,7 @@ { generic, ... }: let pkg = - { lib, coriolis-vlsisapd, coriolis-hurricane, coriolis-tutorial + { lib, coriolis-hurricane, coriolis-tutorial , coriolis-crlcore, qt4, coriolis-katana, coriolis-bora , coriolis-flute, coriolis-anabatic, coriolis-coloquinte , coriolis-lefdef, coriolis-knik, coriolis-kite @@ -12,7 +12,7 @@ let pkg = src = ../unicorn; propagatedBuildInputs = [ - coriolis-vlsisapd coriolis-hurricane coriolis-crlcore + coriolis-hurricane coriolis-crlcore coriolis-katana qt4 coriolis-flute coriolis-anabatic coriolis-lefdef libxml2 coriolis-knik coriolis-kite coriolis-katabatic coriolis-etesian coriolis-equinox diff --git a/nix/unittests.nix b/nix/unittests.nix index 5a04b171..2c25150c 100644 --- a/nix/unittests.nix +++ b/nix/unittests.nix @@ -1,7 +1,7 @@ { version, meta }: { lib, stdenv, cmake, ninja, python3, boost -, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane +, coriolis-bootstrap, coriolis-hurricane , coriolis-crlcore, coriolis-lefdef, qt4 }: let boostWithPython = boost.override { enablePython = true; python = python3; }; in @@ -13,7 +13,7 @@ stdenv.mkDerivation { buildInputs = [ python3 boostWithPython coriolis-bootstrap qt4 - coriolis-vlsisapd coriolis-hurricane coriolis-crlcore + coriolis-hurricane coriolis-crlcore coriolis-lefdef ]; nativeBuildInputs = [ cmake ninja ];