refactor: generalized dir overlay
This commit is contained in:
parent
de5be1b9d2
commit
dd29a6ea34
2 changed files with 8 additions and 16 deletions
13
overlay.nix
13
overlay.nix
|
@ -4,14 +4,17 @@ let
|
||||||
mapAttrs'
|
mapAttrs'
|
||||||
removeSuffix
|
removeSuffix
|
||||||
;
|
;
|
||||||
in
|
mkGeneralOverlay =
|
||||||
mapAttrs' (name: _: {
|
dir: self: super:
|
||||||
value = final.callPackage ./pkgs/${name} { };
|
mapAttrs' (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) ];
|
||||||
}
|
}
|
||||||
|
|
|
@ -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)
|
|
Loading…
Reference in a new issue