1 files changed, 24 insertions, 9 deletions
diff --git a/default.nix b/default.nix
index 8e74c61..4338ecf 100644
--- a/default.nix
+++ b/default.nix
@@ -1,20 +1,35 @@
 let
   lock = builtins.fromJSON (builtins.readFile ./flake.lock);
-  nixpkgs' = fetchTarball {
-    url = lock.nodes.nixpkgs.locked.url or "https://github.com/NixOS/nixpkgs/archive/${lock.nodes.nixpkgs.locked.rev}.tar.gz";
-    sha256 = lock.nodes.nixpkgs.locked.narHash;
-  };
 in
   {
-    nixpkgs ?
-      import nixpkgs' {
+    pkgs ?
+      import nixpkgs {
         config = {};
         overlays = [];
         inherit system;
       },
+    lib ? pkgs.lib,
+    nixpkgs ? (fetchTarball {
+      url = "https://github.com/NixOS/nixpkgs/archive/${lock.nodes.nixpkgs.locked.rev}.tar.gz";
+      sha256 = lock.nodes.nixpkgs.locked.narHash;
+    }),
     system ? builtins.currentSystem,
   }: let
-    # fixed point wizardry
-    pkgs' = import ./overlay.nix (nixpkgs // pkgs') nixpkgs;
+    inherit (pkgs) callPackage;
   in
-    pkgs'
+    lib.fix (final:
+      lib.packagesFromDirectoryRecursive {
+        inherit callPackage;
+        directory = ./pkgs;
+      }
+      // {
+        clang-tidy-sarif = callPackage ./pkgs/clang-tidy-sarif/package.nix {inherit (final) clang-tidy-sarif;};
+        clippy-sarif = callPackage ./pkgs/clippy-sarif/package.nix {inherit (final) clippy-sarif;};
+        hadolint-sarif = callPackage ./pkgs/hadolint-sarif/package.nix {inherit (final) hadolint-sarif;};
+        sarif-fmt = callPackage ./pkgs/sarif-fmt/package.nix {inherit (final) sarif-fmt;};
+
+        flat-manager = callPackage ./pkgs/flat-manager/package.nix {inherit (final) flat-manager;};
+        flat-manager-client = callPackage ./pkgs/flat-manager-client/package.nix {inherit (final) flat-manager;};
+
+        papa = callPackage ./pkgs/papa/package.nix {inherit (final) papa;};
+      })