diff --git a/flake.nix b/flake.nix
index 8ee11f97..ad3aaed2 100644
--- a/flake.nix
+++ b/flake.nix
@@ -38,12 +38,12 @@
       # not generic: solstice lefdef equinox knik coloquinte bootstrap
 
       pythonComponents = [
-        "vlsisapd" "hurricane" "crlcore" "flute"
+        "vlsisapd" "hurricane" "crlcore" "flute" "etesian"
+        "anabatic"
       ];
 
       components = pythonComponents ++ [
-        "lefdef" "bootstrap"
-        "cumulus" "etesian" "anabatic" "coloquinte"
+        "lefdef" "bootstrap" "cumulus" "coloquinte"
         "katana" "bora" "equinox" "knik" "katabatic" "ispd"
         "karakaze" "kite" "nimbus" "metis" "mauka" "oroshi"
         "solstice" "stratus1" "tutorial" "unicorn" "documentation"
diff --git a/nix/anabatic.nix b/nix/anabatic.nix
index 690fbbb1..02764024 100644
--- a/nix/anabatic.nix
+++ b/nix/anabatic.nix
@@ -1,23 +1,17 @@
-{ version, meta }:
-
-{ lib, stdenv, cmake, ninja, python2, boost
-, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane
-, coriolis-crlcore, coriolis-etesian, qt4
-, coriolis-flute, doxygen }:
-
-let boostWithPython = boost.override { enablePython = true; python = python2; }; in
-
-stdenv.mkDerivation {
-  pname = "coriolis-anabatic";
-
-  src = ../anabatic;
-
-  buildInputs = [
-    python2 boostWithPython coriolis-bootstrap
-    coriolis-vlsisapd coriolis-hurricane coriolis-crlcore
-    coriolis-etesian qt4 coriolis-flute
-  ];
-  nativeBuildInputs = [ cmake ninja doxygen ];
-
-  inherit version meta;
-}
+{ generic, ... }:
+let pkg =
+  { doxygen, qt4, coriolis-coloquinte, coriolis-vlsisapd
+  , coriolis-hurricane, coriolis-crlcore
+  , coriolis-flute, coriolis-etesian }:
+  {
+    name = "anabatic";
+    src = ../anabatic;
+    buildInputs = [
+      qt4 coriolis-coloquinte coriolis-vlsisapd
+      coriolis-hurricane coriolis-crlcore
+      coriolis-flute coriolis-etesian
+    ];
+    nativeBuildInputs = [ doxygen ];
+    pythonImportsCheck = [ "Anabatic" ];
+  };
+in generic pkg
diff --git a/nix/etesian.nix b/nix/etesian.nix
index d255ce99..010c99da 100644
--- a/nix/etesian.nix
+++ b/nix/etesian.nix
@@ -1,22 +1,14 @@
-{ version, meta }:
-
-{ lib, stdenv, cmake, ninja, python2, boost
-, coriolis-bootstrap, coriolis-vlsisapd, coriolis-hurricane
-, coriolis-crlcore, coriolis-coloquinte, qt4, doxygen }:
-
-let boostWithPython = boost.override { enablePython = true; python = python2; }; in
-
-stdenv.mkDerivation {
-  pname = "coriolis-etesian";
-
-  src = ../etesian;
-
-  buildInputs = [
-    qt4 python2 boostWithPython coriolis-bootstrap coriolis-vlsisapd
-    coriolis-hurricane coriolis-coloquinte coriolis-crlcore
-  ];
-  propagatedBuildInputs = [ coriolis-coloquinte ];
-  nativeBuildInputs = [ cmake ninja doxygen ];
-
-  inherit version meta;
-}
+{ generic, ... }:
+let pkg =
+  { doxygen, qt4, coriolis-coloquinte, coriolis-vlsisapd, coriolis-hurricane, coriolis-crlcore }:
+  {
+    name = "etesian";
+    src = ../etesian;
+    buildInputs = [
+      qt4 coriolis-coloquinte coriolis-vlsisapd
+      coriolis-hurricane coriolis-crlcore
+    ];
+    nativeBuildInputs = [ doxygen ];
+    pythonImportsCheck = [ "Etesian" ];
+  };
+in generic pkg