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

Upgrade to Nix 2.19 #1314

Merged
merged 1 commit into from
Dec 1, 2023
Merged

Upgrade to Nix 2.19 #1314

merged 1 commit into from
Dec 1, 2023

Conversation

Ericson2314
Copy link
Member

Depends on #1308, which we should definitely merge first (and not skip a Nix release).

Flake lock file updates:

• Updated input 'nix':
    'github:NixOS/nix/f5f4de6a550327b4b1a06123c2e450f1b92c73b6' (2023-10-02)
  → 'github:NixOS/nix/50f8f1c8bc019a4c0fd098b9ac674b94cfc6af0d' (2023-11-27)
@Ericson2314 Ericson2314 marked this pull request as ready for review December 1, 2023 14:21
@Ericson2314 Ericson2314 changed the base branch from master to lazy-trees December 1, 2023 14:21
@Ericson2314 Ericson2314 changed the base branch from lazy-trees to master December 1, 2023 14:21
Comment on lines +267 to +275
ServeProto::ReadConn rconn {
.from = from,
.version = remoteVersion,
};
ServeProto::WriteConn wconn {
.to = to,
.version = remoteVersion,
};

Copy link
Member Author

Choose a reason for hiding this comment

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

Moved down because we don't know the versions until after the handshake

Comment on lines +72 to +76
void isExecutable() override
{ }

void closeRegularFile() override
{ }
Copy link
Member Author

Choose a reason for hiding this comment

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

These when from being such empty functions in the interface to = 0 virtual pure ones, so putting the old do-nothing implementations here.

@edolstra edolstra merged commit f216bce into NixOS:master Dec 1, 2023
1 check passed
@Ericson2314 Ericson2314 deleted the 2.19 branch December 12, 2023 15:46
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