Skip to content

Commit 5828992

Browse files
committed
modules: inject nixpkgs source as a special arg
1 parent 23b8cce commit 5828992

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

docs/default.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Copyright (c) 2019-2023, see AUTHORS. Licensed under MIT License, see LICENSE.
22

3-
{ pkgs, home-manager, nmdSrc }:
3+
{ pkgs, nixpkgs, home-manager, nmdSrc }:
44

55
let
66
nmd = import nmdSrc { inherit pkgs; };
@@ -14,7 +14,7 @@ let
1414
};
1515

1616
modules = import ../modules/module-list.nix {
17-
inherit pkgs;
17+
inherit pkgs nixpkgs;
1818
home-manager-path = home-manager.outPath;
1919
isFlake = true;
2020
};

flake.nix

+4-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
};
2626
};
2727

28-
outputs = { self, nixpkgs, nixpkgs-for-bootstrap, home-manager, nix-formatter-pack, nmd }:
28+
outputs = { self, nixpkgs, nixpkgs-for-bootstrap, home-manager, nix-formatter-pack, nmd }@inputs:
2929
let
3030
forEachSystem = nixpkgs.lib.genAttrs [ "aarch64-linux" "x86_64-linux" ];
3131

@@ -80,6 +80,7 @@
8080
{ modules ? [ ]
8181
, extraSpecialArgs ? { }
8282
, pkgs ? pkgs'
83+
, nixpkgs ? inputs.nixpkgs
8384
, home-manager-path ? home-manager.outPath
8485
# deprecated:
8586
, config ? null
@@ -103,7 +104,7 @@
103104
See the 22.11 release notes for more.
104105
''
105106
(import ./modules {
106-
inherit extraSpecialArgs home-manager-path pkgs;
107+
inherit extraSpecialArgs home-manager-path nixpkgs pkgs;
107108
config.imports = modules;
108109
isFlake = true;
109110
});
@@ -118,7 +119,7 @@
118119
};
119120

120121
docs = import ./docs {
121-
inherit home-manager;
122+
inherit nixpkgs home-manager;
122123
pkgs = nixpkgs.legacyPackages.${system};
123124
nmdSrc = nmd;
124125
};

modules/default.nix

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
{ config ? null
44
, extraSpecialArgs ? { }
55
, pkgs ? import <nixpkgs> { }
6+
, nixpkgs ? <nixpkgs>
67
, home-manager-path ? <home-manager>
78
, isFlake ? false
89
}:
@@ -21,7 +22,7 @@ let
2122

2223
rawModule = evalModules {
2324
modules = [ configModule ] ++ nodModules;
24-
specialArgs = extraSpecialArgs;
25+
specialArgs = { inherit nixpkgs; } // extraSpecialArgs;
2526
};
2627

2728
failedAssertions = map (x: x.message) (filter (x: !x.assertion) rawModule.config.assertions);

0 commit comments

Comments
 (0)