From 91a67851029b8165f1c0c057b9c51a94681c338b Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 6 Oct 2017 19:57:47 +0200 Subject: [PATCH] nixpkgs: change loeOf to listOf --- CHANGELOG | 7 +++++++ modules/environment/default.nix | 2 +- modules/launchd/default.nix | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 9f021ed4..94697e3c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,10 @@ +2017-10-06 +- loeOf was removed from nixpkgs in 10881bbe11b2f66ebfa880795e5bc01a04158da4 + + Using single items instead of a list no longer works for + environment.systemPath and launchd...path + + 2017-10-01 - added system.stateVersion option, add this to your configuration to avoid breaking changes. This changelog and the activation checks diff --git a/modules/environment/default.nix b/modules/environment/default.nix index c68d0a40..3c8bc063 100644 --- a/modules/environment/default.nix +++ b/modules/environment/default.nix @@ -33,7 +33,7 @@ in { }; environment.systemPath = mkOption { - type = types.loeOf types.str; + type = types.listOf types.str; description = "The set of paths that are added to PATH."; apply = x: if isList x then makeDrvBinPath x else x; }; diff --git a/modules/launchd/default.nix b/modules/launchd/default.nix index 75059378..a6827aee 100644 --- a/modules/launchd/default.nix +++ b/modules/launchd/default.nix @@ -37,7 +37,7 @@ let }; path = mkOption { - type = types.loeOf (types.either types.path types.str); + type = types.listOf (types.either types.path types.str); default = []; description = '' Packages added to the service's PATH