Compare commits
No commits in common. "d5b5519f4f4a432482b387be21ef0b3dd149fb2c" and "c5292e8a3118f63d262a6823276a2ff283583b05" have entirely different histories.
d5b5519f4f
...
c5292e8a31
2 changed files with 6 additions and 10 deletions
|
@ -47,5 +47,5 @@ let
|
|||
type != "unknown" && builtins.baseNameOf path != ".git" && !matchesGitIgnore path
|
||||
) ./.;
|
||||
in
|
||||
if !(evaluatingInStore) then { ... }@args: import selfInStore ({ selfPath = selfInStore; } // args )
|
||||
else { ... }@args: import ./outputs.nix ({ selfPath = selfInStore; } // args)
|
||||
if !(evaluatingInStore) then import selfInStore
|
||||
else import ./outputs.nix
|
||||
|
|
12
outputs.nix
12
outputs.nix
|
@ -1,15 +1,11 @@
|
|||
{
|
||||
inputs ? import ./inputs.nix {},
|
||||
selfPath ? ./.
|
||||
}:
|
||||
{ inputs ? import ./inputs.nix {} }:
|
||||
|
||||
let
|
||||
|
||||
lib = (import "${inputs.nixpkgs}/lib").extend (import ./lib/overlays/version-info-fixup.nix { inherit inputs; });
|
||||
|
||||
self = {
|
||||
inherit inputs lib self;
|
||||
__toString = _: selfPath;
|
||||
inherit lib inputs;
|
||||
modifiedNixpkgs = import ./pkgs/top-level/impure.nix;
|
||||
modifiedNixpkgsPure = import ./pkgs/top-level/default.nix;
|
||||
overlays = {
|
||||
|
@ -44,8 +40,8 @@ self = {
|
|||
./hosts/${name}
|
||||
{
|
||||
config.nixpkgs.overlays = [
|
||||
( import ./pkgs/overlays/selfExpr.nix { nixpkgsPath = "${self}/pkgs/top-level/impure.nix"; } )
|
||||
( import "${inputs.nixpkgs}/pkgs/top-level/by-name-overlay.nix" "${self}/pkgs/by-name" )
|
||||
( import ./pkgs/overlays/selfExpr.nix { nixpkgsPath = "${builtins.toString ./.}/pkgs/top-level/impure.nix"; } )
|
||||
( import "${inputs.nixpkgs}/pkgs/top-level/by-name-overlay.nix" "${builtins.toString ./.}/pkgs/by-name" )
|
||||
self.overlays.versionInfoFixup
|
||||
];
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue