Vladimír Čunát 1e389c976c merge 'staging' into modular-stdenv ...

In 2c62a36b77 the messages in pkgs/stdenv/generic/default.nix
were not merged correctly.

Conflicts:
	pkgs/stdenv/generic/default.nix

2014-09-08 18:16:54 +02:00

..

applications

merge 'staging' into modular-stdenv

2014-09-08 18:16:54 +02:00

build-support

merge 'staging' into modular-stdenv

2014-09-08 18:16:54 +02:00

data

Merge pull request #3211 from ttuegel/adobe-fonts

2014-08-08 21:52:59 +02:00

desktops

merge 'staging' into modular-stdenv

2014-09-08 18:16:54 +02:00

development

merge 'staging' into modular-stdenv

2014-09-08 18:16:54 +02:00

games

haskell-Allure: add version 0.4.99.0

2014-08-12 12:37:44 +02:00

misc

Mednafen: update to 0.9.36.3

2014-08-14 11:20:25 -03:00

os-specific

merge 'staging' into modular-stdenv

2014-09-08 18:16:54 +02:00

servers

Add taskserver package (close #3269)

2014-08-15 00:28:41 +02:00

shells

Merge 'staging' into master

2014-08-08 20:13:23 +02:00

stdenv

merge 'staging' into modular-stdenv

2014-09-08 18:16:54 +02:00

test

…

tools

merge 'staging' into modular-stdenv

2014-09-08 18:16:54 +02:00

top-level

merge 'staging' into modular-stdenv

2014-09-08 18:16:54 +02:00