axeman/pub-solar-os
1
0
Fork 0
forked from pub-solar/os
Code Issues Pull requests Packages Projects Releases Wiki Activity

flake: format fix

Browse source
This commit is contained in:
Timothy DeHerrera 2021-01-25 09:21:27 -07:00
parent a173bd4165
commit b1c42e4ed4
No known key found for this signature in database
GPG key ID: 8985725DB5B0C122
1 changed files with 32 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
flake.nix
View file

@ -68,43 +68,42 @@
recursiveUpdate recursiveUpdate
(eachDefaultSystem (eachDefaultSystem
(system: (system:
let let
unstable = pkgImport master [ ] system; unstable = pkgImport master [ ] system;
pkgs = pkgs =
let let
override = import ./pkgs/override.nix; override = import ./pkgs/override.nix;
overlays = [ overlays = [
(override unstable) (override unstable)
self.overlay self.overlay
(final: prev: { (final: prev: {
lib = (prev.lib or { }) // { lib = (prev.lib or { }) // {
inherit (nixos.lib) nixosSystem; inherit (nixos.lib) nixosSystem;
flk = self.lib; flk = self.lib;
utils = flake-utils.lib; utils = flake-utils.lib;
}; };
}) })
] ]
++ (attrValues self.overlays) ++ (attrValues self.overlays)
++ externOverlays; ++ externOverlays;
in in
pkgImport nixos overlays system; pkgImport nixos overlays system;
packages = flattenTreeSystem system packages = flattenTreeSystem system
(genPackages { (genPackages {
inherit self pkgs; inherit self pkgs;
}); });
in in
{ {
inherit packages; inherit packages;
devShell = import ./shell { devShell = import ./shell {
inherit pkgs nixos; inherit pkgs nixos;
}; };
legacyPackages = pkgs; legacyPackages = pkgs;
} })
)
) )
outputs; outputs;
} }