From 3f19fc37a3557d31b242b220b52c7a1358572f57 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 16 Feb 2022 11:55:43 -0300 Subject: [PATCH] Move misc/vim-plugins to applications/editors/vim/plugins --- doc/contributing/submitting-changes.chapter.md | 2 +- doc/languages-frameworks/vim.section.md | 8 ++++---- maintainers/scripts/pluginupdate.py | 2 +- .../editors/vim/plugins}/aliases.nix | 0 .../editors/vim/plugins}/build-vim-plugin.nix | 0 .../editors/vim/plugins}/default.nix | 0 .../editors/vim/plugins}/deprecated.json | 0 .../editors/vim/plugins}/generated.nix | 2 +- .../plugins}/markdown-preview-nvim/fix-node-paths.patch | 0 .../vim/plugins}/markdown-preview-nvim/package.json | 0 .../editors/vim/plugins}/overrides.nix | 2 +- .../editors/vim/plugins}/patches/fruzzy/get_version.patch | 0 .../lens-vim/remove_duplicate_g_lens_animate.patch | 0 .../editors/vim/plugins}/patches/sniprun/fix-paths.patch | 0 .../patches/vim-grammarous/set_default_languagetool.patch | 0 .../editors/vim/plugins}/readme.md | 0 .../editors/vim/plugins}/update-shell.nix | 0 .../editors/vim/plugins}/update.py | 2 +- .../editors/vim/plugins}/vim-gen-doc-hook.sh | 0 .../editors/vim/plugins}/vim-plugin-names | 0 .../editors/vim/plugins}/vim-utils.nix | 3 ++- .../editors/vim/plugins}/vim2nix/README.txt | 0 .../editors/vim/plugins}/vim2nix/addon-info.json | 0 .../editors/vim/plugins}/vim2nix/autoload/nix.vim | 0 pkgs/development/node-packages/node-packages.json | 2 +- pkgs/development/node-packages/node-packages.nix | 4 ++-- pkgs/tools/nix/statix/default.nix | 3 ++- pkgs/tools/text/rosie/default.nix | 5 +++-- pkgs/top-level/all-packages.nix | 5 ++--- 29 files changed, 21 insertions(+), 19 deletions(-) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/aliases.nix (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/build-vim-plugin.nix (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/default.nix (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/deprecated.json (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/generated.nix (99%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/markdown-preview-nvim/fix-node-paths.patch (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/markdown-preview-nvim/package.json (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/overrides.nix (99%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/patches/fruzzy/get_version.patch (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/patches/lens-vim/remove_duplicate_g_lens_animate.patch (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/patches/sniprun/fix-paths.patch (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/patches/vim-grammarous/set_default_languagetool.patch (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/readme.md (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/update-shell.nix (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/update.py (96%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/vim-gen-doc-hook.sh (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/vim-plugin-names (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/vim-utils.nix (99%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/vim2nix/README.txt (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/vim2nix/addon-info.json (100%) rename pkgs/{misc/vim-plugins => applications/editors/vim/plugins}/vim2nix/autoload/nix.vim (100%) diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md index d5b5f5a60175..109d051c016f 100644 --- a/doc/contributing/submitting-changes.chapter.md +++ b/doc/contributing/submitting-changes.chapter.md @@ -98,7 +98,7 @@ We use jbidwatcher as an example for a discontinued project here. 1. Create a new branch for your change, e.g. `git checkout -b jbidwatcher` 1. Remove the actual package including its directory, e.g. `rm -rf pkgs/applications/misc/jbidwatcher` 1. Remove the package from the list of all packages (`pkgs/top-level/all-packages.nix`). -1. Add an alias for the package name in `pkgs/top-level/aliases.nix` (There is also `pkgs/misc/vim-plugins/aliases.nix`. Package sets typically do not have aliases, so we can't add them there.) +1. Add an alias for the package name in `pkgs/top-level/aliases.nix` (There is also `pkgs/applications/editors/vim/plugins/aliases.nix`. Package sets typically do not have aliases, so we can't add them there.) For example in this case: diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index 4ffd6736e238..a615d585b151 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -309,9 +309,9 @@ Sample output2: ## Adding new plugins to nixpkgs {#adding-new-plugins-to-nixpkgs} -Nix expressions for Vim plugins are stored in [pkgs/misc/vim-plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/misc/vim-plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/update.py). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/vim-plugin-names). Plugins are listed in alphabetical order in `vim-plugin-names` using the format `[github username]/[repository]@[gitref]`. For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`. +Nix expressions for Vim plugins are stored in [pkgs/applications/editors/vim/plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/editors/vim/plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/update.py). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-plugin-names). Plugins are listed in alphabetical order in `vim-plugin-names` using the format `[github username]/[repository]@[gitref]`. For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`. -Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/misc/vim-plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added: +Some plugins require overrides in order to function properly. Overrides are placed in [overrides.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/overrides.nix). Overrides are most often required when a plugin requires some dependencies, or extra steps are required during the build process. For example `deoplete-fish` requires both `deoplete-nvim` and `vim-fish`, and so the following override was added: ```nix deoplete-fish = super.deoplete-fish.overrideAttrs(old: { @@ -330,13 +330,13 @@ Finally, there are some plugins that are also packaged in nodePackages because t Run the update script with a GitHub API token that has at least `public_repo` access. Running the script without the token is likely to result in rate-limiting (429 errors). For steps on creating an API token, please refer to [GitHub's token documentation](https://docs.github.com/en/free-pro-team@latest/github/authenticating-to-github/creating-a-personal-access-token). ```sh -GITHUB_API_TOKEN=my_token ./pkgs/misc/vim-plugins/update.py +GITHUB_API_TOKEN=my_token ./pkgs/applications/editors/vim/plugins/update.py ``` Alternatively, set the number of processes to a lower count to avoid rate-limiting. ```sh -./pkgs/misc/vim-plugins/update.py --proc 1 +./pkgs/applications/editors/vim/plugins/update.py --proc 1 ``` ## Important repositories {#important-repositories} diff --git a/maintainers/scripts/pluginupdate.py b/maintainers/scripts/pluginupdate.py index 0fad92481bba..877e66440320 100644 --- a/maintainers/scripts/pluginupdate.py +++ b/maintainers/scripts/pluginupdate.py @@ -1,4 +1,4 @@ -# Used by pkgs/misc/vim-plugins/update.py and pkgs/applications/editors/kakoune/plugins/update.py +# Used by pkgs/applications/editors/vim/plugins/update.py and pkgs/applications/editors/kakoune/plugins/update.py # format: # $ nix run nixpkgs.python3Packages.black -c black update.py diff --git a/pkgs/misc/vim-plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix similarity index 100% rename from pkgs/misc/vim-plugins/aliases.nix rename to pkgs/applications/editors/vim/plugins/aliases.nix diff --git a/pkgs/misc/vim-plugins/build-vim-plugin.nix b/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix similarity index 100% rename from pkgs/misc/vim-plugins/build-vim-plugin.nix rename to pkgs/applications/editors/vim/plugins/build-vim-plugin.nix diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/applications/editors/vim/plugins/default.nix similarity index 100% rename from pkgs/misc/vim-plugins/default.nix rename to pkgs/applications/editors/vim/plugins/default.nix diff --git a/pkgs/misc/vim-plugins/deprecated.json b/pkgs/applications/editors/vim/plugins/deprecated.json similarity index 100% rename from pkgs/misc/vim-plugins/deprecated.json rename to pkgs/applications/editors/vim/plugins/deprecated.json diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix similarity index 99% rename from pkgs/misc/vim-plugins/generated.nix rename to pkgs/applications/editors/vim/plugins/generated.nix index b6869ba872c9..7b9fb616d1c5 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1,4 +1,4 @@ -# This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit! +# This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit! { lib, buildVimPluginFrom2Nix, fetchFromGitHub, fetchgit }: final: prev: diff --git a/pkgs/misc/vim-plugins/markdown-preview-nvim/fix-node-paths.patch b/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch similarity index 100% rename from pkgs/misc/vim-plugins/markdown-preview-nvim/fix-node-paths.patch rename to pkgs/applications/editors/vim/plugins/markdown-preview-nvim/fix-node-paths.patch diff --git a/pkgs/misc/vim-plugins/markdown-preview-nvim/package.json b/pkgs/applications/editors/vim/plugins/markdown-preview-nvim/package.json similarity index 100% rename from pkgs/misc/vim-plugins/markdown-preview-nvim/package.json rename to pkgs/applications/editors/vim/plugins/markdown-preview-nvim/package.json diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix similarity index 99% rename from pkgs/misc/vim-plugins/overrides.nix rename to pkgs/applications/editors/vim/plugins/overrides.nix index da04fee9c95f..059622495731 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -414,7 +414,7 @@ self: super: { markdown-preview-nvim = super.markdown-preview-nvim.overrideAttrs (old: let # We only need its dependencies `node-modules`. - nodeDep = nodePackages."markdown-preview-nvim-../../misc/vim-plugins/markdown-preview-nvim".overrideAttrs (old: { + nodeDep = nodePackages."markdown-preview-nvim-../../applications/editors/vim/plugins/markdown-preview-nvim".overrideAttrs (old: { dontNpmInstall = true; }); in { diff --git a/pkgs/misc/vim-plugins/patches/fruzzy/get_version.patch b/pkgs/applications/editors/vim/plugins/patches/fruzzy/get_version.patch similarity index 100% rename from pkgs/misc/vim-plugins/patches/fruzzy/get_version.patch rename to pkgs/applications/editors/vim/plugins/patches/fruzzy/get_version.patch diff --git a/pkgs/misc/vim-plugins/patches/lens-vim/remove_duplicate_g_lens_animate.patch b/pkgs/applications/editors/vim/plugins/patches/lens-vim/remove_duplicate_g_lens_animate.patch similarity index 100% rename from pkgs/misc/vim-plugins/patches/lens-vim/remove_duplicate_g_lens_animate.patch rename to pkgs/applications/editors/vim/plugins/patches/lens-vim/remove_duplicate_g_lens_animate.patch diff --git a/pkgs/misc/vim-plugins/patches/sniprun/fix-paths.patch b/pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch similarity index 100% rename from pkgs/misc/vim-plugins/patches/sniprun/fix-paths.patch rename to pkgs/applications/editors/vim/plugins/patches/sniprun/fix-paths.patch diff --git a/pkgs/misc/vim-plugins/patches/vim-grammarous/set_default_languagetool.patch b/pkgs/applications/editors/vim/plugins/patches/vim-grammarous/set_default_languagetool.patch similarity index 100% rename from pkgs/misc/vim-plugins/patches/vim-grammarous/set_default_languagetool.patch rename to pkgs/applications/editors/vim/plugins/patches/vim-grammarous/set_default_languagetool.patch diff --git a/pkgs/misc/vim-plugins/readme.md b/pkgs/applications/editors/vim/plugins/readme.md similarity index 100% rename from pkgs/misc/vim-plugins/readme.md rename to pkgs/applications/editors/vim/plugins/readme.md diff --git a/pkgs/misc/vim-plugins/update-shell.nix b/pkgs/applications/editors/vim/plugins/update-shell.nix similarity index 100% rename from pkgs/misc/vim-plugins/update-shell.nix rename to pkgs/applications/editors/vim/plugins/update-shell.nix diff --git a/pkgs/misc/vim-plugins/update.py b/pkgs/applications/editors/vim/plugins/update.py similarity index 96% rename from pkgs/misc/vim-plugins/update.py rename to pkgs/applications/editors/vim/plugins/update.py index d9adc6667482..7a631c1c7dc5 100755 --- a/pkgs/misc/vim-plugins/update.py +++ b/pkgs/applications/editors/vim/plugins/update.py @@ -47,7 +47,7 @@ let in lib.filterAttrs (n: v: v != null) checksums)""" HEADER = ( - "# This file has been generated by ./pkgs/misc/vim-plugins/update.py. Do not edit!" + "# This file has been generated by ./pkgs/applications/editors/vim/plugins/update.py. Do not edit!" ) diff --git a/pkgs/misc/vim-plugins/vim-gen-doc-hook.sh b/pkgs/applications/editors/vim/plugins/vim-gen-doc-hook.sh similarity index 100% rename from pkgs/misc/vim-plugins/vim-gen-doc-hook.sh rename to pkgs/applications/editors/vim/plugins/vim-gen-doc-hook.sh diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names similarity index 100% rename from pkgs/misc/vim-plugins/vim-plugin-names rename to pkgs/applications/editors/vim/plugins/vim-plugin-names diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix similarity index 99% rename from pkgs/misc/vim-plugins/vim-utils.nix rename to pkgs/applications/editors/vim/plugins/vim-utils.nix index 128b969c3575..4183b6214351 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -82,7 +82,8 @@ See vimHelpTags sample code below. CONTRIBUTING AND CUSTOMIZING ============================ -The example file pkgs/misc/vim-plugins/default.nix provides both: +The example file pkgs/applications/editors/vim/plugins/default.nix provides +both: * manually mantained plugins * plugins created by VAM's nix#ExportPluginsForNix implementation diff --git a/pkgs/misc/vim-plugins/vim2nix/README.txt b/pkgs/applications/editors/vim/plugins/vim2nix/README.txt similarity index 100% rename from pkgs/misc/vim-plugins/vim2nix/README.txt rename to pkgs/applications/editors/vim/plugins/vim2nix/README.txt diff --git a/pkgs/misc/vim-plugins/vim2nix/addon-info.json b/pkgs/applications/editors/vim/plugins/vim2nix/addon-info.json similarity index 100% rename from pkgs/misc/vim-plugins/vim2nix/addon-info.json rename to pkgs/applications/editors/vim/plugins/vim2nix/addon-info.json diff --git a/pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim b/pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim similarity index 100% rename from pkgs/misc/vim-plugins/vim2nix/autoload/nix.vim rename to pkgs/applications/editors/vim/plugins/vim2nix/autoload/nix.vim diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json index 9fa420975af1..280343108931 100644 --- a/pkgs/development/node-packages/node-packages.json +++ b/pkgs/development/node-packages/node-packages.json @@ -198,7 +198,7 @@ , "markdownlint-cli" , "markdownlint-cli2" , "markdown-link-check" -, {"markdown-preview-nvim": "../../misc/vim-plugins/markdown-preview-nvim"} +, {"markdown-preview-nvim": "../../applications/editors/vim/plugins/markdown-preview-nvim"} , "mastodon-bot" , "mathjax" , "meat" diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix index 3adfd4becd37..54fa82135c54 100644 --- a/pkgs/development/node-packages/node-packages.nix +++ b/pkgs/development/node-packages/node-packages.nix @@ -107807,11 +107807,11 @@ in bypassCache = true; reconstructLock = true; }; - "markdown-preview-nvim-../../misc/vim-plugins/markdown-preview-nvim" = nodeEnv.buildNodePackage { + "markdown-preview-nvim-../../applications/editors/vim/plugins/markdown-preview-nvim" = nodeEnv.buildNodePackage { name = "markdown-preview-vim"; packageName = "markdown-preview-vim"; version = "0.0.1"; - src = ../../misc/vim-plugins/markdown-preview-nvim; + src = ../../applications/editors/vim/plugins/markdown-preview-nvim; dependencies = [ sources."accepts-1.3.8" sources."after-0.8.2" diff --git a/pkgs/tools/nix/statix/default.nix b/pkgs/tools/nix/statix/default.nix index 0f3a1c10e355..d25f51ae5aa2 100644 --- a/pkgs/tools/nix/statix/default.nix +++ b/pkgs/tools/nix/statix/default.nix @@ -2,7 +2,8 @@ rustPlatform.buildRustPackage rec { pname = "statix"; - # also update version of the vim plugin in pkgs/misc/vim-plugins/overrides.nix + # also update version of the vim plugin in + # pkgs/applications/editors/vim/plugins/overrides.nix # the version can be found in flake.nix of the source code version = "0.5.4"; diff --git a/pkgs/tools/text/rosie/default.nix b/pkgs/tools/text/rosie/default.nix index 4f70f972b683..a4edf55f7504 100644 --- a/pkgs/tools/text/rosie/default.nix +++ b/pkgs/tools/text/rosie/default.nix @@ -1,5 +1,5 @@ -{ stdenv -, lib +{ lib +, stdenv , fetchgit , libbsd , readline @@ -8,6 +8,7 @@ stdenv.mkDerivation rec { pname = "rosie"; version = "unstable-2020-01-11"; + src = fetchgit { url = "https://gitlab.com/rosie-pattern-language/rosie"; rev = "670e9027563609ba2ea31e14e2621a1302742795"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1656f6339188..f360f8f31b5a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33999,12 +33999,11 @@ with pkgs; viewnior = callPackage ../applications/graphics/viewnior { }; - - vimUtils = callPackage ../misc/vim-plugins/vim-utils.nix { + vimUtils = callPackage ../applications/editors/vim/plugins/vim-utils.nix { inherit (lua51Packages) hasLuaModule; }; - vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { + vimPlugins = recurseIntoAttrs (callPackage ../applications/editors/vim/plugins { llvmPackages = llvmPackages_6; luaPackages = lua51Packages; });