[Nix-dev] staging --> master merge imminent

[Eelco Dolstra]

Hi,

On 01/03/15 22:15, Lluís Batlle i Rossell wrote:

>>> If that commit could be merged into master, it would be nice. I'd be able to
>>> commit to master instead.
>>
>> We'd better wait a few days for Hydra to catch up a bit:
>> http://hydra.nixos.org/eval/1173079
> 
> A few days passed. I merged staging from the libsigsegv change. I didn't know
> next commits, so I thought better not to merge them.

That kind of defeats the purpose of the staging branch, which is to combine
"mass rebuild" changes. See here:

  http://comments.gmane.org/gmane.linux.distributions.nixos/13447

-- 
Eelco Dolstra | LogicBlox, Inc. | http://nixos.org/~eelco/