holm/flakelight
1
1
Fork 0
forked from extern/flakelight
Code Pull Requests Activity

Allow apps to be scripts

Browse Source 
This enables setting the app to arbitrary bash scripts which will be
written to a store path and used for the app's program attr.
This commit is contained in:
Archit Gupta 2024-02-21 18:43:05 -08:00
parent 41ec64361f
commit e72626b0a9
2 changed files with 57 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
builtinModules/apps.nix
View File

@ -4,31 +4,58 @@
{ config, lib, flakelight, genSystems, ... }:
let
inherit (lib) isStringLike mapAttrs mkIf mkMerge mkOption mkOptionType;
inherit (lib.types) coercedTo lazyAttrsOf pathInStore;
inherit (lib.options) mergeEqualOption;
inherit (flakelight.types) nullable optFunctionTo;
inherit (builtins) match storeDir;
inherit (lib) defaultFunctor fix isFunction last mapAttrs mergeDefinitions
mkIf mkMerge mkOption mkOptionType;
inherit (lib.types) coercedTo enum lazyAttrsOf
optionDescriptionPhrase pathInStore submodule;
inherit (flakelight.types) nullable optFunctionTo stringLike;
app = mkOptionType {
name = "app";
description = "flake app";
descriptionClass = "noun";
check = x: (x ? type) && (x.type == "app") &&
(x ? program) && (pathInStore.check x.program);
merge = mergeEqualOption;
isStorePath = s: match "${storeDir}/[^.][^ \n]*" s != null;
app = submodule {
options = {
type = mkOption { type = enum [ "app" ]; default = "app"; };
program = mkOption { type = pathInStore // { check = isStorePath; }; };
};
};
stringLike = mkOptionType {
name = "stringLike";
description = "string-convertible value";
descriptionClass = "noun";
check = isStringLike;
merge = mergeEqualOption;
mkApp = name: pkgs: s:
let s' = "${s}"; in {
program =
if isStorePath s' then s'
else "${pkgs.writeShellScript "app-${name}" s'}";
};
mkApp = app: { type = "app"; program = "${app}"; };
parameterize = value: fn: fix fn value;
appType = optFunctionTo (coercedTo stringLike mkApp app);
appType = parameterize app (self': app: (mkOptionType rec {
name = "appType";
description =
let
targetDesc = optionDescriptionPhrase
(class: class == "noun" || class == "composite")
(coercedTo stringLike (abort "") app);
in
"${targetDesc} or function that evaluates to it";
descriptionClass = "composite";
check = x: isFunction x || app.check x || stringLike.check x;
merge = loc: defs: pkgs:
let
targetType = coercedTo stringLike (mkApp (last loc) pkgs) app;
in
(mergeDefinitions loc targetType (map
(fn: {
inherit (fn) file;
value = if isFunction fn.value then fn.value pkgs else fn.value;
})
defs)).mergedValue;
inherit (app) getSubOptions getSubModules;
substSubModules = m: self' (app.substSubModules m);
functor = (defaultFunctor name) // { wrapped = app; };
nestedTypes.coercedType = stringLike;
nestedTypes.finalType = app;
}));
in
{
options = {

12
default.nix
View File

@ -7,8 +7,8 @@ let
inherit (inputs) nixpkgs;
inherit (builtins) isAttrs isPath readDir;
inherit (nixpkgs.lib) all attrNames composeManyExtensions evalModules filter
findFirst fix genAttrs getValues hasSuffix isFunction isList mapAttrs
mapAttrsToList mkDefault mkOptionType pathExists pipe removePrefix
findFirst fix genAttrs getValues hasSuffix isFunction isList isStringLike
mapAttrs mapAttrsToList mkDefault mkOptionType pathExists pipe removePrefix
removeSuffix singleton warn;
inherit (nixpkgs.lib.types) coercedTo defaultFunctor functionTo listOf
optionDescriptionPhrase;
@ -74,6 +74,14 @@ let
merge = mergeOneOption;
};
stringLike = mkOptionType {
name = "stringLike";
description = "string-convertible value";
descriptionClass = "noun";
check = isStringLike;
merge = mergeEqualOption;
};
module = mkOptionType {
name = "module";
description = "module";