Commit 0ab2c964 authored by Matthieu Coudron's avatar Matthieu Coudron
Browse files

vimUtils: buildVimPluginFrom2Nix renamed to buildVimPlugin

the `from2Nix` suffix is a legacy from vim2nix but we dont use that anymore. It makes the name of the function unusual and long.
parent c22ca8e8
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ If one of your favourite plugins isn't packaged, you can package it yourself:
{ config, pkgs, ... }:

let
  easygrep = pkgs.vimUtils.buildVimPluginFrom2Nix {
  easygrep = pkgs.vimUtils.buildVimPlugin {
    name = "vim-easygrep";
    src = pkgs.fetchFromGitHub {
      owner = "dkprice";
+3 −0
Original line number Diff line number Diff line
@@ -119,6 +119,9 @@

- The `services.ananicy.extraRules` option now has the type of `listOf attrs` instead of `string`.

- `buildVimPluginFrom2Nix` has been renamed to `buildVimPlugin`, which now
  now skips `configurePhase` and `buildPhase`

- JACK tools (`jack_*` except `jack_control`) have moved from the `jack2` package to `jack-example-tools`

- The `matrix-synapse` package & module have undergone some significant internal changes, for most setups no intervention is needed, though:
+2 −7
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ rec {
    , namePrefix ? "vimplugin-"
    , src
    , unpackPhase ? ""
    , configurePhase ? ""
    , buildPhase ? ""
    , configurePhase ? ":"
    , buildPhase ? ":"
    , preInstall ? ""
    , postInstall ? ""
    , path ? "."
@@ -48,9 +48,4 @@ rec {
    in
    addRtp (toVimPlugin drv);

  buildVimPluginFrom2Nix = attrs: buildVimPlugin ({
    # vim plugins may override this
    buildPhase = ":";
    configurePhase = ":";
  } // attrs);
}
+3 −3
Original line number Diff line number Diff line
@@ -7,14 +7,14 @@
let

  inherit (vimUtils.override {inherit vim;})
    buildVimPluginFrom2Nix;
    buildVimPlugin;

  inherit (lib) extends;

  initialPackages = self: { };

  plugins = callPackage ./generated.nix {
    inherit buildVimPluginFrom2Nix;
    inherit buildVimPlugin;
    inherit (neovimUtils) buildNeovimPlugin;
  };

@@ -26,7 +26,7 @@ let
  # add to ./overrides.nix.
  overrides = callPackage ./overrides.nix {
    inherit (darwin.apple_sdk.frameworks) Cocoa CoreFoundation CoreServices;
    inherit buildVimPluginFrom2Nix;
    inherit buildVimPlugin;
    inherit llvmPackages luaPackages;
  };

+1338 −1338

File changed.

Preview size limit exceeded, changes collapsed.

Loading