refactor: standardize on formatter
This commit is contained in:
Jake Hamilton
parent
723c16bbb5
commit
1284023e7a
20 changed files with 1131 additions and 1111 deletions
|
|
@ -1,16 +1,14 @@
|
|||
{ core-inputs
|
||||
, user-inputs
|
||||
, snowfall-lib
|
||||
, snowfall-config
|
||||
}:
|
||||
|
||||
let
|
||||
{
|
||||
core-inputs,
|
||||
user-inputs,
|
||||
snowfall-lib,
|
||||
snowfall-config,
|
||||
}: let
|
||||
inherit (core-inputs.nixpkgs.lib) assertMsg foldl concatStringsSep;
|
||||
|
||||
user-overlays-root = snowfall-lib.fs.get-snowfall-file "overlays";
|
||||
user-packages-root = snowfall-lib.fs.get-snowfall-file "packages";
|
||||
in
|
||||
{
|
||||
in {
|
||||
overlay = {
|
||||
## Create a flake-utils-plus overlays builder.
|
||||
## Example Usage:
|
||||
|
|
@ -22,29 +20,26 @@ in
|
|||
## (channels: [ ... ])
|
||||
## ```
|
||||
#@ Attrs -> Attrs -> [(a -> b -> c)]
|
||||
create-overlays-builder =
|
||||
{ src ? user-overlays-root
|
||||
, package-namespace ? "internal"
|
||||
, extra-overlays ? [ ]
|
||||
}: channels:
|
||||
let
|
||||
user-overlays = snowfall-lib.fs.get-default-nix-files-recursive src;
|
||||
create-overlay = overlay: import overlay (user-inputs // { inherit channels; });
|
||||
user-packages-overlay = final: prev:
|
||||
let
|
||||
user-packages = snowfall-lib.package.create-packages {
|
||||
pkgs = final;
|
||||
channels = channels;
|
||||
};
|
||||
in
|
||||
{
|
||||
${package-namespace} =
|
||||
(prev.${package-namespace} or { })
|
||||
// user-packages;
|
||||
};
|
||||
overlays =
|
||||
[ user-packages-overlay ] ++ extra-overlays ++ (builtins.map create-overlay user-overlays);
|
||||
in
|
||||
create-overlays-builder = {
|
||||
src ? user-overlays-root,
|
||||
package-namespace ? "internal",
|
||||
extra-overlays ? [],
|
||||
}: channels: let
|
||||
user-overlays = snowfall-lib.fs.get-default-nix-files-recursive src;
|
||||
create-overlay = overlay: import overlay (user-inputs // {inherit channels;});
|
||||
user-packages-overlay = final: prev: let
|
||||
user-packages = snowfall-lib.package.create-packages {
|
||||
pkgs = final;
|
||||
channels = channels;
|
||||
};
|
||||
in {
|
||||
${package-namespace} =
|
||||
(prev.${package-namespace} or {})
|
||||
// user-packages;
|
||||
};
|
||||
overlays =
|
||||
[user-packages-overlay] ++ extra-overlays ++ (builtins.map create-overlay user-overlays);
|
||||
in
|
||||
overlays;
|
||||
|
||||
## Create exported overlays from the user flake. Adapted [from flake-utils-plus](https://github.com/gytis-ivaskevicius/flake-utils-plus/blob/2bf0f91643c2e5ae38c1b26893ac2927ac9bd82a/lib/exportOverlays.nix).
|
||||
|
|
@ -58,133 +53,126 @@ in
|
|||
## { default = final: prev: ...; some-overlay = final: prev: ...; }
|
||||
## ```
|
||||
#@ Attrs -> Attrs
|
||||
create-overlays =
|
||||
{ src ? user-overlays-root
|
||||
, packages-src ? user-packages-root
|
||||
, package-namespace ? null
|
||||
, extra-overlays ? { }
|
||||
}:
|
||||
let
|
||||
fake-pkgs = {
|
||||
callPackage = x: x;
|
||||
isFakePkgs = true;
|
||||
lib = { };
|
||||
system = "fake-system";
|
||||
create-overlays = {
|
||||
src ? user-overlays-root,
|
||||
packages-src ? user-packages-root,
|
||||
package-namespace ? null,
|
||||
extra-overlays ? {},
|
||||
}: let
|
||||
fake-pkgs = {
|
||||
callPackage = x: x;
|
||||
isFakePkgs = true;
|
||||
lib = {};
|
||||
system = "fake-system";
|
||||
};
|
||||
|
||||
user-overlays = snowfall-lib.fs.get-default-nix-files-recursive src;
|
||||
|
||||
channel-systems = user-inputs.self.pkgs;
|
||||
|
||||
user-packages-overlay = final: prev: let
|
||||
user-packages = snowfall-lib.package.create-packages {
|
||||
pkgs = final;
|
||||
channels = channel-systems.${prev.system};
|
||||
};
|
||||
in
|
||||
if package-namespace == null
|
||||
then user-packages
|
||||
else {
|
||||
${package-namespace} =
|
||||
(prev.${package-namespace} or {})
|
||||
// user-packages;
|
||||
};
|
||||
|
||||
user-overlays = snowfall-lib.fs.get-default-nix-files-recursive src;
|
||||
|
||||
channel-systems = user-inputs.self.pkgs;
|
||||
|
||||
user-packages-overlay = final: prev:
|
||||
let
|
||||
user-packages = snowfall-lib.package.create-packages {
|
||||
pkgs = final;
|
||||
channels = channel-systems.${prev.system};
|
||||
};
|
||||
in
|
||||
if package-namespace == null then
|
||||
user-packages
|
||||
else
|
||||
{
|
||||
${package-namespace} =
|
||||
(prev.${package-namespace} or { })
|
||||
// user-packages;
|
||||
};
|
||||
|
||||
create-overlay = (overlays: file:
|
||||
let
|
||||
name = builtins.unsafeDiscardStringContext (snowfall-lib.path.get-parent-directory file);
|
||||
overlay = final: prev:
|
||||
let
|
||||
channels = channel-systems.${prev.system};
|
||||
user-overlay = import file (user-inputs // { inherit channels; });
|
||||
packages = user-packages-overlay final prev;
|
||||
prev-with-packages =
|
||||
if package-namespace == null then
|
||||
prev // packages
|
||||
else
|
||||
prev // {
|
||||
${package-namespace} =
|
||||
(prev.${package-namespace} or { })
|
||||
// packages.${package-namespace};
|
||||
};
|
||||
user-overlay-packages =
|
||||
user-overlay
|
||||
final
|
||||
prev-with-packages;
|
||||
outputs =
|
||||
user-overlay-packages;
|
||||
in
|
||||
if user-overlay-packages.__dontExport or false == true then
|
||||
outputs // { __dontExport = true; }
|
||||
create-overlay = (
|
||||
overlays: file: let
|
||||
name = builtins.unsafeDiscardStringContext (snowfall-lib.path.get-parent-directory file);
|
||||
overlay = final: prev: let
|
||||
channels = channel-systems.${prev.system};
|
||||
user-overlay = import file (user-inputs // {inherit channels;});
|
||||
packages = user-packages-overlay final prev;
|
||||
prev-with-packages =
|
||||
if package-namespace == null
|
||||
then prev // packages
|
||||
else
|
||||
outputs;
|
||||
fake-overlay-result = overlay fake-pkgs fake-pkgs;
|
||||
prev
|
||||
// {
|
||||
${package-namespace} =
|
||||
(prev.${package-namespace} or {})
|
||||
// packages.${package-namespace};
|
||||
};
|
||||
user-overlay-packages =
|
||||
user-overlay
|
||||
final
|
||||
prev-with-packages;
|
||||
outputs =
|
||||
user-overlay-packages;
|
||||
in
|
||||
if fake-overlay-result.__dontExport or false == true then
|
||||
overlays
|
||||
if user-overlay-packages.__dontExport or false == true
|
||||
then outputs // {__dontExport = true;}
|
||||
else outputs;
|
||||
fake-overlay-result = overlay fake-pkgs fake-pkgs;
|
||||
in
|
||||
if fake-overlay-result.__dontExport or false == true
|
||||
then overlays
|
||||
else
|
||||
overlays // {
|
||||
overlays
|
||||
// {
|
||||
${name} = overlay;
|
||||
}
|
||||
);
|
||||
);
|
||||
|
||||
overlays =
|
||||
foldl
|
||||
create-overlay
|
||||
{ }
|
||||
user-overlays;
|
||||
overlays =
|
||||
foldl
|
||||
create-overlay
|
||||
{}
|
||||
user-overlays;
|
||||
|
||||
user-packages = snowfall-lib.fs.get-default-nix-files-recursive packages-src;
|
||||
user-packages = snowfall-lib.fs.get-default-nix-files-recursive packages-src;
|
||||
|
||||
create-package-overlay = package-overlays: file:
|
||||
let
|
||||
name = builtins.unsafeDiscardStringContext (snowfall-lib.path.get-parent-directory file);
|
||||
overlay = final: prev:
|
||||
let
|
||||
channels = channel-systems.${prev.system};
|
||||
packages = snowfall-lib.package.create-packages {
|
||||
channels = channel-systems.${prev.system};
|
||||
};
|
||||
in
|
||||
if package-namespace == null then
|
||||
{ ${name} = packages.${name}; }
|
||||
else
|
||||
{
|
||||
${package-namespace} =
|
||||
(prev.${package-namespace} or { })
|
||||
// { ${name} = packages.${name}; };
|
||||
};
|
||||
in
|
||||
package-overlays //
|
||||
{
|
||||
"package/${name}" = overlay;
|
||||
create-package-overlay = package-overlays: file: let
|
||||
name = builtins.unsafeDiscardStringContext (snowfall-lib.path.get-parent-directory file);
|
||||
overlay = final: prev: let
|
||||
channels = channel-systems.${prev.system};
|
||||
packages = snowfall-lib.package.create-packages {
|
||||
channels = channel-systems.${prev.system};
|
||||
};
|
||||
in
|
||||
if package-namespace == null
|
||||
then {${name} = packages.${name};}
|
||||
else {
|
||||
${package-namespace} =
|
||||
(prev.${package-namespace} or {})
|
||||
// {${name} = packages.${name};};
|
||||
};
|
||||
|
||||
package-overlays =
|
||||
foldl
|
||||
create-package-overlay
|
||||
{ }
|
||||
user-packages;
|
||||
|
||||
default-overlay = final: prev:
|
||||
let
|
||||
overlays-list = builtins.attrValues overlays;
|
||||
package-overlays-list = builtins.attrValues package-overlays;
|
||||
|
||||
overlays-results = builtins.map (overlay: overlay final prev) overlays-list;
|
||||
package-overlays-results = builtins.map (overlay: overlay final prev) package-overlays-list;
|
||||
|
||||
merged-results = snowfall-lib.attrs.merge-shallow-packages
|
||||
(package-overlays-results ++ overlays-results);
|
||||
in
|
||||
merged-results;
|
||||
in
|
||||
package-overlays
|
||||
// {
|
||||
"package/${name}" = overlay;
|
||||
};
|
||||
|
||||
package-overlays =
|
||||
foldl
|
||||
create-package-overlay
|
||||
{}
|
||||
user-packages;
|
||||
|
||||
default-overlay = final: prev: let
|
||||
overlays-list = builtins.attrValues overlays;
|
||||
package-overlays-list = builtins.attrValues package-overlays;
|
||||
|
||||
overlays-results = builtins.map (overlay: overlay final prev) overlays-list;
|
||||
package-overlays-results = builtins.map (overlay: overlay final prev) package-overlays-list;
|
||||
|
||||
merged-results =
|
||||
snowfall-lib.attrs.merge-shallow-packages
|
||||
(package-overlays-results ++ overlays-results);
|
||||
in
|
||||
merged-results;
|
||||
in
|
||||
package-overlays
|
||||
// overlays
|
||||
// { default = default-overlay; }
|
||||
// {default = default-overlay;}
|
||||
// extra-overlays;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue