Merge branch 'master' into stdenv-updates.

2013-01-04 21:00:53 +01:00
parent 7505cb5f9a 440bc6ec2a
commit 9e9cd7b529
80 changed files with 1022 additions and 222 deletions
@@ -11,7 +11,7 @@ with import ./trivial.nix;
 rec {

  hasType = x: isAttrs x && x ? _type;
-  typeOf = x: if hasType x then x._type else "";
+  typeOf = x: x._type or "";

  setType = typeName: value: value // {
    _type = typeName;