Unverified Commit 13af8c87 authored by figsoda's avatar figsoda Committed by GitHub
Browse files

Merge pull request #241834 from GaetanLepage/msjpq

parents 4400df88 53c66b42

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

+1 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ mapAliases (with prev; { 
  solarized           = vim-colors-solarized;

  colors-solarized    = vim-colors-solarized;

  caw                 = caw-vim;

  chad                = chadtree;

  colorsamplerpack    = Colour-Sampler-Pack;

  Colour_Sampler_Pack = Colour-Sampler-Pack;

  command_T           = command-t; # backwards compat, added 2014-10-18

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

+149 −149

File changed.

Preview size limit exceeded, changes collapsed.

pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix

+35 −24
Original line number Diff line number Diff line
@@ -27,12 +27,12 @@ 
  };

  arduino = buildGrammar {

    language = "arduino";

    version = "0.0.0+rev=bf0db73";

    version = "0.0.0+rev=787bc6e";

    src = fetchFromGitHub {

      owner = "ObserverOfTime";

      repo = "tree-sitter-arduino";

      rev = "bf0db73db96ec02f872cb7b5058dcc8bfd8fe714";

      hash = "sha256-7naUhZ1xhJfirA4gYYVc36YuvY66PLGRLCqRLQie11o=";

      rev = "787bc6e1ca23092821231f6096438343f728ee6f";

      hash = "sha256-PKjSNEy27Snu9B2eBZcOQYNXI/cnKhFdrBrePqcp7Rk=";

    };

    meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-arduino";

  };
@@ -49,12 +49,12 @@ 
  };

  awk = buildGrammar {

    language = "awk";

    version = "0.0.0+rev=16e6fd8";

    version = "0.0.0+rev=476b1a0";

    src = fetchFromGitHub {

      owner = "Beaglefoot";

      repo = "tree-sitter-awk";

      rev = "16e6fd822a5efa654d0a1ad7122aa1cc5e489cff";

      hash = "sha256-TbDVyXBcg/0jzs3cFMZCRw7v2iqTfPXmRVBZM4kp0m8=";

      rev = "476b1a0f3de58c31cde57317c744059ca6792e52";

      hash = "sha256-B3bJg/RaeNeKhfnkWYutQeBynYkdphtJoUA1OHehb/8=";

    };

    meta.homepage = "https://github.com/Beaglefoot/tree-sitter-awk";

  };
@@ -146,6 +146,17 @@ 
    };

    meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp";

  };

  cairo = buildGrammar {

    language = "cairo";

    version = "0.0.0+rev=02ec146";

    src = fetchFromGitHub {

      owner = "amaanq";

      repo = "tree-sitter-cairo";

      rev = "02ec1461f11aa126d3c16abb2da284ca3ba15631";

      hash = "sha256-xtGIywLt+sOx82id3/9Me1WTJam8b9gPJfx+2xo7lgg=";

    };

    meta.homepage = "https://github.com/amaanq/tree-sitter-cairo";

  };

  capnp = buildGrammar {

    language = "capnp";

    version = "0.0.0+rev=7d5fa4e";
@@ -986,12 +997,12 @@ 
  };

  julia = buildGrammar {

    language = "julia";

    version = "0.0.0+rev=4d4dc7d";

    version = "0.0.0+rev=784364c";

    src = fetchFromGitHub {

      owner = "tree-sitter";

      repo = "tree-sitter-julia";

      rev = "4d4dc7d8a4ad3856200a9ef151f9056fc14cec8b";

      hash = "sha256-v61uykCKr7QAeqex3JIbnv1EOTEGdOssfNcMrwlkLwI=";

      rev = "784364cb9185ef8dc245de4b0b51e3a22503419d";

      hash = "sha256-MPdDEVbIUsEQu84AB9k2Bhi3Oa47e9/tItGhKMfZLyU=";

    };

    meta.homepage = "https://github.com/tree-sitter/tree-sitter-julia";

  };
@@ -1231,12 +1242,12 @@ 
  };

  nix = buildGrammar {

    language = "nix";

    version = "0.0.0+rev=02878b4";

    version = "0.0.0+rev=14b5361";

    src = fetchFromGitHub {

      owner = "cstrahan";

      repo = "tree-sitter-nix";

      rev = "02878b40ac77d2889833519c6b6e9e63cfc690e6";

      hash = "sha256-9E4iQ7jr52ckmQJBrF9Vdwanrgm2I+Gi1lbC46I+4/g=";

      rev = "14b53610c9038500066c509b2e67de04775b97fe";

      hash = "sha256-FNq/+Voqg534Nnm7rnv2daPwc9uFxNi1ce0m091jmRk=";

    };

    meta.homepage = "https://github.com/cstrahan/tree-sitter-nix";

  };
@@ -1264,24 +1275,24 @@ 
  };

  ocaml = buildGrammar {

    language = "ocaml";

    version = "0.0.0+rev=82e103c";

    version = "0.0.0+rev=7a61e11";

    src = fetchFromGitHub {

      owner = "tree-sitter";

      repo = "tree-sitter-ocaml";

      rev = "82e103cee0ffb61ee59f9b654b8e1d4b8e9cab74";

      hash = "sha256-ukfW16Se3HH5n0NRPhp0oaCHULDpUqvOlvgeTMQUVwE=";

      rev = "7a61e11f8e44b4edee23adb15a187c9dd2beecef";

      hash = "sha256-YW4JaTUkyUnj7X7bQ4hZqa1xjkn3pxSnwUZYkoQVJow=";

    };

    location = "ocaml";

    meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";

  };

  ocaml_interface = buildGrammar {

    language = "ocaml_interface";

    version = "0.0.0+rev=82e103c";

    version = "0.0.0+rev=7a61e11";

    src = fetchFromGitHub {

      owner = "tree-sitter";

      repo = "tree-sitter-ocaml";

      rev = "82e103cee0ffb61ee59f9b654b8e1d4b8e9cab74";

      hash = "sha256-ukfW16Se3HH5n0NRPhp0oaCHULDpUqvOlvgeTMQUVwE=";

      rev = "7a61e11f8e44b4edee23adb15a187c9dd2beecef";

      hash = "sha256-YW4JaTUkyUnj7X7bQ4hZqa1xjkn3pxSnwUZYkoQVJow=";

    };

    location = "interface";

    meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml";
@@ -2033,12 +2044,12 @@ 
  };

  verilog = buildGrammar {

    language = "verilog";

    version = "0.0.0+rev=4457145";

    version = "0.0.0+rev=22f9b84";

    src = fetchFromGitHub {

      owner = "tree-sitter";

      repo = "tree-sitter-verilog";

      rev = "4457145e795b363f072463e697dfe2f6973c9a52";

      hash = "sha256-l4DgThuP9EFU55YQ9lgvVP/8pXojOllQ870gRsBF3FE=";

      rev = "22f9b845c77c52b86b21adaebe689864957f4e31";

      hash = "sha256-X3wIZ9AFc6Cxm4E3NYxRRO8vDfVDuSsupkcLhwkf+QI=";

    };

    meta.homepage = "https://github.com/tree-sitter/tree-sitter-verilog";

  };
@@ -2110,12 +2121,12 @@ 
  };

  wing = buildGrammar {

    language = "wing";

    version = "0.0.0+rev=c4a42cd";

    version = "0.0.0+rev=8b4843a";

    src = fetchFromGitHub {

      owner = "winglang";

      repo = "wing";

      rev = "c4a42cd02490e52cb9ba517f88f6636327f2bc82";

      hash = "sha256-idzWuw5MgP3ayMfKTl+sX6sOVH8Lpk4Lnkz+JUi30XI=";

      rev = "8b4843a1c432d42e00a28f7eafb81a9f591fecb3";

      hash = "sha256-hEV8avT3lr1fui1dyON6I2hQPU+Ox8h2h9adNeHdiFI=";

    };

    location = "libs/tree-sitter-wing";

    generate = true;

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

+13 −38
Original line number Diff line number Diff line
@@ -149,6 +149,17 @@ self: super: { 
    };

  };



  chadtree = super.chadtree.overrideAttrs {

    passthru.python3Dependencies = ps: with ps; [

      pynvim-pp

      pyyaml

      std2

    ];



    # We need some patches so it stops complaining about not being in a venv

    patches = [ ./patches/chadtree/emulate-venv.patch ];

  };



  ChatGPT-nvim = super.ChatGPT-nvim.overrideAttrs {

    dependencies = with self; [ nui-nvim plenary-nvim telescope-nvim ];

  };
@@ -335,45 +346,9 @@ self: super: { 


  coq_nvim = super.coq_nvim.overrideAttrs {

    passthru.python3Dependencies = ps: with ps; [

      pynvim

      pynvim-pp

      pyyaml

      (buildPythonPackage {

        pname = "pynvim_pp";

        version = "unstable-2023-05-17";

        format = "pyproject";

        propagatedBuildInputs = [ setuptools pynvim ];

        src = fetchFromGitHub {

          owner = "ms-jpq";

          repo = "pynvim_pp";

          rev = "91d91ec0cb173ce19d8c93c7999f5038cf08c046";

          fetchSubmodules = false;

          hash = "sha256-wycN9U3f3o0onmx60Z4Ws4DbBxsNwHjLTCB9UgjssLI=";

        };

        meta = with lib; {

          homepage = "https://github.com/ms-jpq/pynvim_pp";

          license = licenses.gpl3Plus;

          maintainers = with maintainers; [ GaetanLepage ];

        };

      })

      (buildPythonPackage {

        pname = "std2";

        version = "unstable-2023-05-17";

        format = "pyproject";

        propagatedBuildInputs = [ setuptools ];

        src = fetchFromGitHub {

          owner = "ms-jpq";

          repo = "std2";

          rev = "d6a7a719ef902e243b7bbd162defed762a27416f";

          fetchSubmodules = false;

          hash = "sha256-dtQaeB4Xkz+wcF0UkM+SajekSkVVPdoJs9n1hHQLR1k=";

        };

        doCheck = true;

        meta = with lib; {

          homepage = "https://github.com/ms-jpq/std2";

          license = licenses.gpl3Plus;

          maintainers = with maintainers; [ GaetanLepage ];

        };

      })

      std2

    ];



    # We need some patches so it stops complaining about not being in a venv

pkgs/applications/editors/vim/plugins/patches/chadtree/emulate-venv.patch

0 → 100644
+41 −0
Original line number Diff line number Diff line 
diff --git a/chadtree/__main__.py b/chadtree/__main__.py

index 83341fc..af8c9b0 100644

--- a/chadtree/__main__.py

+++ b/chadtree/__main__.py

@@ -73,7 +73,7 @@ _EXEC_PATH = Path(executable)

 _EXEC_PATH = _EXEC_PATH.parent.resolve(strict=True) / _EXEC_PATH.name

 _REQ = REQUIREMENTS.read_text()

 

-_IN_VENV = _RT_PY == _EXEC_PATH

+_IN_VENV = True

 

 

 if command == "deps":

@@ -129,7 +129,7 @@ elif command == "run":

     try:

         if not _IN_VENV:

             raise ImportError()

-        elif lock != _REQ:

+        elif False:

             raise ImportError()

         else:

             import pynvim_pp

diff --git a/chadtree/consts.py b/chadtree/consts.py

index e2d3aa0..e77a129 100644

--- a/chadtree/consts.py

+++ b/chadtree/consts.py

@@ -1,4 +1,5 @@

 from os import environ, name

+from pathlib import Path

 

 from chad_types import TOP_LEVEL

 

@@ -24,7 +25,7 @@ SETTINGS_VAR = "chadtree_settings"

 STORAGE

 """

 

-_VARS = TOP_LEVEL / ".vars"

+_VARS = Path.home() / ".cache/chadtree/vars"

 RT_DIR = _VARS / "runtime"

 RT_PY = RT_DIR / "Scripts" / "python.exe" if IS_WIN else RT_DIR / "bin" / "python3"

 SESSION_DIR = _VARS / "sessions"