fix nixpkgs.channels system
This commit is contained in:
parent
7ad231ae5c
commit
52044bd998
7 changed files with 92 additions and 56 deletions
|
|
@ -11,8 +11,8 @@
|
|||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
{mix, ...} @ inputs:
|
||||
mix.newMixture inputs (mixture: {
|
||||
{mix, ...} @ args:
|
||||
mix.newMixture args (mixture: {
|
||||
includes.public = [
|
||||
./nodes.nix
|
||||
./nexus.nix
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
{
|
||||
self,
|
||||
this,
|
||||
nt,
|
||||
lib,
|
||||
|
|
@ -184,15 +185,18 @@ in {
|
|||
nodeName: node: let
|
||||
nixosDecl = lib.nixosSystem {
|
||||
system = node.system;
|
||||
specialArgs =
|
||||
nexus.specialArgs
|
||||
// node.specialArgs
|
||||
// {
|
||||
inherit root;
|
||||
inherit (node) system;
|
||||
};
|
||||
specialArgs = let
|
||||
specialArgs =
|
||||
nexus.specialArgs
|
||||
// node.specialArgs
|
||||
// {
|
||||
inherit root specialArgs;
|
||||
inherit (node) system;
|
||||
};
|
||||
in
|
||||
specialArgs;
|
||||
modules =
|
||||
[../nixos-module (findImport (root + "/hosts/${nodeName}"))]
|
||||
[self.nixosModules.default (findImport (root + "/hosts/${nodeName}"))]
|
||||
++ (getGroupModules root nodeName node)
|
||||
++ node.extraModules
|
||||
++ nexus.extraModules;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue