From 592fd61788e4508b63b58f32e2f090e59e646fb0 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Fri, 24 Nov 2017 13:51:21 +0100
Subject: [PATCH] module/home-manager: remove `modulesPath` option

This option has been deprecated for a month and is removed according
to the news entry.
---
 modules/misc/news.nix             | 10 ----------
 modules/programs/home-manager.nix | 31 +------------------------------
 2 files changed, 1 insertion(+), 40 deletions(-)

diff --git a/modules/misc/news.nix b/modules/misc/news.nix
index b61f72cd..b27882ec 100644
--- a/modules/misc/news.nix
+++ b/modules/misc/news.nix
@@ -342,16 +342,6 @@ in
         '';
       }
 
-      {
-        time = "2017-10-23T22:54:33+00:00";
-        condition = config.programs.home-manager.modulesPath != null;
-        message = ''
-          The 'programs.home-manager.modulesPath' option is now
-          deprecated and will be removed on November 24, 2017. Please
-          use the option 'programs.home-manager.path' instead.
-        '';
-      }
-
       {
         time = "2017-10-23T23:10:29+00:00";
         condition = !config.programs.home-manager.enable;
diff --git a/modules/programs/home-manager.nix b/modules/programs/home-manager.nix
index 724a19ae..b27be1db 100644
--- a/modules/programs/home-manager.nix
+++ b/modules/programs/home-manager.nix
@@ -28,43 +28,14 @@ in
           attempted.
         '';
       };
-
-      modulesPath = mkOption {
-        type = types.nullOr types.str;
-        default = null;
-        example = "$HOME/devel/home-manager/modules";
-        description = ''
-          The default path to use for Home Manager modules. If this
-          path does not exist then
-          <filename>$HOME/.config/nixpkgs/home-manager/modules</filename>
-          and <filename>$HOME/.nixpkgs/home-manager/modules</filename>
-          will be attempted. DEPRECATED: Use
-          <varname>programs.home-manager.path</varname> instead.
-        '';
-      };
     };
   };
 
   config = mkIf cfg.enable {
-    warnings = mkIf (cfg.modulesPath != null) [
-      ("'programs.home-manager.modulesPath' is deprecated, "
-        + "please use 'programs.home-manager.path")
-    ];
-
-    assertions = [{
-      assertion = cfg.path == null || cfg.modulesPath == null;
-      message = "Cannot simultaneously use "
-        + "'programs.home-manager.path' and "
-        + "'programs.home-manager.modulesPath'.";
-    }];
-
     home.packages = [
       (import ../../home-manager {
         inherit pkgs;
-        path =
-          if cfg.modulesPath != null
-          then "$(dirname ${cfg.modulesPath})"
-          else cfg.path;
+        inherit (cfg) path;
       })
     ];