Merge branch 'origin/master' into stdenv.

This commit is contained in:
Peter Simons
2013-08-17 10:00:16 +02:00
138 changed files with 149 additions and 147 deletions
@@ -84,7 +84,7 @@ EOF
license = "APLv2";
maintainers = [ stdenv.lib.maintainers.ludo ];
maintainers = [ ];
platforms = stdenv.lib.platforms.gnu; # arbitrary choice
};
}
@@ -80,7 +80,7 @@ buildPythonPackage (rec {
in code.
'';
maintainers = with maintainers; [ ludo bjornfor ];
maintainers = with maintainers; [ bjornfor ];
platforms = platforms.all;
};
})