Peter Simons 0823aea0a6 Merge branch 'master' into stdenv-updates. ... 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.		2013-03-25 13:43:45 +01:00
..
audio	opus-tools: update	2013-03-20 20:28:39 +01:00
display-managers/slim
editors	Merge pull request #407 from maggesi/proofgeneral_updates	2013-03-25 03:33:21 -07:00
graphics	viewnior: Add viewnior, GTK image viewer program	2013-03-12 23:45:50 +04:00
misc	Merge branch 'master' into stdenv-updates.	2013-03-25 13:43:45 +01:00
networking	rsync: add meta.license attribute	2013-03-25 12:44:22 +01:00
office	koffice, kbluetooth: remove from hydra	2013-03-02 09:21:11 +01:00
science	wxmaxima: don't try to build this package on FreeBSD	2013-03-22 12:53:07 +01:00
taxes	add dutch tax application for 2012	2013-03-22 00:00:04 +01:00
version-management	Merge branch 'master' into stdenv-updates.	2013-03-25 13:43:45 +01:00
video	upgrade xbmc to 12.0	2013-03-12 01:35:16 +01:00
virtualization	Partially revert my recent kernelPackages changes	2013-03-24 07:45:00 -04:00
window-managers	Add myself as a maintainer to all Haskell packages (re-)generated by hackage4nix.	2013-03-23 15:58:14 +01:00