eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-12-21 01:09:47 +01:00
Code Issues Releases Wiki Activity

Revert "integration-common: set hmModule's description directly"

Browse source 
This reverts commit 0434f8e4ca.
This commit is contained in:
Robert Helgesson 2022-06-27 08:58:54 +02:00
parent 9550595502
commit be3adf9920
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
2 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
flake.lock
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1654953433, "lastModified": 1654230545,
"narHash": "sha256-TwEeh4r50NdWHFAHQSyjCk2cZxgwUfcCCAJOhPdXB28=", "narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "90cd5459a1fd707819b9a3fb9c852beaaac3b79a", "rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec",
"type": "github" "type": "github"
}, },
"original": { "original": {

13
nixos/common.nix
View file

@ -11,8 +11,7 @@ let
extendedLib = import ../modules/lib/stdlib-extended.nix pkgs.lib; extendedLib = import ../modules/lib/stdlib-extended.nix pkgs.lib;
hmModule = types.submoduleWith { hmModule' = types.submoduleWith {
description = "Home Manager module";
specialArgs = { specialArgs = {
lib = extendedLib; lib = extendedLib;
osConfig = config; osConfig = config;
@ -39,6 +38,16 @@ let
}; };
}) })
] ++ cfg.sharedModules; ] ++ cfg.sharedModules;
} // {
description = "Home Manager module";
};
# TODO: hack until https://github.com/NixOS/nixpkgs/pull/173621 lands
hmModule = hmModule' // {
substSubModules = m:
hmModule'.substSubModules m // {
inherit (hmModule') description;
};
}; };
in { in {