nixpkgs/pkgs
Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
..
applications Merge branch 'master' into closure-size 2016-04-01 10:06:01 +02:00
build-support Merge branch 'master' into closure-size 2016-04-01 10:06:01 +02:00
data Merge branch 'master' into closure-size 2016-04-01 10:06:01 +02:00
desktops Merge branch 'master' into closure-size 2016-04-01 10:06:01 +02:00
development Merge branch 'master' into closure-size 2016-04-01 10:06:01 +02:00
games Merge branch 'master' into closure-size 2016-04-01 10:06:01 +02:00
misc Merge branch 'master' into closure-size 2016-04-01 10:06:01 +02:00
os-specific Merge branch 'master' into closure-size 2016-04-01 10:06:01 +02:00
servers Merge branch 'master' into closure-size 2016-04-01 10:06:01 +02:00
shells Merge branch 'master' into closure-size 2016-04-01 10:06:01 +02:00
stdenv Merge branch 'master' into closure-size 2016-04-01 10:06:01 +02:00
test Merge branch 'master' into closure-size 2016-04-01 10:06:01 +02:00
tools Merge branch 'master' into closure-size 2016-04-01 10:06:01 +02:00
top-level Merge branch 'master' into closure-size 2016-04-01 10:06:01 +02:00