mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-30 01:17:28 +03:00
Merge pull request #278144 from otavio/bblsp
bitbake-language-server: 0.0.6 -> 0.0.7, python310Packages.oelint-parser: 2.12.3 -> 2.13.3
This commit is contained in:
commit
4de6500caf
@ -2,55 +2,32 @@
|
||||
, nix-update-script
|
||||
, python3
|
||||
, fetchFromGitHub
|
||||
, cmake
|
||||
, ninja
|
||||
}:
|
||||
let
|
||||
tree-sitter-bitbake = fetchFromGitHub {
|
||||
owner = "amaanq";
|
||||
repo = "tree-sitter-bitbake";
|
||||
rev = "v1.0.0";
|
||||
hash = "sha256-HfWUDYiBCmtlu5fFX287BSDHyCiD7gqIVFDTxH5APAE=";
|
||||
};
|
||||
in
|
||||
|
||||
python3.pkgs.buildPythonApplication rec {
|
||||
pname = "bitbake-language-server";
|
||||
version = "0.0.6";
|
||||
version = "0.0.7";
|
||||
format = "pyproject";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Freed-Wu";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
hash = "sha256-UOeOvaQplDn7jM+3sUZip1f05TbczoaRQKMxVm+euDU=";
|
||||
hash = "sha256-FQKZtrzfjEkAIyzrJvI7qiB4gV2yAH9w1fwO6oLPhNc=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = with python3.pkgs; [
|
||||
cmake
|
||||
ninja
|
||||
pathspec
|
||||
pyproject-metadata
|
||||
scikit-build-core
|
||||
setuptools-scm
|
||||
setuptools-generate
|
||||
];
|
||||
|
||||
propagatedBuildInputs = with python3.pkgs; [
|
||||
lsprotocol
|
||||
platformdirs
|
||||
oelint-parser
|
||||
pygls
|
||||
tree-sitter
|
||||
];
|
||||
|
||||
SETUPTOOLS_SCM_PRETEND_VERSION = version;
|
||||
|
||||
# The scikit-build-core runs CMake internally so we must let it run the configure step itself.
|
||||
dontUseCmakeConfigure = true;
|
||||
SKBUILD_CMAKE_ARGS = lib.strings.concatStringsSep ";" [
|
||||
"-DFETCHCONTENT_FULLY_DISCONNECTED=ON"
|
||||
"-DFETCHCONTENT_QUIET=OFF"
|
||||
"-DFETCHCONTENT_SOURCE_DIR_TREE-SITTER-BITBAKE=${tree-sitter-bitbake}"
|
||||
];
|
||||
|
||||
passthru.updateScript = nix-update-script { };
|
||||
|
||||
meta = with lib; {
|
||||
|
@ -8,13 +8,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "oelint-parser";
|
||||
version = "2.12.3";
|
||||
version = "2.13.3";
|
||||
format = "setuptools";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit version;
|
||||
pname = "oelint_parser";
|
||||
hash = "sha256-fzHEy9/BxstPAYhVTG0o7Gn2D9UKuSZvI0X5ynZ+oEk=";
|
||||
hash = "sha256-pjonw0VZlDK3xf8cfgn+qT4jZSYD8wRSDLz1Go9Y5so=";
|
||||
};
|
||||
|
||||
buildInputs = [ pip ];
|
||||
|
Loading…
Reference in New Issue
Block a user