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 |
||
---|---|---|
.. | ||
acl2 | ||
angelscript | ||
clisp | ||
clojure | ||
cython | ||
dart | ||
erlang | ||
falcon | ||
groovy | ||
guile | ||
hiphopvm | ||
io | ||
j | ||
jruby | ||
kaffe | ||
kona | ||
love | ||
lua-4 | ||
lua-5 | ||
maude | ||
octave | ||
perl | ||
php | ||
php-xdebug | ||
picolisp | ||
pure | ||
pyrex | ||
python | ||
r-lang | ||
racket | ||
regina | ||
ruby | ||
scsh | ||
spidermonkey | ||
tcl |