flake.nix: Track hydra master branch #620
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The master branch has caught up with the patches we've been carrying for
the last 12 months or so. We also start following the nix-eval-jobs
version pinned in hydra, so that we stay compatible.
Flake lock file updates:
• Updated input 'hydra':
'github:NixOS/hydra/c3b6e7b425325b2ea65a0ed638c5913ac32d1a28' (2025-02-16)
→ 'github:NixOS/hydra/1c52c4c0ed596ea71de370562ed5af1604bd2183' (2025-04-07)
• Removed input 'hydra/libgit2'
• Updated input 'hydra/nix':
'github:NixOS/nix/a7fdef6858dd45b9d7bda7c92324c63faee7f509' (2024-09-19)
→ 'github:NixOS/nix/a4962f73b5fc874d4b16baef47921daf349addfc' (2025-04-07)
• Removed input 'hydra/nix/libgit2'
• Updated input 'hydra/nix-eval-jobs':
follows 'nix-eval-jobs'
→ 'github:nix-community/nix-eval-jobs/cba718bafe5dc1607c2b6761ecf53c641a6f3b21' (2025-04-07)
• Removed input 'nix-eval-jobs'
• Removed input 'nix-eval-jobs/flake-parts'
• Removed input 'nix-eval-jobs/flake-parts/nixpkgs-lib'
• Removed input 'nix-eval-jobs/nix-github-actions'
• Removed input 'nix-eval-jobs/nix-github-actions/nixpkgs'
• Removed input 'nix-eval-jobs/nixpkgs'
• Removed input 'nix-eval-jobs/treefmt-nix'
• Removed input 'nix-eval-jobs/treefmt-nix/nixpkgs'
|
|
@mweinelt can we avoid changing the version of Nix nix-option is built with temporarily? |
|
I'm not even sure how we're pulling it in, but we certainly try an overlay. |
|
And channel scripts as well: |
|
I guess Nix is put in the main package set by override, and that's just picking up a lot of collateral stuff. Maybe this will be easier after we finish scrambling for 25.05. |
|
that's done here https://github.com/NixOS/infra/blob/main/build/flake-module.nix#L15 Maybe it would be easier to maintain if we just change nix.package and the nix hydra is using. |
|
Good idea, @SuperSandro2000. Let's definitely consider doing that. |
commit 5d5e7ff4ad0749fbe03866d2dfab48c9fb6bbfbf (HEAD -> hydra-main)
Author: John Ericson <[email protected]>
Date: Tue Apr 8 13:30:25 2025 -0400
build: Pin nixos-channel-scripts to Nix 2.24
diff --git a/build/flake-module.nix b/build/flake-module.nix
index f3bd2d7..e0c425c 100644
--- a/build/flake-module.nix
+++ b/build/flake-module.nix
@@ -14,7 +14,17 @@ let
nixpkgs.overlays = [
inputs.nix.overlays.default
inputs.hydra.overlays.default
- inputs.nixos-channel-scripts.overlays.default
+ (
+ final: prev:
+ inputs.nixos-channel-scripts.overlays.default (
+ final
+ // {
+ # Doesn't yet work with Nix 2.28
+ # https://github.com/NixOS/nixos-channel-scripts/issues/79
+ nix = final.nixVersions.nix_2_24;
+ }
+ ) prev
+ )
inputs.rfc39.overlays.default
];
};Can't push, but this should fix |
|
Deployeed. |
Ericson2314
reviewed
Apr 9, 2025
Comment on lines
+17
to
+27
| ( | ||
| final: prev: | ||
| inputs.nixos-channel-scripts.overlays.default ( | ||
| final | ||
| // { | ||
| # Doesn't yet work with Nix 2.28 | ||
| # https://github.com/NixOS/nixos-channel-scripts/issues/79 | ||
| nix = final.nixVersions.nix_2_24; | ||
| } | ||
| ) prev | ||
| ) |
There was a problem hiding this comment.
NixOS/nixos-channel-scripts#80 so we can eventually revert this back as it was
Ericson2314
reviewed
Apr 9, 2025
Comment on lines
+18
to
+25
| nixpkgs.overlays = [ | ||
| (_prev: final: { | ||
| # fails to find nix-main against nix 2.28.x | ||
| # https://github.com/NixOS/infra/pull/620#issuecomment-2784979947 | ||
| nixos-option = final.nixos-option.override { nix = pkgs.nixVersions.nix_2_24; }; | ||
| }) | ||
| ]; | ||
|
|
There was a problem hiding this comment.
N.B. to the future: this can go away in 25.05 when nixos-option is just a script that shells out to Nix.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The master branch has caught up with the patches we've been carrying for the last 12 months or so. We also start following the nix-eval-jobs version pinned in hydra, so that we stay compatible.
Flake lock file updates: