Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5921a7043d4a
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: bf6b3a60384e
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Mar 8, 2019

  1. Merge #56586: vimPlugins.meson: init, following pkgs.meson 

    (cherry picked from commit 6e6633b)
    @vcunat
    vcunat committed Mar 8, 2019
    Copy the full SHA
    bf6b3a6 View commit details
Showing with 7 additions and 1 deletion.
  1. +7 −1 pkgs/misc/vim-plugins/overrides.nix
8 changes: 7 additions & 1 deletion pkgs/misc/vim-plugins/overrides.nix
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{ lib, stdenv
, python, cmake, vim, ruby
, python, cmake, meson, vim, ruby
, which, fetchgit, fetchurl
, llvmPackages, rustPlatform
, xkb-switch, fzf, skim
@@ -160,6 +160,12 @@ self: super: {
dependencies = with super; [ webapi-vim ];
});

meson = buildVimPluginFrom2Nix {
inherit (meson) pname version src;
preInstall = "cd data/syntax-highlighting/vim";
meta.maintainers = with stdenv.lib.maintainers; [ vcunat ];
};

ncm2 = super.ncm2.overrideAttrs(old: {
dependencies = with super; [ nvim-yarp ];
});