Re: [Nix-dev] Reminder about nixpkgs branches

2014-07-24 Thread Mathijs Kwik
Vladimír Čunát vcu...@gmail.com writes: Hi, it's not at all so bad as it used to be. Last year it happened we had ~10 months running stdenv-updates that was in the middle getting more and more breakages with added commits. That wasn't good and all agreed on that. I'm glad things currently

Re: [Nix-dev] Reminder about nixpkgs branches

2014-07-24 Thread Vladimír Čunát
On 07/23/2014 11:29 AM, Mathijs Kwik wrote: If stuff causes regressions, revert it and move it to a feature-branch to debug. Perhaps. I'm not very clear about that. Typically I first try to fix the regressions within days, if possible. Note that this revert+move workflow tends to hit a

Re: [Nix-dev] Reminder about nixpkgs branches

2014-07-24 Thread Mathnerd314
On Thu, Jul 24, 2014 at 12:52 PM, Vladimír Čunát vcu...@gmail.com wrote: On 07/23/2014 11:29 AM, Mathijs Kwik wrote: If stuff causes regressions, revert it and move it to a feature-branch to debug. Perhaps. I'm not very clear about that. Typically I first try to fix the regressions

Re: [Nix-dev] Reminder about nixpkgs branches

2014-07-24 Thread Eelco Dolstra
Hi, On 23/07/14 11:29, Mathijs Kwik wrote: - staging hasn't been merged for 2 weeks I don't think there were very urgent things that needed to be merged. Mostly some Mac OS X improvements. There are some build issues with Atlas (which is an inherently broken package anyway) and Clang on

Re: [Nix-dev] Reminder about nixpkgs branches

2014-07-24 Thread Eelco Dolstra
Hi, On 24/07/14 21:32, Mathnerd314 wrote: So let me describe a little of my recent activities. I wanted the firefox from https://github.com/NixOS/nixpkgs/commit/872860e6de8e460fb11a79c46b8092bdcff35da8, the quassel from ~/nixpkgs, and the rest of the system from the latest hydra channel; I

[Nix-dev] Reminder about nixpkgs branches

2014-07-23 Thread Mathijs Kwik
Some time ago, there was some discussion about stdenv-upgrades and similar long-living branches. I believe we decided: - we would like short-lived, single-issue branches, like: - glibc upgrade - changing the default gcc version. - new packages should just go into master - upgrades that will

Re: [Nix-dev] Reminder about nixpkgs branches

2014-07-23 Thread Vladimír Čunát
Hi, it's not at all so bad as it used to be. Last year it happened we had ~10 months running stdenv-updates that was in the middle getting more and more breakages with added commits. That wasn't good and all agreed on that. Extremely short (1 week) one-topic branches may seem ideal, but