From 0357f71d710e64990e2e2c608538054b8ba44483 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sun, 27 Aug 2017 13:04:39 +0200 Subject: [PATCH] home-manager: minor attribute rename The "activation-script" attribute doesn't actually point directly at the activation script. Renamed the attribute to be more descriptive. (cherry picked from commit b4fff6b9b7c393ee588e52caf3a6d685852d9c04) --- home-manager/default.nix | 2 +- home-manager/home-manager | 2 +- modules/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/home-manager/default.nix b/home-manager/default.nix index 979f9aa80..e517ee9ec 100644 --- a/home-manager/default.nix +++ b/home-manager/default.nix @@ -22,7 +22,7 @@ let }; in { - inherit (env) activation-script; + inherit (env) activationPackage; } ''; diff --git a/home-manager/home-manager b/home-manager/home-manager index 1874143ad..78b9749be 100644 --- a/home-manager/home-manager +++ b/home-manager/home-manager @@ -67,7 +67,7 @@ function doBuild() { "@HOME_MANAGER_EXPR_PATH@" \ --argstr confPath "$HOME_MANAGER_CONFIG" \ --argstr confAttr "$HOME_MANAGER_CONFIG_ATTRIBUTE" \ - -A activation-script + -A activationPackage } function doSwitch() { diff --git a/modules/default.nix b/modules/default.nix index 043aa86ba..4b3a3444d 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -78,6 +78,6 @@ in { inherit (module) options config; - activation-script = module.config.home.activationPackage; + activationPackage = module.config.home.activationPackage; home-path = module.config.home.path; }