mirror of
https://github.com/nix-community/flakelight.git
synced 2024-09-11 08:55:39 +03:00
Clean up devShell options
Using a submodule for devShell removes the need to make every option nullable and the need to check all of them. By using nullOr submodule, we can tell if the value has been set and have default values for options. This also enables enabling a devShell with no options set.
This commit is contained in:
parent
a4e4a341f2
commit
dccabae216
@ -4,42 +4,44 @@
|
||||
|
||||
{ config, lib, flakelight, ... }:
|
||||
let
|
||||
inherit (lib) any attrValues filterAttrs mapAttrs mkDefault mkIf mkMerge
|
||||
mkOption optionalAttrs;
|
||||
inherit (lib.types) lazyAttrsOf functionTo lines listOf nullOr package str;
|
||||
inherit (lib) filterAttrs mapAttrs mkDefault mkIf mkMerge mkOption;
|
||||
inherit (lib.types) functionTo lazyAttrsOf lines listOf nullOr package str
|
||||
submodule;
|
||||
inherit (flakelight) supportedSystem;
|
||||
inherit (flakelight.types) optFunctionTo packageDef;
|
||||
in
|
||||
{
|
||||
options = {
|
||||
devShell = {
|
||||
inputsFrom = mkOption {
|
||||
type = nullOr
|
||||
(functionTo (listOf package));
|
||||
default = null;
|
||||
};
|
||||
devShell = mkOption {
|
||||
default = null;
|
||||
type = nullOr (submodule {
|
||||
options = {
|
||||
inputsFrom = mkOption {
|
||||
type = functionTo (listOf package);
|
||||
default = _: [ ];
|
||||
};
|
||||
|
||||
packages = mkOption {
|
||||
type = nullOr
|
||||
(functionTo (listOf package));
|
||||
default = null;
|
||||
};
|
||||
packages = mkOption {
|
||||
type = functionTo (listOf package);
|
||||
default = _: [ ];
|
||||
};
|
||||
|
||||
shellHook = mkOption {
|
||||
type = nullOr (optFunctionTo lines);
|
||||
default = null;
|
||||
};
|
||||
shellHook = mkOption {
|
||||
type = optFunctionTo lines;
|
||||
default = "";
|
||||
};
|
||||
|
||||
env = mkOption {
|
||||
type = nullOr
|
||||
(optFunctionTo (lazyAttrsOf str));
|
||||
default = null;
|
||||
};
|
||||
env = mkOption {
|
||||
type = optFunctionTo (lazyAttrsOf str);
|
||||
default = { };
|
||||
};
|
||||
|
||||
stdenv = mkOption {
|
||||
type = nullOr (functionTo package);
|
||||
default = null;
|
||||
};
|
||||
stdenv = mkOption {
|
||||
type = functionTo package;
|
||||
default = pkgs: pkgs.stdenv;
|
||||
};
|
||||
};
|
||||
});
|
||||
};
|
||||
|
||||
devShells = mkOption {
|
||||
@ -49,23 +51,14 @@ in
|
||||
};
|
||||
|
||||
config = mkMerge [
|
||||
(mkIf (any (x: x != null) (attrValues config.devShell)) {
|
||||
devShells.default = mkDefault ({ pkgs, mkShell }: mkShell.override
|
||||
(if config.devShell.stdenv == null then { }
|
||||
else { stdenv = config.devShell.stdenv pkgs; })
|
||||
(
|
||||
optionalAttrs (config.devShell.env != null)
|
||||
(config.devShell.env pkgs)
|
||||
// optionalAttrs (config.devShell.inputsFrom != null) {
|
||||
(mkIf (config.devShell != null) {
|
||||
devShells.default = mkDefault ({ pkgs, mkShell }:
|
||||
mkShell.override { stdenv = config.devShell.stdenv pkgs; }
|
||||
((config.devShell.env pkgs) // {
|
||||
inputsFrom = config.devShell.inputsFrom pkgs;
|
||||
}
|
||||
// optionalAttrs (config.devShell.packages != null) {
|
||||
packages = config.devShell.packages pkgs;
|
||||
}
|
||||
// optionalAttrs (config.devShell.shellHook != null) {
|
||||
shellHook = config.devShell.shellHook pkgs;
|
||||
}
|
||||
));
|
||||
}));
|
||||
})
|
||||
|
||||
(mkIf (config.devShells != { }) {
|
||||
|
@ -289,6 +289,13 @@ in
|
||||
})
|
||||
(f: lib.isDerivation f.devShells.x86_64-linux.default);
|
||||
|
||||
devShell-empty = test
|
||||
(flakelight ./empty {
|
||||
disabledModules = [ "builtinFormatters.nix" ];
|
||||
devShell = { };
|
||||
})
|
||||
(f: lib.isDerivation f.devShells.x86_64-linux.default);
|
||||
|
||||
devShell-override = test
|
||||
(flakelight ./empty {
|
||||
devShells.default = { mkShell }: mkShell { };
|
||||
|
Loading…
Reference in New Issue
Block a user