From 4e2357313811f486a5c61aafeab5718e3c04f24b Mon Sep 17 00:00:00 2001
From: Rickard Nilsson <rickynils@gmail.com>
Date: Wed, 12 Mar 2014 11:45:31 +0100
Subject: [PATCH] phpfpm module: Make extraConfig and poolConfigs mergeable by
 switching option type to types.lines

---
 nixos/modules/services/web-servers/phpfpm.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-servers/phpfpm.nix b/nixos/modules/services/web-servers/phpfpm.nix
index 9be8390fb6ab..76ec41244627 100644
--- a/nixos/modules/services/web-servers/phpfpm.nix
+++ b/nixos/modules/services/web-servers/phpfpm.nix
@@ -24,7 +24,7 @@ in {
   options = {
     services.phpfpm = {
       extraConfig = mkOption {
-        type = types.str;
+        type = types.lines;
         default = "";
         description = ''
           Extra configuration that should be put in the global section of
@@ -36,7 +36,7 @@ in {
       };
 
       poolConfigs = mkOption {
-        type = types.attrsOf types.str;
+        type = types.attrsOf types.lines;
         default = {};
         example = {
           mypool = ''