Jude Taylor cb3e282cda unique host deps, otherwise we get 600000 char derivations

2015-07-08 14:15:03 -07:00

..

applications

Merge branch 'master.upstream' into staging.upstream

2015-07-08 14:11:16 -07:00

build-support

Merge branch 'master.upstream' into staging.upstream

2015-07-08 14:11:16 -07:00

data

Merge branch 'master.upstream' into staging.upstream

2015-07-08 14:11:16 -07:00

desktops

Merge branch 'master.upstream' into staging.upstream

2015-07-01 13:38:17 -07:00

development

Merge branch 'master.upstream' into staging.upstream

2015-07-08 14:11:16 -07:00

games

Merge branch 'master.upstream' into staging.upstream

2015-07-06 17:15:11 -07:00

misc

vimPlugins: change wombat256 source to github

2015-07-08 19:01:26 +12:00

os-specific

Merge branch 'master.upstream' into staging.upstream

2015-07-07 00:31:00 -07:00

servers

Merge branch 'master.upstream' into staging.upstream

2015-07-08 14:11:16 -07:00

shells

Merge branch 'master' into staging

2015-06-25 09:15:05 -05:00

stdenv

unique host deps, otherwise we get 600000 char derivations

2015-07-08 14:15:03 -07:00

test

…

tools

Merge branch 'master.upstream' into staging.upstream

2015-07-08 14:11:16 -07:00

top-level

Merge branch 'master.upstream' into staging.upstream

2015-07-08 14:11:16 -07:00