blink: fix missing inputs.self in HM and NixOS modules (#644)

* home-manager: fix missing inputs.self

some options in nvf module uses inputs.self but it's not exposed in the
inputs we pass to home-manager module:

example flake.nix:

```
{
	inputs = { /* ... */ };
	outputs = {nixpkgs, ...}@inputs: {
		testing = {
			a = inputs.self             # valid
			b = inputs.self.inputs      # valid
			c = inputs.self.inputs.self # does not exist

			# prior to this change, inputs.self.inputs was passed to the hm
			# module, which lacks the self attr
			#
			# This change passes in the "top-level" inputs instead.
		};
	};
}
```

* nixos: fix missing inputs.self

see previous commit for details
This commit is contained in:
Ching Pei Yang 2025-02-16 12:35:13 +01:00 committed by GitHub
parent 0644475408
commit 72ae20dc3d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 7 deletions

View file

@ -33,7 +33,7 @@
}; };
homeManagerModules = { homeManagerModules = {
nvf = import ./flake/modules/home-manager.nix {inherit lib self;}; nvf = import ./flake/modules/home-manager.nix {inherit lib inputs;};
default = self.homeManagerModules.nvf; default = self.homeManagerModules.nvf;
neovim-flake = neovim-flake =
lib.warn '' lib.warn ''
@ -44,7 +44,7 @@
}; };
nixosModules = { nixosModules = {
nvf = import ./flake/modules/nixos.nix {inherit lib self;}; nvf = import ./flake/modules/nixos.nix {inherit lib inputs;};
default = self.nixosModules.nvf; default = self.nixosModules.nvf;
neovim-flake = neovim-flake =
lib.warn '' lib.warn ''

View file

@ -1,13 +1,13 @@
# Home Manager module # Home Manager module
{ {
self, inputs,
lib, lib,
}: { }: {
config, config,
pkgs, pkgs,
... ...
}: let }: let
inherit (self) packages inputs; inherit (inputs.self) packages;
inherit (lib) maintainers; inherit (lib) maintainers;
inherit (lib.modules) mkIf mkAliasOptionModule; inherit (lib.modules) mkIf mkAliasOptionModule;
inherit (lib.lists) optional; inherit (lib.lists) optional;
@ -19,7 +19,7 @@
nvfModule = submoduleWith { nvfModule = submoduleWith {
description = "Nvf module"; description = "Nvf module";
class = "nvf"; class = "nvf";
specialArgs = { specialArgs = lib.trace (builtins.attrNames inputs) {
inherit pkgs lib inputs; inherit pkgs lib inputs;
}; };
modules = import ../../modules/modules.nix {inherit pkgs lib;}; modules = import ../../modules/modules.nix {inherit pkgs lib;};

View file

@ -1,13 +1,13 @@
# NixOS module # NixOS module
{ {
self, inputs,
lib, lib,
}: { }: {
config, config,
pkgs, pkgs,
... ...
}: let }: let
inherit (self) inputs packages; inherit (inputs.self) packages;
inherit (lib) maintainers; inherit (lib) maintainers;
inherit (lib.modules) mkIf mkOverride mkAliasOptionModule; inherit (lib.modules) mkIf mkOverride mkAliasOptionModule;
inherit (lib.lists) optional; inherit (lib.lists) optional;