Merge remote-tracking branch 'origin/master' into staging

Conflicts: pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
parent c964077200 782a12e450
commit 0518ccf5af
232 changed files with 3422 additions and 1035 deletions
--- a/pkgs/development/libraries/boost/generic.nix
+++ b/pkgs/development/libraries/boost/generic.nix
@@ -110,7 +110,7 @@ stdenv.mkDerivation {
  meta = {
    homepage = "http://boost.org/";
    description = "Collection of C++ libraries";
-    license = "boost-license";
+    license = stdenv.lib.licenses.boost;

    platforms = platforms.unix;
    maintainers = with maintainers; [ simons wkennington ];