nix/4.flake-parts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge #17

Browse source 
17: introduce lib.mkFlake r=roberth a=zimbatm

This makes the most common use-case a tiny bit less verbose.

I didn't name it mkFlakeModule because it would be redundant with the project name.

Co-authored-by: zimbatm <zimbatm@zimbatm.com>
Co-authored-by: Jonas Chevalier <zimbatm@zimbatm.com>
Co-authored-by: Robert Hensing <robert@roberthensing.nl>
This commit is contained in:
bors[bot] 2022-05-19 07:52:52 +00:00 • committed by GitHub
commit 0263a393a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 51 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

13
README.md
View file

@ -34,18 +34,15 @@ Otherwise, add the input,
flake-modules-core.inputs.nixpkgs.follows = "nixpkgs";
```
then slide `evalFlakeModule` between your outputs function head and body,
then slide `mkFlake` between your outputs function head and body,
```
outputs = { self, flake-modules-core, ... }:
(flake-modules-core.lib.evalFlakeModule
{ inherit self; }
{
flake = {
# Put your original flake attributes here.
}
flake-modules-core.lib.mkFlake { inherit self; } {
flake = {
# Put your original flake attributes here.
}
).config.flake;
};
```
Now you can add the remaining module attributes like in the [the template](./template/default/flake.nix).

5
bors.toml Normal file
View file

@ -0,0 +1,5 @@
status = [
"ci/hercules/onPush/default",
"ci/hercules/evaluation",
]
delete_merged_branches = true

3
lib.nix
View file

@ -38,6 +38,9 @@ let
modules = [ ./all-modules.nix module ];
};
mkFlake = args: module:
(flake-modules-core-lib.evalFlakeModule args module).config.flake;
# For extending options in an already declared submodule.
# Workaround for https://github.com/NixOS/nixpkgs/issues/146882
mkSubmoduleOptions =

45
template/default/flake.nix
View file

@ -8,31 +8,28 @@
};
outputs = { self, flake-modules-core, ... }:
(flake-modules-core.lib.evalFlakeModule
{ inherit self; }
{
imports = [
# To import a flake module
# 1. Add foo to inputs
# 2. Add foo as a parameter to the outputs function
# 3. Add here: foo.flakeModule
flake-modules-core.lib.mkFlake { inherit self; } {
imports = [
# To import a flake module
# 1. Add foo to inputs
# 2. Add foo as a parameter to the outputs function
# 3. Add here: foo.flakeModule
];
systems = [ "x86_64-linux" "aarch64-darwin" ];
perSystem = system: { config, self', inputs', pkgs, ... }: {
# Per-system attributes can be defined here. The self' and inputs'
# module parameters provide easy access to attributes of the same
# system.
];
systems = [ "x86_64-linux" "aarch64-darwin" ];
perSystem = system: { config, self', inputs', pkgs, ... }: {
# Per-system attributes can be defined here. The self' and inputs'
# module parameters provide easy access to attributes of the same
# system.
# Equivalent to inputs'.nixpkgs.legacyPackages.hello;
packages.hello = pkgs.hello;
};
flake = {
# The usual flake attributes can be defined here, including system-
# agnostic ones like nixosModule and system-enumerating ones, although
# those are more easily expressed in perSystem.
# Equivalent to inputs'.nixpkgs.legacyPackages.hello;
packages.hello = pkgs.hello;
};
flake = {
# The usual flake attributes can be defined here, including system-
# agnostic ones like nixosModule and system-enumerating ones, although
# those are more easily expressed in perSystem.
};
}
).config.flake;
};
};
}

37
template/multi-module/flake.nix
View file

@ -8,26 +8,23 @@
};
outputs = { self, flake-modules-core, ... }:
(flake-modules-core.lib.evalFlakeModule
{ inherit self; }
{
imports = [
./hello/flake-module.nix
];
systems = [ "x86_64-linux" "aarch64-darwin" ];
perSystem = system: { config, self', inputs', ... }: {
# Per-system attributes can be defined here. The self' and inputs'
# module parameters provide easy access to attributes of the same
# system.
flake-modules-core.lib.mkFlake { inherit self; } {
imports = [
./hello/flake-module.nix
];
systems = [ "x86_64-linux" "aarch64-darwin" ];
perSystem = system: { config, self', inputs', ... }: {
# Per-system attributes can be defined here. The self' and inputs'
# module parameters provide easy access to attributes of the same
# system.
packages.figlet = inputs'.nixpkgs.legacyPackages.figlet;
};
flake = {
# The usual flake attributes can be defined here, including system-
# agnostic ones like nixosModule and system-enumerating ones, although
# those are more easily expressed in perSystem.
packages.figlet = inputs'.nixpkgs.legacyPackages.figlet;
};
flake = {
# The usual flake attributes can be defined here, including system-
# agnostic ones like nixosModule and system-enumerating ones, although
# those are more easily expressed in perSystem.
};
}
).config.flake;
};
};
}