Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size ...

Let's get rid of those merge conflicts.

2016-02-03 16:57:19 +01:00

..

builder.sh

stdenv: Statically include the default build inputs

2014-11-06 12:10:28 +01:00

default-builder.sh

* "." -> "source".

2005-12-05 14:11:09 +00:00

default.nix

Merge branch 'staging' into closure-size

2016-01-19 09:55:31 +01:00

setup.sh

Merge recent 'staging' into closure-size

2016-02-03 16:57:19 +01:00