Update nix-eda, use composable overlays

default.nix

@@ -23,7 +23,6 @@
   magic-vlsi,
   netgen,
   volare,
-  octave,
   xschem,
   ngspice,
 
@@ -69,7 +68,6 @@
         klayout-gdsfactory
         magic-vlsi
         netgen
-        octave
         ngspice
         xschem
       ];

flake.nix

@@ -12,6 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 {
+  description = "open-source framework for automatic circuit characterization";
+
   nixConfig = {
     extra-substituters = [
       "https://openlane.cachix.org"
@@ -37,66 +39,108 @@
     volare,
     devshell,
     ...
-  }: {
+  }: let
+    nixpkgs = nix-eda.inputs.nixpkgs;
+    lib = nixpkgs.lib;
+  in {
     # Common
-    input-overlays = [
-      (import ./nix/overlay.nix)
-      (devshell.overlays.default)
-    ];
-
+    overlays = {
+      default = lib.composeManyExtensions [
+        (import ./nix/overlay.nix)
+        (nix-eda.flakesToOverlay [volare])
+        (
+          pkgs': pkgs: let
+            callPackage = lib.callPackageWith pkgs';
+          in {
+            colab-env = callPackage ./nix/colab-env.nix {};
+          }
+        )
+        (
+          nix-eda.composePythonOverlay (pkgs': pkgs: pypkgs': pypkgs: let
+            callPythonPackage = lib.callPackageWith (pkgs' // pkgs'.python3.pkgs);
+          in {
+            cace = callPythonPackage ./default.nix {};
+          })
+        )
+        (pkgs': pkgs: let
+          callPackage = lib.callPackageWith pkgs';
+        in
+          {}
+          // lib.optionalAttrs pkgs.stdenv.isLinux {
+            cace-docker = callPackage ./nix/docker.nix {
+              createDockerImage = nix-eda.createDockerImage;
+              cace = pkgs'.python3.pkgs.cace;
+            };
+          })
+      ];
+    };
+
     # Helper functions
     createCaceShell = import ./nix/create-shell.nix;
 
-    # Outputs
-    packages = 
-      nix-eda.forAllSystems {
-        current = self;
-        withInputs = [nix-eda volare];
-      } (
-        util: let
-          self = with util;
-            {
-              colab-env = callPackage ./nix/colab-env.nix {};
-              cace = callPythonPackage ./default.nix {};
-              default = self.cace;
-            }
-            // (pkgs.lib.optionalAttrs (pkgs.stdenv.isLinux) {cace-docker = callPackage ./nix/docker.nix {createDockerImage = nix-eda.createDockerImage;};});
-        in
-          self
-      );
+    # Packages
+    legacyPackages = nix-eda.forAllSystems (
+      system:
+        import nix-eda.inputs.nixpkgs {
+          inherit system;
+          overlays = [devshell.overlays.default nix-eda.overlays.default self.overlays.default];
+        }
+    );
 
-    devShells = nix-eda.forAllSystems {withInputs = [self devshell nix-eda volare];} (
-      util:
-        with util; rec {
-          default =
-            callPackage (self.createCaceShell {
-              }) {};
-          notebook = callPackage (self.createCaceShell {
-            extra-packages = with pkgs; [
-              jupyter
-            ];
-          }) {};
-          dev = callPackage (self.createCaceShell {
-            extra-packages = with pkgs; [
-            ];
-            extra-python-packages = with pkgs.python3.pkgs; [
-              setuptools
-              build
-              twine
-              black # blue
-            ];
-          }) {};
-          docs = callPackage (self.createCaceShell {
-            extra-packages = with pkgs; [
-            ];
-            extra-python-packages = with pkgs.python3.pkgs; [
-              sphinx
-              myst-parser
-              furo
-              sphinx-autobuild
-            ];
-          }) {};
+    packages = nix-eda.forAllSystems (
+      system: let
+        pkgs = (self.legacyPackages."${system}");
+        in {
+          inherit (pkgs) colab-env;
+          inherit (pkgs.python3.pkgs) cace;
+          default = pkgs.python3.pkgs.cace;
+        }
+        // lib.optionalAttrs pkgs.stdenv.isLinux {
+          inherit (pkgs) cace-docker;
         }
     );
+
+    # devshells
+
+    devShells = nix-eda.forAllSystems (
+      system: let
+        pkgs = self.legacyPackages."${system}";
+        callPackage = lib.callPackageWith pkgs;
+      in {
+        # These devShells are rather unorthodox for Nix devShells in that they
+        # include the package itself. For a proper devShell, try .#dev.
+        default =
+          callPackage (self.createCaceShell {
+            }) {};
+        notebook = callPackage (self.createCaceShell {
+          extra-packages = with pkgs; [
+            jupyter
+          ];
+        }) {};
+        # Normal devShells
+        dev = callPackage (self.createCaceShell {
+          extra-packages = with pkgs; [
+          ];
+          extra-python-packages = with pkgs.python3.pkgs; [
+            setuptools
+            build
+            twine
+            black # blue
+          ];
+          include-cace = false;
+        }) {};
+        docs = callPackage (self.createCaceShell {
+          extra-packages = with pkgs; [
+          ];
+          extra-python-packages = with pkgs.python3.pkgs; [
+            sphinx
+            myst-parser
+            furo
+            sphinx-autobuild
+          ];
+          include-cace = false;
+        }) {};
+      }
+    );
   };
 }

nix/colab-env.nix

@@ -13,11 +13,10 @@
 # limitations under the License.
 {
   system,
-  cace,
   python3,
   symlinkJoin,
 }:
 symlinkJoin {
   name = "cace-colab-env";
-  paths = cace.includedTools;
+  paths = python3.pkgs.cace.includedTools;
 }

nix/create-shell.nix

@@ -13,10 +13,10 @@
 # limitations under the License.
 {
   extra-packages ? [],
-  extra-python-packages ? []
+  extra-python-packages ? [],
+  include-cace ? true
 }: ({
   lib,
-  cace,
   git,
   zsh,
   delta,
@@ -27,12 +27,10 @@
   python3,
   devshell,
 }: let
+  cace = python3.pkgs.cace;
   cace-env = (
     python3.withPackages (pp:
-      with pp;
-        [
-          cace
-        ]
+        (if include-cace then [cace] else cace.propagatedBuildInputs)
         ++ extra-python-packages)
   );
   cace-env-sitepackages = "${cace-env}/${cace-env.sitePackages}";