Dario Bertini 1c87fd82d4 Fix python-packages.nix conflict ... Merge remote-tracking branch 'origin/master' into ansible-win		2015-06-15 19:41:30 +01:00
..
applications	Merge pull request #8323 from ftrvxmtrx/mpg123-1.22.2	2015-06-15 18:24:54 +02:00
build-support	imagemagick: remove mirrors that don't work	2015-06-15 11:30:28 +02:00
data	geolite-legacy -> 2015-06-15	2015-06-15 19:58:20 +02:00
desktops	gnome3: also pass self to overridePackages function	2015-06-15 11:52:26 +02:00
development	Merge pull request #8298 from abbradar/r-updates	2015-06-15 20:31:57 +02:00
games	Add Tales of Maj'eyal game.	2015-06-14 17:44:38 +01:00
misc	hplip 3.15.4 -> 3.15.6	2015-06-13 16:14:40 +02:00
os-specific	linux-testing: 4.1-rc7 -> 4.1-rc8	2015-06-15 11:37:05 -07:00
servers	tomcat-connectors: update from 1.2.40 to 1.2.41-dev, fixes CVE-2014-8111	2015-06-15 11:07:02 +02:00
shells	zsh: update from 5.0.7 to 5.0.8	2015-06-08 12:55:38 +02:00
stdenv	Revert "curl: Modernize build"	2015-06-04 14:54:52 +02:00
test
tools	Fix python-packages.nix conflict	2015-06-15 19:41:30 +01:00
top-level	Fix python-packages.nix conflict	2015-06-15 19:41:30 +01:00