From fd803fce606a007403ba6d05f09ed2e6a3371830 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Thu, 22 Aug 2013 09:45:22 +0300
Subject: [PATCH] List should be an alias of listOf, and it should no longer be
 used. Add deprecation notice to list. Nixos has already been ported from list
 to listOf (8b2256686b4082f8ce6f8f61cba1eb6c1e786471).

---
 pkgs/lib/types.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/lib/types.nix b/pkgs/lib/types.nix
index f268580d783a..b62c08f3af51 100644
--- a/pkgs/lib/types.nix
+++ b/pkgs/lib/types.nix
@@ -96,8 +96,10 @@ rec {
       check = lib.traceValIfNot (x: builtins.unsafeDiscardStringContext (builtins.substring 0 1 (toString x)) == "/");
     };
 
-    listOf = types.list;
-    list = elemType: mkOptionType {
+    # drop this in the future:
+    list = builtins.trace "types.list is deprecated, use types.listOf instead" types.listOf;
+
+    listOf = elemType: mkOptionType { 
       name = "list of ${elemType.name}s";
       check = value: lib.traceValIfNot isList value && all elemType.check value;
       merge = concatLists;