Vladimír Čunát c05d829598 Merge branch 'staging'

2016-06-22 10:49:56 +02:00

..

applications

Merge branch 'staging'

2016-06-22 10:49:56 +02:00

build-support

Merge branch 'staging'

2016-06-22 10:49:56 +02:00

data

Merge branch 'staging'

2016-06-22 10:49:56 +02:00

desktops

Merge branch 'staging'

2016-06-22 10:49:56 +02:00

development

Merge branch 'staging'

2016-06-22 10:49:56 +02:00

games

Merge branch 'staging'

2016-06-22 10:49:56 +02:00

misc

Merge branch 'staging'

2016-06-22 10:49:56 +02:00

os-specific

Merge branch 'staging'

2016-06-22 10:49:56 +02:00

servers

Merge branch 'staging'

2016-06-22 10:49:56 +02:00

shells

pythonPackages.prompt_toolkit: move pygments to propagatedBuildInputs

2016-06-20 13:41:05 +02:00

stdenv

Merge branch 'staging'

2016-06-22 10:49:56 +02:00

test

Remove cruft

2016-04-26 17:31:54 +02:00

tools

Merge branch 'staging'

2016-06-22 10:49:56 +02:00

top-level

Replace ./../* with ../* in Nix expressions (#16414)

2016-06-22 10:39:50 +02:00