From 4ac7b7d5deb4a2ccf291c1251ff7515f1ab17c82 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 11 Sep 2016 16:47:48 +0200 Subject: [PATCH] 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 Cc: @domenkozar Issue: #18209 --- nixos/modules/rename.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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.") ]; }