fix: unbreak some stuff and fix some naming
All checks were successful
Discord / discord commits (push) Has been skipped
All checks were successful
Discord / discord commits (push) Has been skipped
This commit is contained in:
parent
63317618df
commit
bea7a1e274
5 changed files with 6 additions and 9 deletions
|
@ -125,7 +125,7 @@
|
||||||
# For nix-fast-build. I use a custom output to alleviate eval time of this flake. ie. when doing nix flake show
|
# For nix-fast-build. I use a custom output to alleviate eval time of this flake. ie. when doing nix flake show
|
||||||
nixFastChecks = import ./nixFastChecks {inherit perSystem self;};
|
nixFastChecks = import ./nixFastChecks {inherit perSystem self;};
|
||||||
|
|
||||||
homeManagerModules = import ./homeManagerModules self;
|
homeManagerModules = import ./homeManagerModules {inherit self;};
|
||||||
|
|
||||||
nixosModules = import ./modules {inherit self;};
|
nixosModules = import ./modules {inherit self;};
|
||||||
|
|
||||||
|
|
|
@ -3,15 +3,11 @@
|
||||||
self,
|
self,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
inherit (pkgs.lib) getExe mapAttrs' nameValuePair removePrefix;
|
inherit (pkgs.lib) getExe mapAttrs;
|
||||||
|
|
||||||
mkApp = pkg: {
|
mkApp = pkg: {
|
||||||
program = getExe pkg;
|
program = getExe pkg;
|
||||||
type = "app";
|
type = "app";
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
mapAttrs' (
|
mapAttrs (n: v: mkApp v) self.appsPackages.${pkgs.system}
|
||||||
n: v:
|
|
||||||
nameValuePair (removePrefix "app-" n) (mkApp v)
|
|
||||||
)
|
|
||||||
self.appsPackages.${pkgs.system}
|
|
||||||
|
|
|
@ -20,7 +20,7 @@ substituteModule() {
|
||||||
) -t markdown --template "$FLAKE/apps/gen-docs/templates/$1.md" -o "$FLAKE/$1/README.md"
|
) -t markdown --template "$FLAKE/apps/gen-docs/templates/$1.md" -o "$FLAKE/$1/README.md"
|
||||||
}
|
}
|
||||||
|
|
||||||
# TODO: add lib, nixFastChecks, overlays, scopedPackages
|
# TODO: add overlays, scopedPackages
|
||||||
substitute "appsPackages" "apps" "getPackageMeta"
|
substitute "appsPackages" "apps" "getPackageMeta"
|
||||||
substitute "nixosConfigurations" "configurations" "getConfigMeta"
|
substitute "nixosConfigurations" "configurations" "getConfigMeta"
|
||||||
substitute "devShells" "devShells" "getPackageMeta"
|
substitute "devShells" "devShells" "getPackageMeta"
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
buildApp = attrs: (pkgs.callPackage ./buildApp.nix ({} // inputs // attrs));
|
buildApp = attrs: (pkgs.callPackage ./buildApp.nix ({} // inputs // attrs));
|
||||||
callPackage = file: pkgs.callPackage file ({inherit buildApp;} // inputs);
|
callPackage = file: pkgs.callPackage file ({inherit buildApp;} // inputs);
|
||||||
in
|
in
|
||||||
listToAttrs (map (x: nameValuePair "app-${x}" (callPackage ./${x})) [
|
listToAttrs (map (x: nameValuePair x (callPackage ./${x})) [
|
||||||
"extract-subs"
|
"extract-subs"
|
||||||
"gen-docs"
|
"gen-docs"
|
||||||
"update-sources"
|
"update-sources"
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
# TODO: add README and document lib
|
||||||
{
|
{
|
||||||
perSystem,
|
perSystem,
|
||||||
inputs,
|
inputs,
|
||||||
|
|
Loading…
Reference in a new issue