Unverified Commit 6d1529ce authored by nixpkgs-ci[bot]'s avatar nixpkgs-ci[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents b24205e0 7e0287c3

doc/languages-frameworks/gradle.section.md

+1 −1
Original line number Diff line number Diff line
@@ -129,7 +129,7 @@ The update script does the following: 
`fetchDeps` takes the following arguments:



- `attrPath` - the path to the package in nixpkgs (for example,

  `"javaPackages.openjfx22"`). Used for update script metadata.

  `"javaPackages.openjfx25"`). Used for update script metadata.

- `pname` - an alias for `attrPath` for convenience. This is what you

  will generally use instead of `pkg` or `attrPath`.

- `pkg` - the package to be used for fetching the dependencies. Defaults

doc/languages-frameworks/index.md

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ Each supported language or software ecosystem has its own package set named `<la 
  $ nix repl '<nixpkgs>' -I nixpkgs=channel:nixpkgs-unstable

  nix-repl> javaPackages.<tab>

  javaPackages.compiler               javaPackages.openjfx15              javaPackages.openjfx21              javaPackages.recurseForDerivations

  javaPackages.jogl_2_4_0             javaPackages.openjfx17              javaPackages.openjfx22

  javaPackages.jogl_2_4_0             javaPackages.openjfx17              javaPackages.openjfx25

  javaPackages.mavenfod               javaPackages.openjfx19              javaPackages.override

  javaPackages.openjfx11              javaPackages.openjfx20              javaPackages.overrideDerivation

  ```

lib/licenses.nix

+5 −0
Original line number Diff line number Diff line
@@ -993,6 +993,11 @@ lib.mapAttrs mkLicense ( 
      fullName = "CMU License";

    };



    mit-enna = {

      spdxId = "MIT-enna";

      fullName = "enna License";

    };



    mit-feh = {

      spdxId = "MIT-feh";

      fullName = "feh License";

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

+59 −71
Original line number Diff line number Diff line 
{

  lib,

  buildVimPlugin,

  coc-basedpyright,

  coc-clangd,

  coc-css,

  coc-diagnostic,

  coc-docker,

  coc-explorer,

  coc-git,

  coc-pyright,

  coc-sh,

  coc-spell-checker,

  coc-toml,

  pkgs,

}:

final: prev: {

  coc-basedpyright = buildVimPlugin {

    inherit (coc-basedpyright) pname version meta;

    src = "${coc-basedpyright}/lib/node_modules/coc-basedpyright";

  };



  coc-clangd = buildVimPlugin {

    inherit (coc-clangd) pname version meta;

    src = "${coc-clangd}/lib/node_modules/coc-clangd";

  };



  coc-css = buildVimPlugin {

    inherit (coc-css) pname version meta;

    src = "${coc-css}/lib/node_modules/coc-css";

  };



  coc-diagnostic = buildVimPlugin {

    inherit (coc-diagnostic) pname version meta;

    src = "${coc-diagnostic}/lib/node_modules/coc-diagnostic";

  };



  coc-docker = buildVimPlugin {

    inherit (coc-docker) pname version meta;

    src = "${coc-docker}/lib/node_modules/coc-docker";

  };



  coc-explorer = buildVimPlugin {

    inherit (coc-explorer) pname version meta;

    src = "${coc-explorer}/lib/node_modules/coc-explorer";

  };



  coc-git = buildVimPlugin {

    inherit (coc-git) pname version meta;

    src = "${coc-git}/lib/node_modules/coc-git";

  };



  coc-pyright = buildVimPlugin {

    pname = "coc-pyright";

    inherit (coc-pyright) version meta;

    src = "${coc-pyright}/lib/node_modules/coc-pyright";

  };



  coc-sh = buildVimPlugin {

    pname = "coc-sh";

    inherit (coc-sh) version meta;

    src = "${coc-sh}/lib/node_modules/coc-sh";

  };



  coc-spell-checker = buildVimPlugin {

    pname = "coc-spell-checker";

    inherit (coc-spell-checker) version meta;

    src = "${coc-spell-checker}/lib/node_modules/coc-spell-checker";

  };



  coc-toml = buildVimPlugin {

    pname = "coc-toml";

    inherit (coc-toml) version meta;

    src = "${coc-toml}/lib/node_modules/coc-toml";

  };

final: prev:

let

  cocPackages = [

    "coc-clangd"

    "coc-cmake"

    "coc-css"

    "coc-diagnostic"

    "coc-docker"

    "coc-emmet"

    "coc-eslint"

    "coc-explorer"

    "coc-flutter"

    "coc-git"

    "coc-haxe"

    "coc-highlight"

    "coc-html"

    "coc-java"

    "coc-jest"

    "coc-json"

    "coc-lists"

    "coc-markdownlint"

    "coc-pairs"

    "coc-prettier"

    "coc-pyright"

    "coc-r-lsp"

    "coc-rust-analyzer"

    "coc-sh"

    "coc-sh"

    "coc-smartf"

    "coc-snippets"

    "coc-solargraph"

    "coc-spell-checker"

    "coc-sqlfluff"

    "coc-stylelint"

    "coc-sumneko-lua"

    "coc-tabnine"

    "coc-texlab"

    "coc-toml"

    "coc-toml"

    "coc-vimlsp"

    "coc-vimtex"

    "coc-wxml"

    "coc-basedpyright"

    "coc-yaml"

    "coc-yank"

  ];

in

lib.genAttrs cocPackages (

  pkg:

  let

    cocPkg = pkgs.${pkg};

  in

  buildVimPlugin {

    inherit (cocPkg) pname version meta;

    src = "${cocPkg}/lib/node_modules/${cocPkg.pname}";

  }

)

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

+0 −29
Original line number Diff line number Diff line
@@ -6,39 +6,10 @@ 
final: prev:

let

  nodePackageNames = [

    "coc-cmake"

    "coc-emmet"

    "coc-eslint"

    "coc-flutter"

    "coc-go"

    "coc-haxe"

    "coc-highlight"

    "coc-html"

    "coc-java"

    "coc-jest"

    "coc-json"

    "coc-lists"

    "coc-ltex"

    "coc-markdownlint"

    "coc-pairs"

    "coc-prettier"

    "coc-r-lsp"

    "coc-rust-analyzer"

    "coc-smartf"

    "coc-snippets"

    "coc-solargraph"

    "coc-sqlfluff"

    "coc-stylelint"

    "coc-sumneko-lua"

    "coc-tabnine"

    "coc-texlab"

    "coc-tsserver"

    "coc-ultisnips"

    "coc-vimlsp"

    "coc-vimtex"

    "coc-wxml"

    "coc-yaml"

    "coc-yank"

    "coc-nginx"

  ];