Skip to content

lib/mkPkgs: don't import external files and get inputs as argument #217

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 2 commits into from
Mar 27, 2021
Merged

lib/mkPkgs: don't import external files and get inputs as argument #217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
562f476
lib/mkPkgs: fix function arguments
Mar 26, 2021
e10fd4b
shell: get extern and overrides to pass to mkpkgs
Mar 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,11 @@
inherit (lib) os;

extern = import ./extern { inherit inputs; };
overrides = import ./overrides;

multiPkgs = os.mkPkgs;
multiPkgs = os.mkPkgs {
inherit extern overrides;
};

outputs = {
nixosConfigurations =
Expand Down Expand Up @@ -86,7 +89,7 @@
(os.mkPackages { inherit pkgs; });

devShell = import ./shell {
inherit self system;
inherit self system extern overrides;
};
}
);
Expand Down
8 changes: 3 additions & 5 deletions lib/devos/mkPkgs.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
{ lib, dev, nixos, self, ... }:
{ lib, dev, nixos, self, inputs, ... }:

let inherit (self) inputs;
in
{ extern, overrides }:
(inputs.utils.lib.eachDefaultSystem
(system:
let
extern = import ../../extern { inherit inputs; };
overridePkgs = dev.os.pkgImport inputs.override [ ] system;
overridesOverlay = (import ../../overrides).packages;
overridesOverlay = overrides.packages;

overlays = [
(overridesOverlay overridePkgs)
Expand Down
6 changes: 5 additions & 1 deletion shell/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
{ self ? (import ../compat).defaultNix
, system ? builtins.currentSystem
, extern ? import ../extern { inherit (self) inputs; }
, overrides ? import ../overrides
}:
let
pkgs = (self.lib.os.mkPkgs).${system};
pkgs = (self.lib.os.mkPkgs {
inherit overrides extern;
}).${system};

inherit (pkgs) lib;

Expand Down