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

kak-lsp: 8.0.0 -> 9.0.0 #110663

Merged
merged 1 commit into from Feb 21, 2021
Merged

kak-lsp: 8.0.0 -> 9.0.0 #110663

merged 1 commit into from Feb 21, 2021

Conversation

wahjava
Copy link
Contributor

@wahjava wahjava commented Jan 24, 2021

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@wahjava
Copy link
Contributor Author

wahjava commented Jan 24, 2021

Thanks for pointing to PR #108363. It seems kak-lsp is already part of nixpkgs, just not part of kakounePlugins, where I was expecting it to be present. I will submit a new diff to update existing derivation instead. Should I open a new PR, or overwrite this one ?

@SuperSandro2000
Copy link
Member

Should I open a new PR, or overwrite this one ?

Overwriting and changing the title would be fine for me.

@wahjava wahjava changed the title kakounePlugins.kak-lsp: init at 9.0.0 kak-lsp: 8.0.0 -> 9.0.0 Jan 25, 2021
@wahjava
Copy link
Contributor Author

wahjava commented Jan 25, 2021

Should I open a new PR, or overwrite this one ?

Overwriting and changing the title would be fine for me.

Pushed, thanks!

@Flakebi
Copy link
Member

Flakebi commented Jan 25, 2021

Can you reuse the top-level kak-lsp package like it is done for parinfer-rust and rep?

@wahjava
Copy link
Contributor Author

wahjava commented Jan 26, 2021

Can you reuse the top-level kak-lsp package like it is done for parinfer-rust and rep?

Sorry, I'm confused. This PR (the latest commit) changes the file pkgs/tools/misc/kak-lsp/default.nix and that file is already referenced in pkgs/top-level/all-packages.nix. If this is not what you expect, then could you please elaborate ?

Thanks!

@Flakebi
Copy link
Member

Flakebi commented Jan 26, 2021

The change to pkgs/tools/misc/kak-lsp/default.nix looks good, thanks for the update.

You add the same file again at pkgs/applications/editors/kakoune/plugins/kak-lsp.nix, which is not necessary.
You can add kak-lsp to kakounePlugins with inherit kak-lsp; in the beginning of pkgs/applications/editors/kakoune/plugins/default.nix (just add it to the list of inherit parinfer-rust rep; and to the package inputs in the first line).
inherit pkgname; is equivalent to pkgname = pkgname;: It adds an attribute with the same name as a variable from the current scope.

@wahjava
Copy link
Contributor Author

wahjava commented Jan 26, 2021

The change to pkgs/tools/misc/kak-lsp/default.nix looks good, thanks for the update.

You add the same file again at pkgs/applications/editors/kakoune/plugins/kak-lsp.nix, which is not necessary.
You can add kak-lsp to kakounePlugins with inherit kak-lsp; in the beginning of pkgs/applications/editors/kakoune/plugins/default.nix (just add it to the list of inherit parinfer-rust rep; and to the package inputs in the first line).
inherit pkgname; is equivalent to pkgname = pkgname;: It adds an attribute with the same name as a variable from the current scope.

Sorry, I missed the fact that I pushed my commit on the top of existing. Thanks for pointing out. Pushed again, and now there is only one commit containing both changes. Let me know if you like me to split into two commits in this same PR.

@Flakebi
Copy link
Member

Flakebi commented Jan 26, 2021

You need to add kak-lsp to the arguments, otherwise it will not be found.

error: --- UndefinedVarError ----------------------------------------------------------------------------------------------------------- nix-env
at: (3:2) in file: /home/sebi/.cache/nixpkgs-review/pr-110663/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix

     2|
     3| {
      |  ^
     4|   inherit parinfer-rust rep kak-lsp;

undefined variable 'kak-lsp'

@wahjava
Copy link
Contributor Author

wahjava commented Jan 26, 2021

You need to add kak-lsp to the arguments, otherwise it will not be found.

error: --- UndefinedVarError ----------------------------------------------------------------------------------------------------------- nix-env
at: (3:2) in file: /home/sebi/.cache/nixpkgs-review/pr-110663/nixpkgs/pkgs/applications/editors/kakoune/plugins/default.nix

     2|
     3| {
      |  ^
     4|   inherit parinfer-rust rep kak-lsp;

undefined variable 'kak-lsp'

Ofcourse, and sorry, I overlooked that. It now builds fine when referenced with kakounePlugins.kak-lsp.

Thanks!

Copy link
Member

@Flakebi Flakebi left a comment

Choose a reason for hiding this comment

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

Thank you!

Result of nixpkgs-review pr 110663 run on x86_64-linux 1

1 package built:
  • kak-lsp

@SuperSandro2000
Copy link
Member

This is a semi-automatic executed nixpkgs-review which is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).
If you have any questions or problems please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 110663 run on x86_64-darwin 1

1 package built:
  • kak-lsp

};

cargoSha256 = "174qy50m9487vv151vm8q6sby79dq3gbqjbz6h4326jwsc9wwi8c";
cargoSha256 = "0g67s6n45rxvv1q5s7x5ajh5n16p68bhlsrsjp46qamrraz63d68";

buildInputs = lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
buildInputs = lib.optional stdenv.isDarwin [ darwin.apple_sdk.frameworks.Security ];
buildInputs = lib.optional stdenv.isDarwin [ Security ];

Please add Security to inputs and inherit it from top level inherit (darwin.apple_sdk.frameworks) Security.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated in 35a2887. I'm only able to test this on NixOS, but let me know if this is not how you expected it.

Copy link
Member

Choose a reason for hiding this comment

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

I meant like this a723537

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks, updated in 25e2b72. Let me know if you like me to note this change in commit message as well, although I don't know what this change will be described so as to be useful in a commit message.

@SuperSandro2000
Copy link
Member

@wahjava please fix the merge conflitct.

While here, also add to kakounePlugins
@wahjava
Copy link
Contributor Author

wahjava commented Feb 19, 2021

@wahjava please fix the merge conflitct.

Merged, and forced pushed.

@SuperSandro2000
Copy link
Member

This is a semi-automatic executed nixpkgs-review with nixpkgs-review-checks extension. It is checked by a human on a best effort basis and does not build all packages (e.g. lumo, tensorflow or pytorch).
If you have any questions or problems please reach out to SuperSandro2000 on IRC.

Result of nixpkgs-review pr 110663 run on x86_64-darwin 1

1 package built:
  • kak-lsp

@SuperSandro2000 SuperSandro2000 merged commit dd630d1 into NixOS:master Feb 21, 2021
@wahjava wahjava deleted the add-kak-lsp branch February 22, 2021 07:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants