Unverified Commit 4e927186 authored by Austin Horstman's avatar Austin Horstman Committed by GitHub
Browse files

vimPlugins.{spacevim,SpaceVim}: point to spacevim; spacevim: 1.8.0 -> 2.3.0;...

vimPlugins.{spacevim,SpaceVim}: point to spacevim; spacevim: 1.8.0 -> 2.3.0; spacevim: change maintainers (#359304)
parents 8b173e8b 79e34d35
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ mapAliases (with prev; {
  coffeeScript        = vim-coffee-script; # backwards compat, added 2014-10-18
  Solarized           = vim-colors-solarized;
  solarized           = vim-colors-solarized;
  spacevim            = throw "this distribution was unmaintained for the last 6 years, please use top-level 'spacevim'"; # added 2024-11-27
  SpaceVim            = throw "this distribution didn't work properly in vimPlugins, please use top-level 'spacevim' instead"; # added 2024-11-27
  colors-solarized    = vim-colors-solarized;
  caw                 = caw-vim;
  chad                = chadtree;
+0 −24
Original line number Diff line number Diff line
@@ -411,18 +411,6 @@ final: prev:
    meta.homepage = "https://github.com/jaredgorski/SpaceCamp/";
  };
  SpaceVim = buildVimPlugin {
    pname = "SpaceVim";
    version = "2024-11-05";
    src = fetchFromGitHub {
      owner = "SpaceVim";
      repo = "SpaceVim";
      rev = "08719ccab2073b4c12f2c6b318eba63b87e35180";
      sha256 = "0fr7vhs5gi054nn9z3hqcgf4y3w7nx00d94f7nd9g2jg7x2zzfyp";
    };
    meta.homepage = "https://github.com/SpaceVim/SpaceVim/";
  };
  SudoEdit-vim = buildVimPlugin {
    pname = "SudoEdit.vim";
    version = "2023-04-25";
@@ -11470,18 +11458,6 @@ final: prev:
    meta.homepage = "https://github.com/FireIsGood/spaceman.nvim/";
  };
  spacevim = buildVimPlugin {
    pname = "spacevim";
    version = "2018-03-29";
    src = fetchFromGitHub {
      owner = "ctjhoa";
      repo = "spacevim";
      rev = "30142a518ba77feb22791b5cb2387d88b70c58f2";
      sha256 = "0m389cnpg17ca8s7vb9yrs40sxb56zg32lcpilnd63zfi7awgscg";
    };
    meta.homepage = "https://github.com/ctjhoa/spacevim/";
  };
  sparkup = buildVimPlugin {
    pname = "sparkup";
    version = "2012-06-11";
+0 −2
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ https://github.com/vim-scripts/ShowMultiBase/,,
https://github.com/tmhedberg/SimpylFold/,,
https://github.com/vim-scripts/SmartCase/,,
https://github.com/jaredgorski/SpaceCamp/,,
https://github.com/SpaceVim/SpaceVim/,,
https://github.com/chrisbra/SudoEdit.vim/,,
https://github.com/hsitz/VimOrganizer/,,
https://github.com/VundleVim/Vundle.vim/,,
@@ -953,7 +952,6 @@ https://github.com/sQVe/sort.nvim/,HEAD,
https://github.com/chikatoike/sourcemap.vim/,,
https://github.com/liuchengxu/space-vim/,,
https://github.com/FireIsGood/spaceman.nvim/,HEAD,
https://github.com/ctjhoa/spacevim/,,
https://github.com/chrisgeo/sparkup/,,
https://github.com/cxwx/specs.nvim/,HEAD,
https://github.com/lewis6991/spellsitter.nvim/,HEAD,
+0 −18
Original line number Diff line number Diff line
diff --git a/autoload/SpaceVim.vim b/autoload/SpaceVim.vim
index 16688680..fcafd6f7 100644
--- a/autoload/SpaceVim.vim
+++ b/autoload/SpaceVim.vim
@@ -1355,13 +1355,6 @@ function! SpaceVim#end() abort
     let &helplang = 'jp'
   endif
   ""
-  " generate tags for SpaceVim
-  let help = fnamemodify(g:_spacevim_root_dir, ':p:h') . '/doc'
-  try
-    exe 'helptags ' . help
-  catch
-    call SpaceVim#logger#warn('Failed to generate helptags for SpaceVim')
-  endtry
 
   ""
   " set language
+47 −43
Original line number Diff line number Diff line
{ ripgrep
, git
, fzf
, makeWrapper
, vim-full
, vimPlugins
, fetchFromGitHub
, lib
, stdenv
, formats
, runCommand
, spacevim_config ? import ./init.nix
{
  fetchFromGitHub,
  formats,
  fzf,
  git,
  lib,
  makeWrapper,
  neovim,
  nix-update-script,
  ripgrep,
  runCommand,
  stdenv,
  vim-full,
  spacevim_config ? import ./init.nix,
}:

let
  format = formats.toml { };
  vim-customized = vim-full.customize {
    name = "vim";
    # Not clear at the moment how to import plugins such that
    # SpaceVim finds them and does not auto download them to
    # ~/.cache/vimfiles/repos
    vimrcConfig.packages.myVimPackage = with vimPlugins; { start = [ ]; };
  };
  spacevimdir = runCommand "SpaceVim.d" { } ''
    mkdir -p $out
    cp ${format.generate "init.toml" spacevim_config} $out/init.toml
@@ -28,28 +23,16 @@ let
in
stdenv.mkDerivation rec {
  pname = "spacevim";
  version = "1.8.0";
  version = "2.3.0";
  src = fetchFromGitHub {
    owner = "SpaceVim";
    repo = "SpaceVim";
    rev = "v${version}";
    sha256 = "sha256:11snnh5q47nqhzjb9qya6hpnmlzc060958whqvqrh4hc7gnlnqp8";
    hash = "sha256-MHsAA0x/rfwRupe8aW1JVKGiYkySAX0AhOkBuScpn7I=";
  };

  nativeBuildInputs = [ makeWrapper vim-customized ];
  buildInputs = [ vim-customized ];

  buildPhase = ''
    runHook preBuild
    # generate the helptags
    vim -u NONE -c "helptags $(pwd)/doc" -c q
    runHook postBuild
  '';

  patches = [
    # Don't generate helptags at runtime into read-only $SPACEVIMDIR
    ./helptags.patch
  ];
  nativeBuildInputs = [ makeWrapper ];
  dontBuild = true;

  installPhase = ''
    runHook preInstall
@@ -58,21 +41,42 @@ stdenv.mkDerivation rec {
    cp -r $(pwd) $out/SpaceVim

    # trailing slash very important for SPACEVIMDIR
    makeWrapper "${vim-customized}/bin/vim" "$out/bin/spacevim" \
    makeWrapper "${vim-full}/bin/vim" "$out/bin/spacevim" \
        --add-flags "-u $out/SpaceVim/vimrc" --set SPACEVIMDIR "${spacevimdir}/" \
        --prefix PATH : ${lib.makeBinPath [ fzf git ripgrep]}
        --prefix PATH : ${
          lib.makeBinPath [
            fzf
            git
            ripgrep
          ]
        }
    makeWrapper "${neovim}/bin/nvim" "$out/bin/spacenvim" \
        --add-flags "-u $out/SpaceVim/init.vim" --set SPACEVIMDIR "${spacevimdir}/" \
        --prefix PATH : ${
          lib.makeBinPath [
            fzf
            git
            ripgrep
          ]
        }
    runHook postInstall
  '';

  meta = with lib; {
    description = "Modern Vim distribution";
  passthru.updateScript = nix-update-script { };

  meta = {
    description = "Modular Vim/Neovim configuration";
    longDescription = ''
      SpaceVim is a distribution of the Vim editor that’s inspired by spacemacs.
      SpaceVim is a modular configuration of Vim and Neovim. It's inspired by
      spacemacs. It manages collections of plugins in layers, which help to
      collect related packages together to provide features. This approach
      helps keep the configuration organized and reduces overhead for the user
      by keeping them from having to think about what packages to install.
    '';
    homepage = "https://spacevim.org/";
    license = licenses.gpl3Plus;
    maintainers = [ maintainers.fzakaria ];
    platforms = platforms.all;
    license = lib.licenses.gpl3Plus;
    maintainers = [ lib.maintainers.perchun ];
    platforms = lib.platforms.all;
    mainProgram = "spacevim";
  };
}