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.25 #339

Merged
merged 17 commits into from
Nov 25, 2024
Merged

nix 2.25 #339

merged 17 commits into from
Nov 25, 2024

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented Nov 18, 2024

No description provided.

@Mic92 Mic92 force-pushed the nix-upgrade branch 4 times, most recently from 8033006 to a4921ad Compare November 18, 2024 18:56
src/drv.cc Outdated Show resolved Hide resolved
@Ericson2314
Copy link
Contributor

N.B., I think it would be prudent to get Hydra using nix-eval-jobs on Nix 2.24, since that version is likely to receive more backports for sake of 24.11. That is no reason not to merge this PR, however. Just it might mean that some future fix needed would be branched off the commit before this lands.

Comment on lines +4 to +5
// we need this include or otherwise we cannot instantiate std::optional
#include <nlohmann/json.hpp> //NOLINT(misc-include-cleaner)
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need to do this in drv.hh or drv.cc? I would think just the latter

Copy link
Member Author

Choose a reason for hiding this comment

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

If I drop it, clang-tidy gets really unhappy:

error: implicit instantiation of undefined template 'nlohmann::basic_json<>' [clang-diagnostic-error]

This is using

ninja clang-tidy

Copy link
Contributor

Choose a reason for hiding this comment

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

Oh, for Drv::meta, and implicit constructors

@Mic92
Copy link
Member Author

Mic92 commented Nov 25, 2024

I branched out https://github.com/nix-community/nix-eval-jobs/tree/release-2.24 for future nix 2.24 backports for hydra.

@Mic92 Mic92 force-pushed the nix-upgrade branch 3 times, most recently from bdf0778 to 1a612fb Compare November 25, 2024 23:22
@Mic92 Mic92 force-pushed the nix-upgrade branch 2 times, most recently from b8e93e7 to 61a970a Compare November 25, 2024 23:47
@Mic92
Copy link
Member Author

Mic92 commented Nov 25, 2024

@mergify queue

Copy link
Contributor

mergify bot commented Nov 25, 2024

queue

☑️ The pull request will automatically be requeued

Merge queue reset: an external action moved the base branch head to b29bf47

@Mic92 Mic92 merged commit b29bf47 into main Nov 25, 2024
16 of 17 checks passed
@Mic92 Mic92 deleted the nix-upgrade branch November 25, 2024 23:54
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