Merge pull request #906 from Gerg-L/main
Some checks failed
Set up binary cache / cachix (default) (push) Has been cancelled
Set up binary cache / cachix (maximal) (push) Has been cancelled
Set up binary cache / cachix (nix) (push) Has been cancelled
Treewide Checks / Validate flake (push) Has been cancelled
Treewide Checks / Check formatting (push) Has been cancelled
Treewide Checks / Check source tree for typos (push) Has been cancelled
Treewide Checks / Validate documentation builds (push) Has been cancelled
Treewide Checks / Validate hyperlinks in documentation sources (push) Has been cancelled
Treewide Checks / Validate Editorconfig conformance (push) Has been cancelled
Build and deploy documentation / Check latest commit (push) Has been cancelled
Build and deploy documentation / publish (push) Has been cancelled

update mnw, fix noBuildPlug
This commit is contained in:
raf 2025-05-18 02:46:22 +03:00 committed by GitHub
commit d3a0e7029a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 11 additions and 14 deletions

6
flake.lock generated
View file

@ -38,11 +38,11 @@
}, },
"mnw": { "mnw": {
"locked": { "locked": {
"lastModified": 1746338991, "lastModified": 1747499976,
"narHash": "sha256-GbyoHjf14LOxZQc+0NFblI4xf/uwGrYo3W8lwE4HcwI=", "narHash": "sha256-YTiSI4WLbk0CleXeBheYmKZV6iqKyBpyoh1e+vcQzu4=",
"owner": "Gerg-L", "owner": "Gerg-L",
"repo": "mnw", "repo": "mnw",
"rev": "c65407ee9387ef75985dad3e30f58c822c766ec1", "rev": "72433a144c4ac16931e9148f78db4a0e4c147441",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -7,23 +7,20 @@
}: let }: let
inherit (pkgs) vimPlugins; inherit (pkgs) vimPlugins;
inherit (lib.trivial) flip; inherit (lib.trivial) flip;
inherit (builtins) path filter isString; inherit (builtins) filter isString;
getPin = name: ((pkgs.callPackages ../../../npins/sources.nix {}) // config.vim.pluginOverrides).${name}; getPin = name: ((pkgs.callPackages ../../../npins/sources.nix {}) // config.vim.pluginOverrides).${name};
noBuildPlug = pname: let noBuildPlug = pname: let
pin = getPin pname; pin = getPin pname;
version = pin.revision or "dirty"; version = builtins.substring 0 8 pin.revision;
in { in
# vim.lazy.plugins relies on pname, so we only set that here pin.outPath.overrideAttrs {
# version isn't needed for anything, but inherit it anyway for correctness inherit pname version;
inherit pname version; name = "${pname}-${version}";
outPath = path {
name = "${pname}-0-unstable-${version}"; passthru.vimPlugin = false;
path = pin.outPath;
}; };
passthru.vimPlugin = false;
};
# build a vim plugin with the given name and arguments # build a vim plugin with the given name and arguments
# if the plugin is nvim-treesitter, warn the user to use buildTreesitterPlug # if the plugin is nvim-treesitter, warn the user to use buildTreesitterPlug