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
@@ -47,10 +47,9 @@ stdenv.mkDerivation rec {
    homepage = http://sourceware.org/libffi/;

    # See http://github.com/atgreen/libffi/blob/master/LICENSE .
-    license = "free, non-copyleft";
+    license = stdenv.lib.licenses.free;

    maintainers = [ stdenv.lib.maintainers.ludo ];
    platforms = stdenv.lib.platforms.all;
  };
 }
-