[Nix-dev] Re: Merging fix-style branch into the trunk ?

[Nicolas Pierron]

Hello,

On Thu, Feb 26, 2009 at 13:21, Ludovic Courtès <ludo at gnu.org> wrote:
>> On Tue, Feb 24, 2009 at 10:00, Ludovic Courtès <ludo at gnu.org> wrote:
>> First all snippet are collected in an unknown order and they are
>> sorted by looking at their dependencies.
>
> I guess sorting is handled by `mergedTypedOption' in
> `activate-configuration.nix', right?  If so, can you explain how it ends
> up sorting in the order you mention?

No, the sort is realized by the apply function when building the
script attribute. (textClosure function)

> Side note: shm support appears to be missing in the `fix-style' branch.
> My concern is that other changes made in `trunk' may be missing as well.

I may have miss this patch, I will try to add it on this week-end.

>>> How about the activation script itself and other "side changes"?  I
>>> would find it easier if we could selectively merge what we want rather
>>> that one large chunk of assorted changes.
>>
>> You are free to try
>
> Yes I am, but the change appears to be pretty big, mixing interesting
> but unrelated modifications.  Would it be possible for you to
> cherry-pick only the Upstart job changes to start with?  Then we could
> consider the activation script changes separately.

Unfortunately, the status is currently badly entangled, so we may be
able to reproduce the modification on the trunk but only by following
the same order, otherwise this could became tricky.

-- 
Nicolas Pierron
http://www.linkedin.com/in/nicolasbpierron
- If you are doing something twice then you should try to do it once.