Merge branch 'master.upstream' into staging.upstream

2015-07-01 13:38:17 -07:00
parent 05aa0c0990 87836a2a21
commit 7eae48871f
83 changed files with 894 additions and 219 deletions
--- a/pkgs/development/interpreters/nix-exec/default.nix
+++ b/pkgs/development/interpreters/nix-exec/default.nix
@@ -18,8 +18,6 @@ in stdenv.mkDerivation {

    license = stdenv.lib.licenses.mit;

-    maintainers = [ stdenv.lib.maintainers.shlevy ];
-
    platforms = nix.meta.platforms;
  };
 }