Skip to content

feat(core): Add preProcess option to allow customizing inputs before giving to generator backend. #90

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vic merged 3 commits into from
Mar 16, 2026
Merged

feat(core): Add preProcess option to allow customizing inputs before giving to generator backend. #90

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42a4e0a
use nothing-but-nix@v10
vic Mar 15, 2026
d10b139
feat(core): Add flake-file.preProcess option
vic Mar 16, 2026
663d2cd
Merge branch 'main' into push-qllzvktrrwlv
vic Mar 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions modules/nixlock/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ let
inherit (config) flake-file;
inherit (import ../lib.nix lib) inputsExpr;

inputs = flake-file.nixlock.preProcess (inputsExpr flake-file.inputs);
inputs = flake-file.preProcess (inputsExpr flake-file.inputs);

nixlock-source = fetchTarball {
url = flake-file.nixlock.url;
Expand Down Expand Up @@ -166,10 +166,5 @@ in
description = "nixlock custom input types";
default = { };
};
preProcess = lib.mkOption {
type = lib.types.functionTo lib.types.raw;
description = "Pre-process flake-file inputs before giving to nixlock";
default = lib.id;
};
};
}
2 changes: 1 addition & 1 deletion modules/npins/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ let
inherit (config) flake-file;
inherit (import ../lib.nix lib) inputsExpr;

inputs = inputsExpr flake-file.inputs;
inputs = flake-file.preProcess (inputsExpr flake-file.inputs);

# Synthesise a canonical URL from attrset-form inputs (no url field).
gitHostScheme = { github = "github"; gitlab = "gitlab"; sourcehut = "sourcehut"; };
Expand Down
2 changes: 1 addition & 1 deletion modules/write-flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ let

flakeInputs = "inputs = ${
nixCode {
expr = inputsExpr flake-file.inputs;
expr = flake-file.preProcess (inputsExpr flake-file.inputs);
styles = [
{
attrSortPriority = sortPriority.inputs;
Expand Down
8 changes: 7 additions & 1 deletion modules/write-inputs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ let
# DO-NOT-EDIT: Generated by github:vic/flake-file.
# To re-generate use: nix-shell . -A flake-file.sh --run write-inputs
''
+ (nixCode { expr = inputsExpr flake-file.inputs; });
+ (nixCode { expr = flake-file.preProcess (inputsExpr flake-file.inputs); });

inputsFile =
pkgs:
Expand Down Expand Up @@ -77,5 +77,11 @@ in
visible = false;
default = shell flake-file.pkgs;
};

preProcess = lib.mkOption {
type = lib.types.functionTo lib.types.raw;
description = "Pre-process flake-file inputs before giving to backend";
default = lib.id;
};
};
}
Loading