From f856983210b5901357f3e21a407034c101936be6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20Sj=C3=B6strom?= <lars@radicore.se> Date: Fri, 13 Jun 2025 08:16:49 +0200 Subject: [PATCH] chore: move overlay to own file --- flake.nix | 19 +------------------ overlays/default.nix | 21 +++++++++++++++++++++ 2 files changed, 22 insertions(+), 18 deletions(-) create mode 100644 overlays/default.nix diff --git a/flake.nix b/flake.nix index 66b86c8..58a8aab 100644 --- a/flake.nix +++ b/flake.nix @@ -20,24 +20,7 @@ microcode = "intel"; updateUrl = "http://10.0.2.2:8000/"; - overlay = final: prev: { - patos = prev.lib.makeScope prev.newScope (self: { - kernel = final.callPackage ./pkgs/kernel { }; - glibc = final.callPackage ./pkgs/glibc { }; - busybox = final.callPackage ./pkgs/busybox { }; - openssl = final.callPackage ./pkgs/openssl { }; - kexec = final.callPackage ./pkgs/kexec-tools { }; - lvm2 = final.callPackage ./pkgs/lvm2 { }; - tpm2-tools = final.callPackage ./pkgs/tpm2-tools { }; - tpm2-tss = final.callPackage ./pkgs/tpm2-tss { }; - systemd = final.callPackage ./pkgs/systemd { }; - dbus-broker = final.callPackage ./pkgs/dbus-broker { }; - - rootfs = final.callPackage ./pkgs/rootfs/mkrootfs.nix { inherit version; }; - initrd = final.callPackage ./pkgs/rootfs/mkinitrd.nix { inherit version; }; - }); - }; - + overlay = import ./overlays { version = version; }; pkgs = import nixpkgs { inherit system; overlays = [ overlay ]; }; pkgsCross = import nixpkgs { inherit system; diff --git a/overlays/default.nix b/overlays/default.nix new file mode 100644 index 0000000..2c2cdce --- /dev/null +++ b/overlays/default.nix @@ -0,0 +1,21 @@ +{ + version +}: + +final: prev: { + patos = prev.lib.makeScope prev.newScope (self: { + kernel = final.callPackage ../pkgs/kernel { }; + glibc = final.callPackage ../pkgs/glibc { }; + busybox = final.callPackage ../pkgs/busybox { }; + openssl = final.callPackage ../pkgs/openssl { }; + kexec = final.callPackage ../pkgs/kexec-tools { }; + lvm2 = final.callPackage ../pkgs/lvm2 { }; + tpm2-tools = final.callPackage ../pkgs/tpm2-tools { }; + tpm2-tss = final.callPackage ../pkgs/tpm2-tss { }; + systemd = final.callPackage ../pkgs/systemd { }; + dbus-broker = final.callPackage ../pkgs/dbus-broker { }; + + rootfs = final.callPackage ../pkgs/rootfs/mkrootfs.nix { inherit version; }; + initrd = final.callPackage ../pkgs/rootfs/mkinitrd.nix { inherit version; }; + }); +}