overlays

default.nix

@@ -3,8 +3,8 @@
   inputs ? {},
 }: rec {
   default = brewTea;
-  brewTea = import ./pkgs/brewTea.nix { inherit pkgs inputs; };
+  brewTea = import ./pkgs/brewTea.nix { inherit pkgs; };
   mkMarkdollPlugin = import ./pkgs/mkMarkdollPlugin.nix { inherit pkgs; };
 
-  example_quickstart = import ./examples/quickstart { inherit pkgs brewTea mkMarkdollPlugin; };
+  example_quickstart = import ./examples/quickstart { inherit pkgs; };
 }

examples/quickstart/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, brewTea, mkMarkdollPlugin }: brewTea {
+{ pkgs }: pkgs.brewTea {
   name = "examples_quickstart";
   version = "0.0.0";
   
@@ -25,8 +25,8 @@
     } + "/bin/sPoNgEbOb";
   in [
     # all of these add invoke handlers like [invoke(plural)(argv1):stdin]
-    (mkMarkdollPlugin "plural" ./plugins/plural.sh)
-    ((mkMarkdollPlugin "tools" ./plugins/tools.py).override { buildInputs = [ pkgs.python3 ]; })
-    (mkMarkdollPlugin "sPoNgEbOb" sPoNgEbOb)
+    (pkgs.mkMarkdollPlugin "plural" ./plugins/plural.sh)
+    ((pkgs.mkMarkdollPlugin "tools" ./plugins/tools.py).override { buildInputs = [ pkgs.python3 ]; })
+    (pkgs.mkMarkdollPlugin "sPoNgEbOb" sPoNgEbOb)
   ];
 }

flake.nix

@@ -9,8 +9,17 @@
 
   outputs = { self, nixpkgs, flake-utils, ... }@inputs:
     flake-utils.lib.eachDefaultSystem (system: let 
-      pkgs = import nixpkgs { inherit system; };
+      pkgs = import nixpkgs { 
+        inherit system;
+        overlays = [ self.overlays.default ];
+      };
     in {
-      packages = import ./default.nix { inherit pkgs inputs; };
-    });
+      packages = import ./default.nix { inherit pkgs; };
+    }) // {
+      overlays = {
+        default = final: prev: {
+          markdoll = inputs.markdoll.packages.${final.system}.markdoll;
+        } // import ./default.nix { pkgs = final; };
+      };
+    };
 }

pkgs/brewTea.nix

@@ -1,10 +1,9 @@
-{ pkgs, inputs }: 
+{ pkgs }: 
 { 
   name,
   version,
 
-  # TODO: do not require flakes
-  markdollParser ? inputs.markdoll.packages.${pkgs.system}.markdoll.override({
+  markdollParser ? pkgs.markdoll.override({
     danger = true;
   }), 
   markdollPlugins ? [],