From 5f1ad293407ee82998a62ce93130f93ba9249f89 Mon Sep 17 00:00:00 2001
From: Mathijs Kwik <mathijs@bluescreen303.nl>
Date: Tue, 5 Jun 2018 11:26:02 +0200
Subject: [PATCH] nixos/docker-registry: allow nested config options

for example:

services.dockerRegistry = {
    enable = true;
    extraConfig = {
        http = {
            host = "https://${config.networking.hostName}:5000";

            tls = {
                certificate = "${registry-tls}/snakeoil.pem";
                key = "${registry-tls}/snakeoil.key";
            };
        };
    };
};
---
 nixos/modules/services/misc/docker-registry.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix
index 45931cb42b5..fe0a8e58de3 100644
--- a/nixos/modules/services/misc/docker-registry.nix
+++ b/nixos/modules/services/misc/docker-registry.nix
@@ -42,7 +42,7 @@ let
     };
   };
 
-  configFile = pkgs.writeText "docker-registry-config.yml" (builtins.toJSON (registryConfig // cfg.extraConfig));
+  configFile = pkgs.writeText "docker-registry-config.yml" (builtins.toJSON (recursiveUpdate registryConfig cfg.extraConfig));
 
 in {
   options.services.dockerRegistry = {
@@ -91,7 +91,7 @@ in {
         Docker extra registry configuration via environment variables.
       '';
       default = {};
-      type = types.attrsOf types.str;
+      type = types.attrs;
     };
 
     enableGarbageCollect = mkEnableOption "garbage collect";