Merge remote-tracking branch 'central/master' into stdenv-updates

Conflicts: pkgs/os-specific/linux/alsa-utils/default.nix
2013-01-27 11:32:12 +01:00
parent 0214514f8b bff4b06640
commit 3b26ba7019
38 changed files with 283 additions and 74 deletions
@@ -41,7 +41,7 @@ let
        # Add a utility function to produce derivations that use this
        # stdenv and its shell.
        mkDerivation = attrs:
-          if !allowUnfree && attrs.meta.license or "" == "unfree" then
+          if !allowUnfree && (let l = attrs.meta.license or ""; in l == "unfree" || l == "unfree-redistributable") then
            throw "package ‘${attrs.name}’ has an unfree license, refusing to evaluate"
          else
          (derivation (