refactor: generalized dir overlay

This commit is contained in:
catvayor 2025-01-22 18:18:06 +01:00
parent de5be1b9d2
commit dd29a6ea34
Signed by: lbailly
GPG key ID: CE3E645251AC63F3
2 changed files with 8 additions and 16 deletions

View file

@ -4,14 +4,17 @@ let
mapAttrs' mapAttrs'
removeSuffix removeSuffix
; ;
in mkGeneralOverlay =
dir: self: super:
mapAttrs' (name: _: { mapAttrs' (name: _: {
value = final.callPackage ./pkgs/${name} { }; value = self.callPackage (dir + "/${name}") { };
name = removeSuffix ".nix" name; name = removeSuffix ".nix" name;
}) (builtins.readDir ./pkgs) }) (builtins.readDir dir);
in
mkGeneralOverlay ./pkgs final prev
// { // {
formats = prev.formats // { formats = prev.formats // {
xml = import ./xml.nix { pkgs = final; }; xml = import ./xml.nix { pkgs = final; };
}; };
pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ (import ./python_overlay.nix) ]; pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [ (mkGeneralOverlay ./python-pkgs) ];
} }

View file

@ -1,11 +0,0 @@
final: prev:
let
inherit (prev.lib)
mapAttrs'
removeSuffix
;
in
mapAttrs' (name: _: {
value = final.callPackage ./python-pkgs/${name} { };
name = removeSuffix ".nix" name;
}) (builtins.readDir ./python-pkgs)