mirrors/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2025-09-06 03:18:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #20091 from teto/fix-flake

Browse Source
This commit is contained in:
Matthieu Coudron
2022-09-12 14:07:44 +02:00
committed by GitHub
parent a48e42a29d 93f32bb0aa
commit add27f2898
2 changed files with 70 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
contrib/flake.lock generated
View File

@@ -2,11 +2,11 @@
"nodes": { "nodes": {
"flake-utils": { "flake-utils": {
"locked": { "locked": {
"lastModified": 1644229661, "lastModified": 1659877975,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=", "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797", "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -17,11 +17,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1646254136, "lastModified": 1662019588,
"narHash": "sha256-8nQx02tTzgYO21BP/dy5BCRopE8OwE8Drsw98j+Qoaw=", "narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "3e072546ea98db00c2364b81491b893673267827", "rev": "2da64a81275b68fdad38af669afeda43d401e94b",
"type": "github" "type": "github"
}, },
"original": { "original": {

32
contrib/flake.nix
View File

@@ -23,7 +23,8 @@
}); });
# a development binary to help debug issues # a development binary to help debug issues
neovim-debug = let neovim-debug =
let
stdenv = if pkgs.stdenv.isLinux then pkgs.llvmPackages_latest.stdenv else pkgs.stdenv; stdenv = if pkgs.stdenv.isLinux then pkgs.llvmPackages_latest.stdenv else pkgs.stdenv;
in in
((neovim.override { ((neovim.override {
@@ -39,7 +40,7 @@
"-DMIN_LOG_LEVEL=0" "-DMIN_LOG_LEVEL=0"
]; ];
disallowedReferences = []; disallowedReferences = [ ];
})); }));
# for neovim developers, beware of the slow binary # for neovim developers, beware of the slow binary
@@ -68,7 +69,9 @@
inherit system; inherit system;
}; };
pythonEnv = pkgs.python3.withPackages(ps: [ lua = pkgs.lua5_1;
pythonEnv = pkgs.python3.withPackages (ps: [
ps.msgpack ps.msgpack
ps.flake8 # for 'make pylint' ps.flake8 # for 'make pylint'
]); ]);
@@ -76,36 +79,34 @@
rec { rec {
packages = with pkgs; { packages = with pkgs; {
default = neovim;
inherit neovim neovim-debug neovim-developer; inherit neovim neovim-debug neovim-developer;
}; };
checks = { checks = {
pylint = pkgs.runCommandNoCC "pylint" { pylint = pkgs.runCommandNoCC "pylint"
{
nativeBuildInputs = [ pythonEnv ]; nativeBuildInputs = [ pythonEnv ];
preferLocalBuild = true; preferLocalBuild = true;
} "make -C ${./..} pylint > $out"; } "make -C ${./..} pylint > $out";
shlint = pkgs.runCommandNoCC "shlint" { shlint = pkgs.runCommandNoCC "shlint"
{
nativeBuildInputs = [ pkgs.shellcheck ]; nativeBuildInputs = [ pkgs.shellcheck ];
preferLocalBuild = true; preferLocalBuild = true;
} "make -C ${./..} shlint > $out"; } "make -C ${./..} shlint > $out";
}; };
# kept for backwards-compatibility
defaultPackage = pkgs.neovim; defaultPackage = pkgs.neovim;
apps = { devShells = {
nvim = flake-utils.lib.mkApp { drv = pkgs.neovim; name = "nvim"; }; default = pkgs.neovim-developer.overrideAttrs (oa: {
nvim-debug = flake-utils.lib.mkApp { drv = pkgs.neovim-debug; name = "nvim"; };
};
defaultApp = apps.nvim;
devShell = let
in
pkgs.neovim-developer.overrideAttrs(oa: {
buildInputs = with pkgs; oa.buildInputs ++ [ buildInputs = with pkgs; oa.buildInputs ++ [
cmake cmake
lua.pkgs.luacheck
sumneko-lua-language-server
pythonEnv pythonEnv
include-what-you-use # for scripts/check-includes.py include-what-you-use # for scripts/check-includes.py
jq # jq for scripts/vim-patch.sh -r jq # jq for scripts/vim-patch.sh -r
@@ -133,5 +134,6 @@
cp -f ${pkgs.tree-sitter.builtGrammars.tree-sitter-c}/parser runtime/parser/c.so cp -f ${pkgs.tree-sitter.builtGrammars.tree-sitter-c}/parser runtime/parser/c.so
''; '';
}); });
};
}); });
} }