mirror of
https://github.com/nix-community/home-manager
synced 2024-11-10 07:04:17 +00:00
integration-common: set hmModule's description directly
Removes the hack after https://github.com/NixOS/nixpkgs/pull/173621 landed.
This commit is contained in:
parent
0ca0b91088
commit
0434f8e4ca
2 changed files with 5 additions and 14 deletions
|
@ -18,11 +18,11 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1654230545,
|
||||
"narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=",
|
||||
"lastModified": 1654953433,
|
||||
"narHash": "sha256-TwEeh4r50NdWHFAHQSyjCk2cZxgwUfcCCAJOhPdXB28=",
|
||||
"owner": "nixos",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec",
|
||||
"rev": "90cd5459a1fd707819b9a3fb9c852beaaac3b79a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
|
@ -11,7 +11,8 @@ let
|
|||
|
||||
extendedLib = import ../modules/lib/stdlib-extended.nix pkgs.lib;
|
||||
|
||||
hmModule' = types.submoduleWith {
|
||||
hmModule = types.submoduleWith {
|
||||
description = "Home Manager module";
|
||||
specialArgs = {
|
||||
lib = extendedLib;
|
||||
osConfig = config;
|
||||
|
@ -38,16 +39,6 @@ let
|
|||
};
|
||||
})
|
||||
] ++ 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 {
|
||||
|
|
Loading…
Reference in a new issue