eeva/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager synced 2024-11-19 01:29:46 +01:00
Code Issues Releases Wiki Activity

integration-common: set hmModule's description directly

Browse source 
Removes the hack after https://github.com/NixOS/nixpkgs/pull/173621
landed.

(cherry picked from commit 0434f8e4ca)
This commit is contained in:
Naïm Favier 2022-06-10 11:13:27 +02:00 committed by Robert Helgesson
parent 4a724cb84c
commit 70d5929885
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
2 changed files with 5 additions and 14 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": 1654230545, "lastModified": 1654953433,
"narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=", "narHash": "sha256-TwEeh4r50NdWHFAHQSyjCk2cZxgwUfcCCAJOhPdXB28=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec", "rev": "90cd5459a1fd707819b9a3fb9c852beaaac3b79a",
"type": "github" "type": "github"
}, },
"original": { "original": {

13
nixos/common.nix
View file

@ -11,7 +11,8 @@ 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;
@ -38,16 +39,6 @@ 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 {