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
This update roughly includes the following changes:
* Spanish es-ES translation
* New configuration option: print.empty.columns
* Much improved Asian character support
* More virtual tags
* Improved bash completion
* Task modification time
* Stats show blocked and blocking tasks
* New 'blocking' report
* Additional color rules
* New helper commands for third-party tools
* 'columns' command searchable
* New date shortcuts 'socm' and 'eocm'
* Improved push/pull messages
For a full list of changes, please head over to:
http://taskwarrior.org/projects/taskwarrior/wiki/Changelog
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
pitz is a distributed bug tracker, inspired by ditz. Homepage:
http://pitz.tplus1.com/
pitz has a command line interface, pitz-<command>, and a webapp,
pitz-webapp.
TODO: pitz has a pitz-shell utility that depends on ipython, but when I
enabled it it raised an exception. I think it depends on an old IPython
version:
from IPython.Shell import IPShellEmbed
ImportError: No module named Shell
A broken pitz-shell doesn't affect the rest of the command line
interface nor the webapp, so it is not critical to have it working.
There are not many distributed bug trackers out there, so I hope that
adding pitz to nixpkgs may inspire people to support pitz (or similar
software).
FFMPEG support allows a greater variety of export and import options.
SNDFILE support allows WAV and other sound file formats to be used.
JACK support allows blender to be used with XJadeo, Ardour or any other JACK away audio editor.
Conflicts:
pkgs/development/libraries/libxslt/default.nix
Commit 1764ea2b0a introduced changes to libxslt
in an awkward way to avoid re-builds on Linux. This patch has been simplified
during this merge.
Conflicts:
pkgs/applications/networking/browsers/chromium/default.nix
pkgs/top-level/all-packages.nix
Merge conflicts seemed trivial, but a look from viric and aszlig would be nice.
