nixpkgs-plugin-update: prefer release tags by default (#510468) (051e6e2c) · Commits · nix / nixpkgs

pkgs/applications/editors/kakoune/plugins/update.py

+1 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ let
		submodules = value.src.fetchSubmodules or false;
		sha256 = value.src.outputHash;
		rev = value.src.rev;
		tag = value.src.tag or null;
		}}
		else
		null;

pkgs/applications/editors/vim/plugins/generated.nix

+638 −638

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/editors/vim/plugins/overrides.nix

+30 −3

Original line number	Diff line number	Diff line
		@@ -1385,6 +1385,8 @@ assertNoAdditions {
		nvimSkipModules = [
		# lua module '.init' not found
		"fzy.fzy-lua-native"
		# Requires removed Neovim internal module vim.treesitter._highlight
		"guihua.ts_obsolete.highlight"
		];
		};

		@@ -1832,6 +1834,16 @@ assertNoAdditions {
		};
		});

		live-share-nvim = super.live-share-nvim.overrideAttrs (old: {
		nvimSkipModules = (old.nvimSkipModules or [ ]) ++ [
		# These modules unconditionally load OpenSSL via LuaJIT FFI and abort in
		# the headless require check on Darwin.
		"live-share.host"
		"live-share.guest"
		"live-share.collab.crypto"
		];
		});

		lsp-format-modifications-nvim = super.lsp-format-modifications-nvim.overrideAttrs {
		dependencies = [ self.plenary-nvim ];
		};
		@@ -3138,14 +3150,29 @@ assertNoAdditions {
		];
		};

		python-mode = super.python-mode.overrideAttrs {
		postPatch = ''
		python-mode = super.python-mode.overrideAttrs (old: {
		postPatch = (old.postPatch or "") + ''
		# NOTE: Fix broken symlink - the pytoolconfig directory was moved to src/
		# https://github.com/python-mode/python-mode/pull/1189#issuecomment-3109528360
		rm -f pymode/libs/pytoolconfig
		ln -sf ../../submodules/pytoolconfig/src/pytoolconfig pymode/libs/pytoolconfig

		# The current source tarball only ships a subset of the historical
		# submodules, so drop the now-dangling vendored linter symlinks.
		rm -f \
		pymode/libs/appdirs.py \
		pymode/libs/astroid \
		pymode/libs/mccabe.py \
		pymode/libs/pycodestyle.py \
		pymode/libs/pydocstyle \
		pymode/libs/pyflakes \
		pymode/libs/pylama \
		pymode/libs/pylint \
		pymode/libs/snowballstemmer \
		pymode/libs/toml \
		pymode/autopep8.py
		'';
		};
		});

		pywal-nvim = super.pywal-nvim.overrideAttrs {
		# Optional feline integration

pkgs/applications/editors/vim/plugins/utils/get-plugins.nix

+1 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ let
		submodules = value.src.fetchSubmodules or false;
		sha256 = value.src.outputHash;
		inherit (value.src) rev;
		tag = value.src.tag or null;
		}
		else
		null;

pkgs/applications/editors/vim/plugins/utils/update.py

+4 −7

Original line number	Diff line number	Diff line
		@@ -50,9 +50,9 @@ class VimEditor(nixpkgs_plugin_update.Editor):
		self, plugins: List[Tuple[PluginDesc, nixpkgs_plugin_update.Plugin]], outfile: str
		):
		log.info("Generating nix code")
		log.debug("Loading nvim-treesitter revision from nix...")
		nvim_treesitter_rev = nixpkgs_plugin_update.run_nix_expr(
		"(import <localpkgs> { }).vimPlugins.nvim-treesitter.src.rev",
		log.debug("Loading nvim-treesitter source reference from nix...")
		nvim_treesitter_ref = nixpkgs_plugin_update.run_nix_expr(
		"(let src = (import <localpkgs> { }).vimPlugins.nvim-treesitter.src; in if src.tag != null then src.tag else src.rev)",
		self.nixpkgs,
		timeout=10,
		)
		@@ -93,10 +93,7 @@ class VimEditor(nixpkgs_plugin_update.Editor):
		for pdesc, plugin in plugins:
		content = self.plugin2nix(pdesc, plugin, _isNeovimPlugin(plugin))
		f.write(content)
		if (
		plugin.name == "nvim-treesitter"
		and plugin.commit != nvim_treesitter_rev
		):
		if plugin.name == "nvim-treesitter" and (plugin.tag or plugin.commit) != nvim_treesitter_ref:
		self.nvim_treesitter_updated = True
		f.write("}\n")
		print(f"updated {outfile}")