mirror of
https://github.com/nix-community/flakelight.git
synced 2025-06-20 17:47:45 +02:00
Add nixpkgsConfig to allow configuring nixpkgs
This commit is contained in:
parent
d871fd7cbf
commit
af3e7f7a6f
@ -98,6 +98,7 @@ let
|
|||||||
"inputs"
|
"inputs"
|
||||||
"withOverlay"
|
"withOverlay"
|
||||||
"withOverlays"
|
"withOverlays"
|
||||||
|
"nixpkgsConfig"
|
||||||
"package"
|
"package"
|
||||||
"packages"
|
"packages"
|
||||||
"devTools"
|
"devTools"
|
||||||
@ -138,6 +139,7 @@ let
|
|||||||
"homeConfigurations" = [ "home" ];
|
"homeConfigurations" = [ "home" ];
|
||||||
# Lets `nix-shell` shell.nix be used automatically if no ./nix dir.
|
# Lets `nix-shell` shell.nix be used automatically if no ./nix dir.
|
||||||
"devShell" = [ "shell" ];
|
"devShell" = [ "shell" ];
|
||||||
|
"nixpkgsConfig" = [ "nixpkgs/config" ];
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Generate an attrset by importing attrs from dir. Filters null values.
|
/* Generate an attrset by importing attrs from dir. Filters null values.
|
||||||
@ -177,6 +179,7 @@ let
|
|||||||
mergeModules = a: b: mapAttrs (n: v: v a.${n} b.${n}) {
|
mergeModules = a: b: mapAttrs (n: v: v a.${n} b.${n}) {
|
||||||
inputs = mergeAttrs;
|
inputs = mergeAttrs;
|
||||||
withOverlays = concat;
|
withOverlays = concat;
|
||||||
|
nixpkgsConfig = mergeAttrs;
|
||||||
packages = mergeAttrs;
|
packages = mergeAttrs;
|
||||||
devTools = fnConcat;
|
devTools = fnConcat;
|
||||||
shellHook = fnConcatScripts;
|
shellHook = fnConcatScripts;
|
||||||
@ -304,6 +307,7 @@ let
|
|||||||
moduleAttrDefaults = {
|
moduleAttrDefaults = {
|
||||||
inputs = { };
|
inputs = { };
|
||||||
withOverlays = [ ];
|
withOverlays = [ ];
|
||||||
|
nixpkgsConfig = { };
|
||||||
packages = { };
|
packages = { };
|
||||||
devTools = _: [ ];
|
devTools = _: [ ];
|
||||||
shellHook = _: "";
|
shellHook = _: "";
|
||||||
@ -327,6 +331,7 @@ let
|
|||||||
module' // {
|
module' // {
|
||||||
withOverlays = (applyNonSysArgs module'.withOverlays)
|
withOverlays = (applyNonSysArgs module'.withOverlays)
|
||||||
++ optional (module' ? withOverlay) module'.withOverlay;
|
++ optional (module' ? withOverlay) module'.withOverlay;
|
||||||
|
nixpkgsConfig = applyNonSysArgs module'.nixpkgsConfig;
|
||||||
packages = (applyNonSysArgs module'.packages)
|
packages = (applyNonSysArgs module'.packages)
|
||||||
// optionalAttrs (module' ? package) {
|
// optionalAttrs (module' ? package) {
|
||||||
default = module'.package;
|
default = module'.package;
|
||||||
@ -395,6 +400,7 @@ let
|
|||||||
# Returns package set for a system.
|
# Returns package set for a system.
|
||||||
pkgsFor = system: import merged.inputs.nixpkgs {
|
pkgsFor = system: import merged.inputs.nixpkgs {
|
||||||
inherit system;
|
inherit system;
|
||||||
|
config = merged.nixpkgsConfig;
|
||||||
overlays = merged.withOverlays ++ [
|
overlays = merged.withOverlays ++ [
|
||||||
(final: _: callPkgs final merged.packages)
|
(final: _: callPkgs final merged.packages)
|
||||||
];
|
];
|
||||||
|
Loading…
x
Reference in New Issue
Block a user