Vladimír Čunát 9443129b08 Merge master into stdenv-updates ...

Conflicts:
	pkgs/development/libraries/glibc/2.18/common.nix (take stdenv-updates)
	pkgs/misc/emulators/zsnes/default.nix (more complex, build tested)
	pkgs/top-level/all-packages.nix (auto-solved)

2014-01-04 18:34:53 +01:00

..

applications

Merge master into stdenv-updates

2014-01-04 18:34:53 +01:00

build-support

Merge master into stdenv-updates

2014-01-04 18:34:53 +01:00

data

Whitespace fixes in package expressions I maintain

2014-01-02 17:58:08 +01:00

desktops

Remove uses of __overrides feature

2013-12-30 11:04:45 -05:00

development

Merge master into stdenv-updates

2014-01-04 18:34:53 +01:00

games

Merge master into stdenv-updates

2014-01-04 18:34:53 +01:00

misc

Merge master into stdenv-updates

2014-01-04 18:34:53 +01:00

os-specific

Merge pull request #1380 from offlinehacker/pkgs/ati-drivers/fix_download

2014-01-03 03:40:36 -08:00

servers

Merge master into stdenv-updates

2014-01-04 18:34:53 +01:00

shells

Merge master into stdenv-updates

2013-12-29 10:01:22 +01:00

stdenv

stdenv/setup.sh: fix breakage when shebang contains '\'

2014-01-03 14:47:39 +01:00

test

…

tools

Merge master into stdenv-updates

2014-01-04 18:34:53 +01:00

top-level

Merge master into stdenv-updates

2014-01-04 18:34:53 +01:00