update flake and rust dependencies #317
Conversation
|
The only skipped dependency is |
|
Tested the PR locally, works fine. No regression appears to be present. |
This a naive update with minor adjustements for new APIs. Most changes are clap related because their macro naming has changed.
Extend ast handling for nodename with dots, see serokell#307
|
After an hour on a builder, nixos vm test failed, seems like activation CLI needs some more work: |
There was a problem hiding this comment.
Hey, I have debugged the issue with the tests.
Since you bumped the nixpkgs version, this commit removes the switch-to-configuration script by default.
We should enable this option in the common config because the test VMs need to have the new rust script in path (since they cannot fetch it while being run)
…loys [This](NixOS/nixpkgs@4cfbbb3) commit has disabled the option by default, but we need the `switch-to-configuration` binary in order to successfully deploy to the server
Fix tests + overlays output
|
@rvem the build failures for on the |
|
Yeah, I just noticed that after introducing the same fixes there 😅 |
| @@ -16,9 +16,8 @@ | |||
| }; | |||
|
|
|||
| outputs = { self, nixpkgs, utils, ... }@inputs: | |||
| rec { | |||
| overlay = final: prev: let | |||
There was a problem hiding this comment.
Can we preserve the overlay output for the sake of backward compatibility?
Just leave it as overlay = overlays.default
There was a problem hiding this comment.
Perhaps, with a warning, saying that this output will be removed in the future
| @@ -231,6 +231,7 @@ pub fn parse_flake(flake: &str) -> Result<DeployFlake, ParseFlakeError> { | |||
|
|
|||
| Some(c.into_token().unwrap().text().to_string()) | |||
| } | |||
| (NODE_SELECT, _) => Some(entry.into_node().unwrap().text().to_string()), | |||
There was a problem hiding this comment.
Could you add a test case with the node that has . in the name?
There was a problem hiding this comment.
Hmm, I tried, to add local.server to the node attrset and deploy it with deploy -s .#local.server, and got
vm-test-run-node-name-with-dot> client # error: attribute 'profiles' missing
vm-test-run-node-name-with-dot> client # at «string»:7:40:
vm-test-run-node-name-with-dot> client # 6| profiles = {
vm-test-run-node-name-with-dot> client # 7| inherit (deploy.nodes."local".profiles) "server";
vm-test-run-node-name-with-dot> client # | ^
vm-test-run-node-name-with-dot> client # 8| };
See 24977dc
There was a problem hiding this comment.
When I took a look at the issue at hand, deploy-rs parses the flake uri as <path>#<node>.<profile> and therefore it is not accepted (take a look at the tests for this function). In this case we try to deploy the node local with the profile server. The README contains examples for this issue. If you try to deploy local.server as the node you have to use .#"local.server" as specified in the README. Therefore, it is not accepted by design.
There was a problem hiding this comment.
In my opinion 0c2b81d should be reverted
This is a naive update with minor adjustments for new APIs. Most changes are clap related because their macro naming has changed.