Use makeScope

This commit is contained in:
Artturin 2024-10-02 00:06:25 +03:00
parent b8da300c94
commit d40264a5f2

View file

@ -20,36 +20,43 @@
system: system:
let let
pkgs = inputs.nixpkgs.legacyPackages.${system}; pkgs = inputs.nixpkgs.legacyPackages.${system};
scope = lib.makeScope pkgs.newScope (
self:
let
inherit (self) callPackage;
in
{
kernel = pkgs.linux_latest; kernel = pkgs.linux_latest;
kmd = import ./pkgs/kmd { inherit pkgs kernel; }; kmd = callPackage ./pkgs/kmd { };
sfpi = import ./pkgs/sfpi { inherit pkgs; }; sfpi = callPackage ./pkgs/sfpi { };
luwen = import ./pkgs/luwen { inherit pkgs; }; luwen = callPackage ./pkgs/luwen { };
common = import ./pkgs/common { inherit pkgs; }; common = callPackage ./pkgs/common { };
flash = import ./pkgs/flash { flash = callPackage ./pkgs/flash {
inherit pkgs; pyluwen = self.luwen.pyluwen_0_1;
pyluwen = luwen.pyluwen_0_1; tools-common = self.common;
tools-common = common;
}; };
smi = import ./pkgs/smi { smi = callPackage ./pkgs/smi {
inherit pkgs; pyluwen = self.luwen.pyluwen;
pyluwen = luwen.pyluwen; tools-common = self.common;
tools-common = common;
}; };
umd = import ./pkgs/umd { inherit pkgs; }; umd = callPackage ./pkgs/umd { };
}
);
in in
{ {
packages = { packages = {
kmd = kmd.kmd; kmd = scope.kmd.kmd;
udev-rules = kmd.udev-rules; udev-rules = scope.kmd.udev-rules;
kmd-test = kmd.test; kmd-test = scope.kmd.test;
sfpi = sfpi.sfpi; sfpi = scope.sfpi.sfpi;
tt-gcc = sfpi.tt-gcc; tt-gcc = scope.sfpi.tt-gcc;
smi = smi; smi = scope.smi;
luwen = luwen.luwen; luwen = scope.luwen.luwen;
pyluwen = luwen.pyluwen; pyluwen = scope.luwen.pyluwen;
tools-common = common; tools-common = scope.common;
flash = flash; flash = scope.flash;
umd = umd; umd = scope.umd;
default = self.packages.${system}.smi; default = self.packages.${system}.smi;
}; };