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

Merge #217

Browse source 
217: lib/mkPkgs: don't import external files and get inputs as argument r=nrdxp a=Pacman99

Changes mkPkgs to take extern, overrides, and pkgs as an argument. This improves their ability to be used as lib functions.

Co-authored-by: Pacman99 <pachum99@gmail.com>
This commit is contained in:
bors[bot] 2021-03-27 17:31:26 +00:00 committed by GitHub
parent b3e8e2c4d3 e10fd4b319
commit ef1ee6e6b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
flake.nix
View file

@ -34,8 +34,11 @@
inherit (lib) os; inherit (lib) os;
extern = import ./extern { inherit inputs; }; extern = import ./extern { inherit inputs; };
overrides = import ./overrides;
multiPkgs = os.mkPkgs; multiPkgs = os.mkPkgs {
inherit extern overrides;
};
outputs = { outputs = {
nixosConfigurations = nixosConfigurations =
@ -90,7 +93,7 @@
packages = lib.filterPackages system legacyPackages; packages = lib.filterPackages system legacyPackages;
devShell = import ./shell { devShell = import ./shell {
inherit self system; inherit self system extern overrides;
}; };
} }
); );

8
lib/devos/mkPkgs.nix
View file

@ -1,13 +1,11 @@
{ lib, dev, nixos, self, ... }: { lib, dev, nixos, self, inputs, ... }:
let inherit (self) inputs; { extern, overrides }:
in
(inputs.utils.lib.eachDefaultSystem (inputs.utils.lib.eachDefaultSystem
(system: (system:
let let
extern = import ../../extern { inherit inputs; };
overridePkgs = dev.os.pkgImport inputs.override [ ] system; overridePkgs = dev.os.pkgImport inputs.override [ ] system;
overridesOverlay = (import ../../overrides).packages; overridesOverlay = overrides.packages;
overlays = [ overlays = [
(final: prev: { (final: prev: {

6
shell/default.nix
View file

@ -1,8 +1,12 @@
{ self ? (import ../compat).defaultNix { self ? (import ../compat).defaultNix
, system ? builtins.currentSystem , system ? builtins.currentSystem
, extern ? import ../extern { inherit (self) inputs; }
, overrides ? import ../overrides
}: }:
let let
pkgs = (self.lib.os.mkPkgs).${system}; pkgs = (self.lib.os.mkPkgs {
inherit overrides extern;
}).${system};
inherit (pkgs) lib; inherit (pkgs) lib;