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
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
    '';

    # Public domain + permissive (non-copyleft) licensing of some files.
-    license = "public domain";
+    license = stdenv.lib.licenses.publicDomain;

    homepage = http://people.csail.mit.edu/jaffer/SLIB;