Skip to content
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

Nix 2.24 upgrade #1411

Merged
merged 6 commits into from
Oct 8, 2024
Merged

Nix 2.24 upgrade #1411

merged 6 commits into from
Oct 8, 2024

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented Sep 20, 2024

Probably now needs cherry-picking from #1388

@Mic92 Mic92 marked this pull request as draft September 20, 2024 07:22
@@ -1,5 +1,5 @@
bin_PROGRAMS = hydra-eval-jobs

hydra_eval_jobs_SOURCES = hydra-eval-jobs.cc
hydra_eval_jobs_LDADD = $(NIX_LIBS) -lnixcmd
hydra_eval_jobs_LDADD = $(NIX_LIBS) -lnixcmd -lnixflake
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am now thinking about making hydra-eval-jobs it's own derivation so that we can split the nix update over multiple pull requests.

Copy link
Member

@Ericson2314 Ericson2314 Sep 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That would be good for deduplicating with nix-eval-jobs too

#1315

Also hope we can convert hydra to Meson and then use subprojects to still support incremental builds of everything.

#1392

@Ericson2314
Copy link
Member

Now Hydra builds, but the tests fail :(

@Ericson2314
Copy link
Member

hydra-queue-runner: build-result.cc:118: BuildOutput getBuildOutput(nix::ref<nix::Store>, NarMemberDatas&, nix::OutputPathMap): Assertion `file != narMembers.end()' failed.

This seems to be the issue in the failing tests

@Ericson2314 Ericson2314 marked this pull request as ready for review October 7, 2024 16:11
@Ericson2314 Ericson2314 changed the title Nix 2.24 upgrade wip Nix 2.24 upgrade Oct 8, 2024
@Ericson2314 Ericson2314 merged commit c69e301 into master Oct 8, 2024
2 checks passed
@Ericson2314 Ericson2314 deleted the nix-2.24-upgrade-wip branch October 8, 2024 05:07
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants