Vladimír Čunát e740b565cf Merge master into stdenv-updates ...

Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix

2013-12-29 10:01:22 +01:00

..

admin

Merge master into x-updates

2013-12-02 21:41:16 +01:00

archivers

Merge branch 'origin/master' into stdenv-updates.

2013-12-16 21:13:24 +01:00

audio

pa_applet: work around a build problem

2013-12-10 13:41:20 +01:00

backup

obnam: Update to 1.6

2013-12-18 16:21:47 +01:00

bluetooth

update obexftp, required for new openobex

2013-08-28 21:20:56 +02:00

cd-dvd

xorriso: add missing attr dependency

2013-12-21 02:28:26 +02:00

compression

Merge master into stdenv-updates

2013-12-29 10:01:22 +01:00

filesystems

Merge master into stdenv-updates

2013-12-29 10:01:22 +01:00

graphics

netpbm: fix CVE-2005-2471

2013-12-25 11:11:59 +01:00

inputmethods/fcitx

fcitx: update to 4.2.8.3

2013-09-28 19:44:52 +08:00

misc

Merge master into stdenv-updates

2013-12-29 10:01:22 +01:00

networking

Merge master into stdenv-updates

2013-12-29 10:01:22 +01:00

package-management

cabal-install: jailbreak version 1.18.0.2 to fix the build with GHC 7.7 or later

2013-12-03 22:23:21 +01:00

security

gnupg1: update to version 1.4.16

2013-12-19 17:20:53 +01:00

system

Upgrade rsyslog to latest stable, 7.4.7. Include systemd journal support.

2013-12-23 17:42:20 +01:00

text

Merge master into stdenv-updates

2013-12-29 10:01:22 +01:00

typesetting

docbook2odf: new package

2013-12-20 12:25:57 +01:00

video

swfmill: update from 0.3.2 to 0.3.3

2013-12-21 02:28:26 +02:00

virtualization

nixos.org/tarballs -> tarballs.nixos.org

2013-06-25 14:12:16 +02:00

X11

Merge x-updates

2013-12-25 23:56:41 +01:00