Vladimír Čunát eb2e46aab2 Merge branch 'master' into x-updates ...

Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix

2013-04-04 21:43:40 +02:00

..

applications

Merge branch 'master' into x-updates

2013-04-04 21:43:40 +02:00

build-support

- fetchbzr and nix-prefetch-bzr now only export, instead of cloning

2013-03-31 19:16:18 -07:00

data

Merge branch 'master' into x-updates

2013-04-04 21:43:40 +02:00

desktops

gtk3: core platform update (versions from GNOME 3.8)

2013-03-29 02:22:29 +01:00

development

Merge branch 'master' into x-updates

2013-04-04 21:43:40 +02:00

games

Merge branch 'master' into x-updates

2013-04-04 21:43:40 +02:00

lib

Merge branch 'master' into x-updates

2013-04-04 21:43:40 +02:00

misc

Merge branch 'master' into x-updates

2013-04-04 21:43:40 +02:00

os-specific

Merge branch 'master' into x-updates

2013-04-04 21:43:40 +02:00

servers

postgresql: Update to latest versions

2013-04-04 15:45:48 +02:00

shells

ipython: modularize and enable more features

2013-03-27 15:39:03 +01:00

stdenv

Add the addPassthru library function

2013-03-24 08:29:10 -04:00

test

…

tools

Merge branch 'master' into x-updates

2013-04-04 21:43:40 +02:00

top-level

Merge branch 'master' into x-updates

2013-04-04 21:43:40 +02:00