Skip to content

rnix-lsp: use nix (2.4)#145237

Merged
Ma27 merged 1 commit intoNixOS:masterfrom
lovesegfault:rnix-lsp-nix-stable
Nov 15, 2021
Merged

rnix-lsp: use nix (2.4)#145237
Ma27 merged 1 commit intoNixOS:masterfrom
lovesegfault:rnix-lsp-nix-stable

Conversation

@lovesegfault
Copy link
Copy Markdown
Member

Motivation for this change

Follow-up to #144197 since nixUnstable is no longer needed for flake
support.

cc. ma27 to make sure this is OK

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 21.11 Release Notes (or backporting 21.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Follow-up to NixOS#144197 since nixUnstable is no longer needed for flake
support.
@ofborg ofborg bot requested a review from Ma27 November 9, 2021 19:50
@ofborg ofborg bot added 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Nov 9, 2021
@SuperSandro2000
Copy link
Copy Markdown
Member

Does rnix-lsp exec nix somewhere and gets confused by warnings about new settings?

@Ma27
Copy link
Copy Markdown
Member

Ma27 commented Nov 9, 2021

We use nix __dump-builtins to provide builtins-completions, but this is optional (i.e. a hard-coded list of builtins is used if Nix 2.3 is in use, but no arg names or documentation is available in the completion then). In the end rnix-lsp should (and does) use the system-wide Nix.

We only need this for the tests to work fine.

@lovesegfault
Copy link
Copy Markdown
Member Author

We use nix __dump-builtins to provide builtins-completions, but this is optional (i.e. a hard-coded list of builtins is used if Nix 2.3 is in use, but no arg names or documentation is available in the completion then). In the end rnix-lsp should (and does) use the system-wide Nix.

We only need this for the tests to work fine.

@Ma27 should I merge this?

@Ma27
Copy link
Copy Markdown
Member

Ma27 commented Nov 15, 2021

Yes, this doesn't have any implications on the runtime anyways.

@Ma27 Ma27 merged commit 80de0b9 into NixOS:master Nov 15, 2021
@lovesegfault lovesegfault deleted the rnix-lsp-nix-stable branch November 15, 2021 20:47
@tomberek tomberek mentioned this pull request Nov 26, 2021
10 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants