Hydra updates #160202
Hydra updates #160202
Conversation
Adds some new required deps too. Apply nixpkgs-fmt. Enable doCheck (tests). (cherry picked from commit 5898812)
This is a legacy of when a "stable" version of hydra existed, and this probably won't be coming back. This also removes some obsolete bits which have no effect on the result of evaluation. Unlike the original approach in NixOS#157072, we're moving the common expression to "unstable.nix" instead. This allow putting everything in one commit, satisfies git's rename detection, and remains bisectable. Co-Authored-By: Bernardo Meurer <[email protected]>
| @@ -17241,8 +17241,7 @@ with pkgs; | |||
|
|
|||
| hwloc = callPackage ../development/libraries/hwloc {}; | |||
|
|
|||
| inherit (callPackage ../development/tools/misc/hydra { }) | |||
| hydra-unstable; | |||
| hydra_unstable = callPackage ../development/tools/misc/hydra/unstable.nix { nix = nix_2_4; }; | |||
There was a problem hiding this comment.
nix_2_4 is now a forbidden alias to nixVersions.nix_2_4 (#156663).
There was a problem hiding this comment.
Is there a good reason to be using 2_4? I imagine this should just be the latest stable?
There was a problem hiding this comment.
This was before NixOS/hydra#1140 was merged, if we update the package accordingly it should be fine to use at least 2.6 if not 2.7.
There was a problem hiding this comment.
Currently compatible version is 2.6, until https://github.com/NixOS/hydra/pull/1171/files or some alternative is merged.
There was a problem hiding this comment.
hydra.nixos.org shows garbage collection problems with 2.5 and 2.6, so staying on 2.4 might be the better choice.
|
Gonna try and run this for a bit to see if it works as expected, ping me if you'd like to hear how it went :). I'm in favor of removing the multi-versioning, so 👍 from me on that one. IMO the commit history is clean enough, and I think this could be acceptable wrt the policy (but I'd recommend to check it if you don't have it fresh in your mind). |
|
Finally got this building (was having some issues with something nvidia related, not sure why it started building fine all of a sudden). Everything seems to be fine on first glance, started a rebuild of something and that seemed to work fine. No obvious issues otherwise. Will keep this running for a while and report back if I see anything problematic. Thanks for working on this! Edit: been running this for 6 days now and I haven't seen issues. So LGTM. |
|
There's a merge conflict that should be solved. |
|
Started rebasing: https://github.com/Mindavi/nixpkgs/tree/hydra-updates-2. Time's up for now, might look at this for a bit this evening. |
This PR combines changes from #157072, #152427, and a further update to a hydra commit from last week.
TODOs:
cc @Mindavi @dasJ who have agreed to be co-maintainers, @lovesegfault who opened the refactoring PR.
Closes #157072, closes #152427.