-
-
Notifications
You must be signed in to change notification settings - Fork 310
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Use nix with updated nixpkgs, and fix for removal of internal JSON functionality #1265
Conversation
Flake lock file updates: • Updated input 'nix': 'github:NixOS/nix/eb9ce5f27bd83afff63f151406b497eab6e90a1a' (2022-09-15) → 'github:lheckemann/nix/9c90452f9d211ebac3657745283fae0f00e2bd71' (2022-11-29) • Updated input 'nix/nixpkgs': 'github:NixOS/nixpkgs/365e1b3a859281cf11b94f87231adeabbdd878a2' (2022-07-13) → 'github:NixOS/nixpkgs/1962d7bdca957fbb5ccc833da241f80e846f7625' (2022-11-29)
@@ -2,7 +2,7 @@ | |||
description = "A Nix-based continuous build system"; | |||
|
|||
inputs.nixpkgs.follows = "nix/nixpkgs"; | |||
inputs.nix.url = "github:NixOS/nix/2.11.0"; | |||
inputs.nix.url = "github:lheckemann/nix/nixpkgs-22.11"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you point this to 2.12.0?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it needs to be a branch with NixOS/nix#7367, so master
unless we backport that to the release branch?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
(IMO it would be nice to have a branch of hydra that always uses Nix master, along with at least one branch that uses a Nix release. I think I made an issue for this.)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The JSON changes break e.g. https://github.com/NixOS/nixos-org-configurations/blob/master/delft/prometheus/hydra-queue-runner-reexporter.py (which I'm also using on my instance) because machines
/machineTypes
/jobsets
are always null
.
Fixed in Ma27@a7561ef, feel free to cherry-pick this onto your branch :)
Implemented support for Nix 2.13 on my fork: Ma27@de16336 Note: this depends on NixOS/nix#7705 since perl bindings for hydra-eval-jobset would break on runtime otherwise. |
And also fix the parts that were broken
Draft, pending NixOS/nix#7367 and referring to Nix's master branch or a release containing the changes