Vladimír Čunát 96cec2a7bd Merge 'staging' into multiple-outputs ... Conflicts: pkgs/applications/audio/flac/default.nix pkgs/build-support/gcc-wrapper/builder.sh pkgs/development/libraries/apr-util/default.nix pkgs/development/libraries/apr/default.nix pkgs/development/libraries/atk/default.nix pkgs/development/libraries/freetype/default.nix pkgs/development/libraries/gdk-pixbuf/default.nix pkgs/development/libraries/glib/default.nix pkgs/development/libraries/glibc/2.17/builder.sh pkgs/development/libraries/glibc/2.17/locales.nix pkgs/development/libraries/libjpeg/default.nix pkgs/development/libraries/libogg/default.nix pkgs/development/libraries/libsamplerate/default.nix pkgs/development/libraries/libtiff/default.nix pkgs/development/libraries/libvorbis/default.nix pkgs/development/libraries/mesa/default.nix pkgs/development/libraries/pango/default.nix pkgs/development/web/nodejs/default.nix pkgs/os-specific/linux/pam/default.nix pkgs/os-specific/linux/systemd/default.nix pkgs/stdenv/generic/setup.sh pkgs/stdenv/linux/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/release-small.nix		2014-08-23 16:04:53 +02:00
..
admin	tigervnc: upgrade to 1.3.1 security release	2014-08-15 14:37:22 +03:00
archivers	Update ZPAQ	2014-08-03 22:29:41 +04:00
audio	mpdcron: add expression	2014-05-23 08:39:28 +10:00
backup	obnam: Update from 1.6.1 to 1.8	2014-08-12 13:32:24 +02:00
bluetooth	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
cd-dvd	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
compression	Merge 'staging' into multiple-outputs	2014-08-23 16:04:53 +02:00
filesystems	ntfs3g: update to latest stable (2-year bump)	2014-08-16 18:47:20 +02:00
graphics	pngout: Create new package	2014-08-14 15:59:50 +02:00
inputmethods/fcitx	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
misc	Merge pull request #3693 from ruediger/add/colord-kde	2014-08-20 19:59:15 +02:00
networking	Merge 'staging' into multiple-outputs	2014-08-23 16:04:53 +02:00
package-management	nixUnstable: Update to nix-1.8pre3748_02843ba	2014-08-18 16:44:51 +02:00
security	rhash: new package	2014-08-21 00:46:35 +02:00
system	plan9port: fix eval (license typo)	2014-08-15 02:06:45 +02:00
text	silver-searcher: update from 0.21.0 to 0.24.1	2014-08-19 19:27:16 +02:00
typesetting	Merge 'staging' into multiple-outputs	2014-08-23 16:04:53 +02:00
video	Mark a bunch of packages as broken or not supported on Darwin	2014-08-08 17:59:02 +02:00
virtualization	ec2-ami-tools: Update from 1.4.0.9 to 1.5.3	2014-08-05 01:25:16 +02:00
X11	Mark a bunch of packages as broken or not supported on Darwin	2014-08-08 17:59:02 +02:00