Unverified Commit a0ee8690 authored by Naïm Favier's avatar Naïm Favier Committed by GitHub
Browse files

Merge pull request #304335 from phijor/cornelis

cornelis: init at 2024-04-08
parents 0bdd49cb 7d400800
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -2646,6 +2646,18 @@ final: prev:
    meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
  };
  cornelis = buildVimPlugin {
    pname = "cornelis";
    version = "2024-04-17";
    src = fetchFromGitHub {
      owner = "isovector";
      repo = "cornelis";
      rev = "c97b4817034a927dcadb22294cf97a88087a935f";
      sha256 = "03wkq7jly9syv7kqsf66hdq8p7fqk6a240azcys9fsak797nbs1a";
    };
    meta.homepage = "https://github.com/isovector/cornelis/";
  };
  cosco-vim = buildVimPlugin {
    pname = "cosco.vim";
    version = "2018-08-07";
+13 −0
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@
, # command-t dependencies
  getconf
, ruby
, # cornelis dependencies
  cornelis
, # cpsm dependencies
  boost
, cmake
@@ -466,6 +468,17 @@
    patches = [ ./patches/coq_nvim/emulate-venv.patch ];
  };

  cornelis = super.cornelis.overrideAttrs {
    dependencies = with self; [ vim-textobj-user ];
    opt = with self; [ vim-which-key ];
    # Unconditionally use the cornelis binary provided by the top-level package:
    patches = [ ./patches/cornelis/0001-Unconditionally-use-global-binary.patch ];
    postInstall = ''
      substituteInPlace $out/ftplugin/agda.vim \
        --subst-var-by CORNELIS "${lib.getBin cornelis}/bin/cornelis"
    '';
  };

  cpsm = super.cpsm.overrideAttrs {
    nativeBuildInputs = [ cmake ];
    buildInputs = [
+31 −0
Original line number Diff line number Diff line
From f8e993846551bda77a34a77aad7ad6dcc45b66a7 Mon Sep 17 00:00:00 2001
From: Philipp Joram <nixpgks@phijor.me>
Date: Tue, 16 Apr 2024 12:48:42 +0300
Subject: [PATCH] Unconditionally use global binary

---
 ftplugin/agda.vim | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/ftplugin/agda.vim b/ftplugin/agda.vim
index c7dd9d0..6b4aba3 100644
--- a/ftplugin/agda.vim
+++ b/ftplugin/agda.vim
@@ -11,13 +11,7 @@ if exists("b:cornelis_ftplugin")
 endif
 let b:cornelis_ftplugin = 1
 
-if exists("g:cornelis_use_global_binary")
-  call remote#host#Register('cornelis', '*', rpcstart('cornelis', []))
-else
-  call nvimhs#start(expand('<sfile>:p:h:h'), 'cornelis', ['-v', 'DEBUG', '-l', '/tmp/cornelis.log'])
-endif
-
-nnoremap <F5> :call nvimhs#compileAndRestart('cornelis')<CR>
+call remote#host#Register('cornelis', '*', rpcstart('@CORNELIS@', []))
 
 runtime agda-input.vim
 runtime agda-matchpairs.vim
-- 
2.44.0
+1 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ https://github.com/ms-jpq/coq.artifacts/,HEAD,
https://github.com/ms-jpq/coq.thirdparty/,HEAD,
https://github.com/jvoorhis/coq.vim/,,
https://github.com/ms-jpq/coq_nvim/,,
https://github.com/isovector/cornelis/,HEAD,
https://github.com/lfilho/cosco.vim/,,
https://github.com/nixprime/cpsm/,,
https://github.com/saecki/crates.nvim/,,
+27 −0
Original line number Diff line number Diff line
{
  lib,
  haskell,
  haskellPackages,

  # Test dependencies
  cornelis,
  runCommand,
}:
let
  inherit (haskell.lib.compose) overrideCabal justStaticExecutables;
  overrides = {
    description = "agda-mode for Neovim";

    passthru = {
      tests = runCommand "cornelis-tests" { nativeBuildInputs = [ cornelis ]; } ''
        cornelis --help > $out
      '';
    };
  };
in
lib.pipe haskellPackages.cornelis [
  (overrideCabal overrides)

  # Reduce closure size
  justStaticExecutables
]
Loading