linuxhackerman
/
liminix
forked from dan/liminix
1
0
Fork 0
Code Pull Requests Activity

move make-image to subdirectory

This commit is contained in:
Daniel Barlow 2022-09-27 16:06:54 +01:00
parent b7ff973b4b
commit 4cbe669783
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
default.nix
View File

@ -4,6 +4,7 @@
let let
overlay = import ./overlay.nix; overlay = import ./overlay.nix;
nixpkgs = import <nixpkgs> ( device.system // {overlays = [overlay]; }); nixpkgs = import <nixpkgs> ( device.system // {overlays = [overlay]; });
inherit (nixpkgs.pkgs) callPackage liminix;
config = (import ./merge-modules.nix) [ config = (import ./merge-modules.nix) [
./modules/base.nix ./modules/base.nix
({ lib, ... } : { config = { inherit (device) kernel; }; }) ({ lib, ... } : { config = { inherit (device) kernel; }; })
@ -11,13 +12,12 @@ let
./modules/s6 ./modules/s6
] nixpkgs.pkgs; ] nixpkgs.pkgs;
finalConfig = config // { finalConfig = config // {
packages = (with nixpkgs.pkgs; [ s6-rc ]) ++ packages = config.systemPackages ++
config.systemPackages ++
(builtins.attrValues config.services); (builtins.attrValues config.services);
}; };
squashfs = (nixpkgs.pkgs.callPackage ./make-image.nix {}) finalConfig; squashfs = liminix.builders.squashfs finalConfig;
kernel = nixpkgs.pkgs.callPackage ./kernel { kernel = callPackage ./kernel {
inherit (finalConfig.kernel) config; inherit (config.kernel) config;
}; };
in { in {
outputs = { outputs = {

3
overlay.nix
View File

@ -4,6 +4,9 @@ final: prev: {
liminix = { liminix = {
services = final.callPackage ./pkgs/liminix-tools/services {}; services = final.callPackage ./pkgs/liminix-tools/services {};
networking = final.callPackage ./pkgs/liminix-tools/networking {}; networking = final.callPackage ./pkgs/liminix-tools/networking {};
builders = {
squashfs = final.callPackage ./pkgs/liminix-tools/builders/squashfs.nix {};
};
}; };
writeAshScript = final.callPackage ./pkgs/write-ash-script {}; writeAshScript = final.callPackage ./pkgs/write-ash-script {};
s6-init-bin = final.callPackage ./pkgs/s6-init-bin {}; s6-init-bin = final.callPackage ./pkgs/s6-init-bin {};

0
make-image.nix → pkgs/liminix-tools/builders/squashfs.nix
View File