Skip to content

Commit d3a0e70

Browse files
authored
Merge pull request NotAShelf#906 from Gerg-L/main
update mnw, fix noBuildPlug
2 parents 7a4f813 + 232824a commit d3a0e70

File tree

2 files changed

+11
-14
lines changed

2 files changed

+11
-14
lines changed

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/wrapper/build/config.nix

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,20 @@
77
}: let
88
inherit (pkgs) vimPlugins;
99
inherit (lib.trivial) flip;
10-
inherit (builtins) path filter isString;
10+
inherit (builtins) filter isString;
1111

1212
getPin = name: ((pkgs.callPackages ../../../npins/sources.nix {}) // config.vim.pluginOverrides).${name};
1313

1414
noBuildPlug = pname: let
1515
pin = getPin pname;
16-
version = pin.revision or "dirty";
17-
in {
18-
# vim.lazy.plugins relies on pname, so we only set that here
19-
# version isn't needed for anything, but inherit it anyway for correctness
20-
inherit pname version;
21-
outPath = path {
22-
name = "${pname}-0-unstable-${version}";
23-
path = pin.outPath;
16+
version = builtins.substring 0 8 pin.revision;
17+
in
18+
pin.outPath.overrideAttrs {
19+
inherit pname version;
20+
name = "${pname}-${version}";
21+
22+
passthru.vimPlugin = false;
2423
};
25-
passthru.vimPlugin = false;
26-
};
2724

2825
# build a vim plugin with the given name and arguments
2926
# if the plugin is nvim-treesitter, warn the user to use buildTreesitterPlug

0 commit comments

Comments
 (0)