fde3526e7d
Conflict in kerberos, which was updated both in master and in stdenv-updates. Kept the stdenv-updates version, except pulled in the enableParallelBuilding change from master. Signed-off-by: Shea Levy <shea@shealevy.com> Conflicts: pkgs/development/libraries/kerberos/krb5.nix |
||
|---|---|---|
| .. | ||
| arduino | ||
| compilers | ||
| eclipse | ||
| guile-modules | ||
| interpreters | ||
| libraries | ||
| misc | ||
| mobile | ||
| ocaml-modules | ||
| perl-modules | ||
| python-modules | ||
| qtcreator | ||
| ruby-modules | ||
| tools | ||
| web | ||