philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
nixpkgs/pkgs
History
Vladimír Čunát 5979d428b4 Merge recent master into x-updates 
Hydra: ?compare=1134869

Conflicts (just meta):
	pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix
2014-07-09 22:13:29 +02:00
..
applications Merge recent master into x-updates 2014-07-09 22:13:29 +02:00
build-support Simplify php-packages.nix 2014-07-03 11:01:19 -04:00
data Allow auto-updating of the AnonymousPro font 2014-07-01 12:20:04 +04:00
desktops Merge recent master into x-updates 2014-07-09 22:13:29 +02:00
development Merge recent master into x-updates 2014-07-09 22:13:29 +02:00
games qt3, graphicsmagick137, fox, neverball: fix build 2014-07-09 21:52:04 +02:00
misc maven: update from 3.0.4 to 3.1.1, potentially fixes CVE-2013-0253 2014-07-04 21:45:30 +04:00
os-specific Merge recent master into x-updates 2014-07-09 22:13:29 +02:00
servers Merge recent master into x-updates 2014-07-09 22:13:29 +02:00
shells fish: fix 'fish_config' by providing python ncurses module 2014-06-30 20:39:02 +02:00
stdenv
test
tools Packaging plasma-nm and its dependencies 2014-07-05 13:54:01 +02:00
top-level Merge recent master into x-updates 2014-07-09 22:13:29 +02:00