From c2486fd3d7ccb6b43c1e23cdce6375f47f1f3266 Mon Sep 17 00:00:00 2001 From: Perchun Pak Date: Thu, 9 Apr 2026 14:45:34 +0200 Subject: [PATCH] vimPlugins.jsonfly-nvim: move back to generated.nix --- .../editors/vim/plugins/generated.nix | 12 +++++++++ .../non-generated/jsonfly-nvim/default.nix | 27 ------------------- .../editors/vim/plugins/overrides.nix | 8 ++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 4 files changed, 21 insertions(+), 27 deletions(-) delete mode 100644 pkgs/applications/editors/vim/plugins/non-generated/jsonfly-nvim/default.nix diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 3ab0580cfae9..b6318b3ee7b8 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -7398,6 +7398,18 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + jsonfly-nvim = buildVimPlugin { + pname = "jsonfly.nvim"; + version = "0-unstable-2025-11-02"; + src = fetchgit { + url = "https://git.myzel394.app/Myzel394/jsonfly.nvim"; + rev = "3d58635cb195a5435743e7882c6ac7cff710204f"; + hash = "sha256-bTh/6zmYQ+XqBsccKo8i149nU5bBfFv+8UKMayHIoo4="; + }; + meta.homepage = "https://git.myzel394.app/Myzel394/jsonfly.nvim"; + meta.hydraPlatforms = [ ]; + }; + jule-nvim = buildVimPlugin { pname = "jule.nvim"; version = "0-unstable-2025-12-26"; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/jsonfly-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/jsonfly-nvim/default.nix deleted file mode 100644 index 22d445b55ded..000000000000 --- a/pkgs/applications/editors/vim/plugins/non-generated/jsonfly-nvim/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - fetchFromGitea, - vimUtils, - nix-update-script, -}: -vimUtils.buildVimPlugin { - pname = "jsonfly.nvim"; - version = "0-unstable-2025-06-07"; - - src = fetchFromGitea { - domain = "git.myzel394.app"; - owner = "Myzel394"; - repo = "jsonfly.nvim"; - rev = "db4394d856059d99d82ea2c75d033721e9dcb1fc"; - hash = "sha256-PmYm+vZ0XONoHUo08haBozbXRpN+/LAlr6Fyg7anTNw="; - }; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "Search blazingly fast for JSON / XML / YAML keys via Telescope"; - homepage = "https://git.myzel394.app/Myzel394/jsonfly.nvim"; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ myzel394 ]; - }; -} diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index f3585b278533..a70b5a657271 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1568,6 +1568,14 @@ assertNoAdditions { ''; }; + jsonfly-nvim = super.jsonfly-nvim.overrideAttrs (old: { + meta = old.meta // { + maintainers = old.meta.maintainers or [ ] ++ [ + lib.maintainers.myzel394 + ]; + }; + }); + jupytext-nvim = super.jupytext-nvim.overrideAttrs { passthru.python3Dependencies = ps: [ ps.jupytext ]; }; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 4a2f0436e5de..f1b3a4e50be0 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -567,6 +567,7 @@ https://github.com/HiPhish/jinja.vim/,HEAD, https://github.com/NicolasGB/jj.nvim/,HEAD, https://github.com/vito-c/jq.vim/,, https://github.com/neoclide/jsonc.vim/,, +https://git.myzel394.app/Myzel394/jsonfly.nvim,HEAD, https://github.com/julelang/jule.nvim/,HEAD, https://github.com/julelang/jule.nvim/,HEAD, https://github.com/JuliaEditorSupport/julia-vim/,,