flake.nix: Common naming scheme for overlays and no default overlays anymore
This commit is contained in:
@@ -135,11 +135,10 @@
|
|||||||
};
|
};
|
||||||
|
|
||||||
overlays = {
|
overlays = {
|
||||||
nixfilesInputs = import ./flake/inputs-overlay.nix inputs;
|
clerie-inputs = import ./flake/inputs-overlay.nix inputs;
|
||||||
clerie = import ./pkgs/overlay.nix;
|
clerie-pkgs = import ./pkgs/overlay.nix;
|
||||||
clerie-build-support = import ./pkgs/build-support/overlay.nix;
|
clerie-build-support = import ./pkgs/build-support/overlay.nix;
|
||||||
clerie-overrides = import ./pkgs/overrides/overlay.nix;
|
clerie-overrides = import ./pkgs/overrides/overlay.nix;
|
||||||
default = self.overlays.clerie;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
packages = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ] (system:
|
packages = nixpkgs.lib.genAttrs [ "x86_64-linux" "aarch64-linux" ] (system:
|
||||||
@@ -147,7 +146,7 @@
|
|||||||
pkgs = localNixpkgs.${system};
|
pkgs = localNixpkgs.${system};
|
||||||
in
|
in
|
||||||
nixpkgs.lib.genAttrs (
|
nixpkgs.lib.genAttrs (
|
||||||
(builtins.attrNames (self.overlays.clerie null null))
|
(builtins.attrNames (self.overlays.clerie-pkgs null null))
|
||||||
++ (builtins.attrNames (self.overlays.clerie-overrides null null))
|
++ (builtins.attrNames (self.overlays.clerie-overrides null null))
|
||||||
) (name: pkgs."${name}")
|
) (name: pkgs."${name}")
|
||||||
);
|
);
|
||||||
|
@@ -8,8 +8,8 @@ let
|
|||||||
import nixpkgs {
|
import nixpkgs {
|
||||||
inherit system;
|
inherit system;
|
||||||
overlays = [
|
overlays = [
|
||||||
self.overlays.nixfilesInputs
|
self.overlays.clerie-inputs
|
||||||
self.overlays.clerie
|
self.overlays.clerie-pkgs
|
||||||
(final: prev: {
|
(final: prev: {
|
||||||
clerie-build-support = self.overlays.clerie-build-support final prev;
|
clerie-build-support = self.overlays.clerie-build-support final prev;
|
||||||
})
|
})
|
||||||
|
Reference in New Issue
Block a user