From be3adf9920febf26ff5221ed5c8c76a43b2d94d6 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Mon, 27 Jun 2022 08:58:54 +0200
Subject: [PATCH] Revert "integration-common: set hmModule's description
 directly"

This reverts commit 0434f8e4cab4f200c9b4d3741a9e5d89705e6754.
---
 flake.lock       |  6 +++---
 nixos/common.nix | 13 +++++++++++--
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/flake.lock b/flake.lock
index e027b4cb9..fcac7649f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1654953433,
-        "narHash": "sha256-TwEeh4r50NdWHFAHQSyjCk2cZxgwUfcCCAJOhPdXB28=",
+        "lastModified": 1654230545,
+        "narHash": "sha256-8Vlwf0x8ow6pPOK2a04bT+pxIeRnM1+O0Xv9/CuDzRs=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "90cd5459a1fd707819b9a3fb9c852beaaac3b79a",
+        "rev": "236cc2971ac72acd90f0ae3a797f9f83098b17ec",
         "type": "github"
       },
       "original": {
diff --git a/nixos/common.nix b/nixos/common.nix
index bbc0f976a..dab120592 100644
--- a/nixos/common.nix
+++ b/nixos/common.nix
@@ -11,8 +11,7 @@ let
 
   extendedLib = import ../modules/lib/stdlib-extended.nix pkgs.lib;
 
-  hmModule = types.submoduleWith {
-    description = "Home Manager module";
+  hmModule' = types.submoduleWith {
     specialArgs = {
       lib = extendedLib;
       osConfig = config;
@@ -39,6 +38,16 @@ 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 {