packages: use packagesFromDirectoryRecursive

instead of own by-name implementation Signed-off-by: Paul Meyer <[email protected]>
edgelesssys · Feb 19, 2024 · 0edb15f · 0edb15f
1 parent cd99b67
commit 0edb15f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 23 deletions.
diff --git a/flake.nix b/flake.nix
@@ -21,7 +21,7 @@
     }: flake-utils.lib.eachDefaultSystem (system:
     let
       pkgs = import nixpkgs { inherit system; };
-      lib = pkgs.lib.extend (import ./lib);
+      inherit (pkgs) lib;
       treefmtEval = treefmt-nix.lib.evalModule pkgs ./treefmt.nix;
     in
     {

diff --git a/lib/default.nix b/lib/default.nix
diff --git a/packages/default.nix b/packages/default.nix
@@ -1,10 +1,12 @@
 { lib, pkgs }:
 
-
 let
   pkgs' = pkgs // self;
   callPackages = lib.callPackagesWith pkgs';
-  self = lib.by-name pkgs' ./by-name // {
+  self = (lib.packagesFromDirectoryRecursive {
+    callPackage = lib.callPackageWith pkgs';
+    directory = ./by-name;
+  }) // {
     containers = callPackages ./containers.nix { pkgs = pkgs'; };
     scripts = callPackages ./scripts.nix { pkgs = pkgs'; };
     genpolicy-msft = pkgs.pkgsStatic.callPackage ./by-name/genpolicy-msft/package.nix { };