about summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2016-09-11 16:47:48 +0200
committeraszlig <aszlig@redmoonstudios.org>2016-09-11 16:51:20 +0200
commit4ac7b7d5deb4a2ccf291c1251ff7515f1ab17c82 (patch)
treee2752d944417461ac599f48d9e18e108a1f72988 /nixos
parent2b0eace6cf021eed7123fb828483a00c95796829 (diff)
downloadnixlib-4ac7b7d5deb4a2ccf291c1251ff7515f1ab17c82.tar
nixlib-4ac7b7d5deb4a2ccf291c1251ff7515f1ab17c82.tar.gz
nixlib-4ac7b7d5deb4a2ccf291c1251ff7515f1ab17c82.tar.bz2
nixlib-4ac7b7d5deb4a2ccf291c1251ff7515f1ab17c82.tar.lz
nixlib-4ac7b7d5deb4a2ccf291c1251ff7515f1ab17c82.tar.xz
nixlib-4ac7b7d5deb4a2ccf291c1251ff7515f1ab17c82.tar.zst
nixlib-4ac7b7d5deb4a2ccf291c1251ff7515f1ab17c82.zip
nixos/modules/rename: Remove docker-registry
This is a follow-up to 9c1cdedcba2fd5233c71f0988d2eb725cc8f32ad and
fed3501b0722e187284f9f6e1532f5b6e0572d6e.

Discussion:

https://github.com/NixOS/nixpkgs/issues/18209#issuecomment-245968857

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Cc: @domenkozar
Issue: #18209
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/rename.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index 412cccc20d58..34b9724442eb 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -15,7 +15,6 @@ with lib;
     (mkRenamedOptionModule [ "networking" "enableRT73Firmware" ] [ "networking" "enableRalinkFirmware" ])
 
     (mkRenamedOptionModule [ "services" "cadvisor" "host" ] [ "services" "cadvisor" "listenAddress" ])
-    (mkRenamedOptionModule [ "services" "dockerRegistry" "host" ] [ "services" "dockerRegistry" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "elasticsearch" "host" ] [ "services" "elasticsearch" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "graphite" "api" "host" ] [ "services" "graphite" "api" "listenAddress" ])
     (mkRenamedOptionModule [ "services" "graphite" "web" "host" ] [ "services" "graphite" "web" "listenAddress" ])
@@ -154,5 +153,7 @@ with lib;
       "See the 16.03 release notes for more information.")
     (mkRemovedOptionModule [ "services" "phpfpm" "phpIni" ] "")
     (mkRemovedOptionModule [ "services" "dovecot2" "package" ] "")
+    (mkRemovedOptionModule [ "services" "dockerRegistry" ]
+      "docker-registry has been deprecated upstream since a long time.")
   ];
 }