From 94c0e08808ce3529e4ace6584626d94ca07f21ee Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 5 Mar 2022 18:50:28 -0800 Subject: [PATCH 01/46] submitting-changes.chapter.md: explain that purple arrows are manual The documentation for this diagram explains that the blue arrows are automatic processes which happen every six hours. There is no explanation about how the purple arrows happen or how often. As a new contributor to nixpkgs, I incorrectly assumed that the purple arrows were also automatic processes (they aren't), which left me sort of confused about what the whole scheme was accomplishing. Recently I went through the github history to see how often these events happen, and realized that the purple arrows are (a) triggered manually by a nixpkgs project member and (b) happen much, much, much less frequently than every six hours. Now everything makes a lot more sense. I suggest the wording change in this commit, or something similar, to save future contributors the same confusion that I experienced. --- doc/contributing/submitting-changes.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md index 109d051c016f..043acaedefa7 100644 --- a/doc/contributing/submitting-changes.chapter.md +++ b/doc/contributing/submitting-changes.chapter.md @@ -227,7 +227,7 @@ digraph { } ``` -[This GitHub Action](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/periodic-merge-6h.yml) brings changes from `master` to `staging-next` and from `staging-next` to `staging` every 6 hours. +[This GitHub Action](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/periodic-merge-6h.yml) brings changes from `master` to `staging-next` and from `staging-next` to `staging` every 6 hours; these are the blue arrows in the diagram above. The purple arrows in the diagram above are done manually and much less frequently. You can get an idea of how often these merges occur by looking at the `git-log` for `master` and searching for `from NixOS/staging-next` (for the upper purple arrow) or `staging-next into staging` (for the lower arrow). ### Master branch {#submitting-changes-master-branch} From 50217b01dd68cb4dfc24ecfa568b7f1b69a092cc Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Wed, 20 Apr 2022 03:22:17 -0700 Subject: [PATCH 02/46] submitting-changes.chapter.md: avoid being specific There is some doubt as to exactly how to enumerate all the merges from one branch to another reliably. In the meantime, let's be a little more vague. --- doc/contributing/submitting-changes.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/contributing/submitting-changes.chapter.md b/doc/contributing/submitting-changes.chapter.md index 043acaedefa7..576b0f7d96fe 100644 --- a/doc/contributing/submitting-changes.chapter.md +++ b/doc/contributing/submitting-changes.chapter.md @@ -227,7 +227,7 @@ digraph { } ``` -[This GitHub Action](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/periodic-merge-6h.yml) brings changes from `master` to `staging-next` and from `staging-next` to `staging` every 6 hours; these are the blue arrows in the diagram above. The purple arrows in the diagram above are done manually and much less frequently. You can get an idea of how often these merges occur by looking at the `git-log` for `master` and searching for `from NixOS/staging-next` (for the upper purple arrow) or `staging-next into staging` (for the lower arrow). +[This GitHub Action](https://github.com/NixOS/nixpkgs/blob/master/.github/workflows/periodic-merge-6h.yml) brings changes from `master` to `staging-next` and from `staging-next` to `staging` every 6 hours; these are the blue arrows in the diagram above. The purple arrows in the diagram above are done manually and much less frequently. You can get an idea of how often these merges occur by looking at the git history. ### Master branch {#submitting-changes-master-branch} From 1eca09a8a139354702eb90f0bd85670067eb71ed Mon Sep 17 00:00:00 2001 From: toastal Date: Tue, 7 Jun 2022 13:34:26 +0700 Subject: [PATCH 03/46] =?UTF-8?q?mlton:=2020180207=20=E2=86=92=2020210107?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../compilers/mlton/20210107-binary.nix | 60 +++++++++++++++++++ pkgs/development/compilers/mlton/default.nix | 17 ++++-- pkgs/top-level/all-packages.nix | 3 +- 3 files changed, 75 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/compilers/mlton/20210107-binary.nix diff --git a/pkgs/development/compilers/mlton/20210107-binary.nix b/pkgs/development/compilers/mlton/20210107-binary.nix new file mode 100644 index 000000000000..26a20db0d391 --- /dev/null +++ b/pkgs/development/compilers/mlton/20210107-binary.nix @@ -0,0 +1,60 @@ +{ lib, stdenv, fetchurl, patchelf, gmp }: +let + dynamic-linker = stdenv.cc.bintools.dynamicLinker; +in +stdenv.mkDerivation rec { + pname = "mlton"; + version = "20210107"; + + src = + if stdenv.hostPlatform.system == "x86_64-linux" then + (fetchurl { + url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-linux-glibc2.31.tgz.tgz"; + sha256 = "0f4q575yfm5dpg4a2wsnqn4l2zrar96p6rlsk0dw10ggyfwvsjlf"; + }) + else if stdenv.hostPlatform.system == "x86_64-darwin" then + (fetchurl { + url = "https://github.com/MLton/mlton/releases/download/on-${version}-release/${pname}-${version}-1.amd64-darwin-19.6.gmp-static.tgz"; + sha256 = "1cw7yhw48qp12q0adwf8srpjzrgkp84kmlkqw3pz8vkxz4p9hbdv"; + }) + else + throw "Architecture not supported"; + + buildInputs = [ gmp ]; + nativeBuildInputs = lib.optional stdenv.isLinux patchelf; + + buildPhase = '' + make update \ + CC="$(type -p cc)" \ + WITH_GMP_INC_DIR="${gmp.dev}/include" \ + WITH_GMP_LIB_DIR="${gmp}/lib" + ''; + + installPhase = '' + make install PREFIX=$out + ''; + + postFixup = lib.optionalString stdenv.isLinux '' + patchelf --set-interpreter ${dynamic-linker} $out/lib/mlton/mlton-compile + patchelf --set-rpath ${gmp}/lib $out/lib/mlton/mlton-compile + + for e in mllex mlnlffigen mlprof mlyacc; do + patchelf --set-interpreter ${dynamic-linker} $out/bin/$e + patchelf --set-rpath ${gmp}/lib $out/bin/$e + done + '' + lib.optionalString stdenv.isDarwin '' + install_name_tool -change \ + /opt/local/lib/libgmp.10.dylib \ + ${gmp}/lib/libgmp.10.dylib \ + $out/lib/mlton/mlton-compile + + for e in mllex mlnlffigen mlprof mlyacc; do + install_name_tool -change \ + /opt/local/lib/libgmp.10.dylib \ + ${gmp}/lib/libgmp.10.dylib \ + $out/bin/$e + done + ''; + + meta = import ./meta.nix; +} diff --git a/pkgs/development/compilers/mlton/default.nix b/pkgs/development/compilers/mlton/default.nix index e4381774781c..1caeecccaadb 100644 --- a/pkgs/development/compilers/mlton/default.nix +++ b/pkgs/development/compilers/mlton/default.nix @@ -1,9 +1,9 @@ { callPackage }: rec { - mlton20130715 = callPackage ./20130715.nix {}; + mlton20130715 = callPackage ./20130715.nix { }; - mlton20180207Binary = callPackage ./20180207-binary.nix {}; + mlton20180207Binary = callPackage ./20180207-binary.nix { }; mlton20180207 = callPackage ./from-git-source.nix { mltonBootstrap = mlton20180207Binary; @@ -12,10 +12,19 @@ rec { sha256 = "00rdd2di5x1dzac64il9z05m3fdzicjd3226wwjyynv631jj3q2a"; }; + mlton20210107Binary = callPackage ./20210107-binary.nix { }; + + mlton20210107 = callPackage ./from-git-source.nix { + mltonBootstrap = mlton20180207Binary; + version = "20210107"; + rev = "on-20210117-release"; + sha256 = "sha256-rqL8lnzVVR+5Hc7sWXK8dCXN92dU76qSoii3/4StODM="; + }; + mltonHEAD = callPackage ./from-git-source.nix { mltonBootstrap = mlton20180207Binary; version = "HEAD"; - rev = "e149c9917cfbfe6aba5c986a958ed76d5cc6cfde"; - sha256 = "0a0j1i0f0fxw2my1309srq5j3vz0kawrrln01gxms2m5hy5dl50d"; + rev = "875f7912a0b135a9a7e86a04ecac9cacf0bfe5e5"; + sha256 = "sha256-/MIoVqqv8qrJPehU7VRFpXtAAo8UUzE3waEvB7WnS9A="; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5f0233302b33..32df3a35196a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13523,9 +13523,10 @@ with pkgs; mlton20130715 mlton20180207Binary mlton20180207 + mlton20210107 mltonHEAD; - mlton = mlton20180207; + mlton = mlton20210107; mono = mono6; From 47cbc38f087ddecb4feb68ac19a0d1b07422b3aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 12 Jun 2022 02:39:30 +0200 Subject: [PATCH 04/46] tree-sitter: init tree-sitter-go-work --- .../tools/parsing/tree-sitter/grammars/default.nix | 1 + .../tree-sitter/grammars/tree-sitter-gowork.json | 11 +++++++++++ pkgs/development/tools/parsing/tree-sitter/update.nix | 4 ++++ 3 files changed, 16 insertions(+) create mode 100644 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 05964496ea87..0292a6f80e05 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -30,6 +30,7 @@ tree-sitter-glimmer = lib.importJSON ./tree-sitter-glimmer.json; tree-sitter-glsl = lib.importJSON ./tree-sitter-glsl.json; tree-sitter-go = lib.importJSON ./tree-sitter-go.json; + tree-sitter-gowork = lib.importJSON ./tree-sitter-gowork.json; tree-sitter-godot-resource = lib.importJSON ./tree-sitter-godot-resource.json; tree-sitter-gomod = lib.importJSON ./tree-sitter-gomod.json; tree-sitter-graphql = lib.importJSON ./tree-sitter-graphql.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json new file mode 100644 index 000000000000..590d0c77d614 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/omertuc/tree-sitter-go-work", + "rev": "6dd9dd79fb51e9f2abc829d5e97b15015b6a8ae2", + "date": "2021-12-18T20:13:22+01:00", + "path": "/nix/store/7a4raw2gi4xgbg858cs0davbplj7m8rq-tree-sitter-gowork", + "sha256": "1kzrs4rpby3b0h87rbr02k55k3mmkmdy7rvl11q95b3ym0smmyqb", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 1512f985fa42..34cda7ef33bf 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -178,6 +178,10 @@ let orga = "camdencheek"; repo = "tree-sitter-go-mod"; }; + "tree-sitter-gowork" = { + orga = "omertuc"; + repo = "tree-sitter-go-work"; + }; "tree-sitter-graphql" = { orga = "bkegley"; repo = "tree-sitter-graphql"; From cd5793da838c9719d9862286d213403fe968942a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 12 Jun 2022 03:17:48 +0200 Subject: [PATCH 05/46] tree-sitter: update grammars --- .../parsing/tree-sitter/grammars/tree-sitter-clojure.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-elm.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-haskell.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-hcl.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-heex.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-latex.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-php.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-prisma.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-scala.json | 8 ++++---- .../parsing/tree-sitter/grammars/tree-sitter-scheme.json | 8 ++++---- .../tree-sitter/grammars/tree-sitter-typescript.json | 8 ++++---- 11 files changed, 44 insertions(+), 44 deletions(-) diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json index 292b7c032666..abc1625810a5 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json @@ -1,9 +1,9 @@ { "url": "https://github.com/sogaiu/tree-sitter-clojure", - "rev": "879f0e726295807d917d576fcf9e1e432c4c20fc", - "date": "2022-04-11T22:46:47+09:00", - "path": "/nix/store/19bcj8f61w958njvksnqzm5r5s8szzz2-tree-sitter-clojure", - "sha256": "16g7s819gjgdc4wlp7rnvyv5i5dqa1yawxs8l4ggnz8n8acqza9n", + "rev": "e57c569ae332ca365da623712ae1f50f84daeae2", + "date": "2022-06-03T17:55:54+09:00", + "path": "/nix/store/fx58zcfxr983yczijs6cgdfa3158bl0s-tree-sitter-clojure", + "sha256": "0hq8rv4s0gzbfv3qj4gsrm87baiy6k1hyfbhbbpwbrcpd8jl7gdn", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json index 19129d053a05..bdb451c69ec9 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json @@ -1,9 +1,9 @@ { "url": "https://github.com/elm-tooling/tree-sitter-elm", - "rev": "5128296ba8542853d59e6b7c8dfe3d1fb9a637ea", - "date": "2022-02-04T13:10:25+01:00", - "path": "/nix/store/8brpvn8y88x3f3dsbgqql57kp9bygj3w-tree-sitter-elm", - "sha256": "10hbi4vyj4hjixqswdcbvzl60prldczz29mlp02if61wvwiwvqrw", + "rev": "a9a8efad446f78db3989d7ed8517987daf510c83", + "date": "2022-06-07T23:23:33+02:00", + "path": "/nix/store/rqmldb72cml0qm7p8kpjlj064f5miprc-tree-sitter-elm", + "sha256": "11d9lrybhqi85lxr7gf8s4zxgbclnjiwn0w1mga3lsh9nnf50a4a", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json index 7ebbb5d4df0c..89a249a68cb0 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-haskell", - "rev": "1b54c3f39436bbded6593ac9e0103f9115bbbd2e", - "date": "2022-05-19T19:09:09+02:00", - "path": "/nix/store/d9825wx3mjjj76pcbbz4pd6fz5h0c2ag-tree-sitter-haskell", - "sha256": "11brbizaw5m77hrmg6i5s437y4f1xgvfvjddfy1n39zpyf5x6nad", + "rev": "ca0a13f1acb60cf32e74cced3cb623b6c70fa77c", + "date": "2022-06-06T23:15:37+02:00", + "path": "/nix/store/dmq8mc361rkhrpa5s06h1z9k8khkvi78-tree-sitter-haskell", + "sha256": "1r3mfnj1f6p2cqriay22jjfggrmyywimidzmzw8h5q84flngdg2s", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json index 24d731be7a2d..89a328038338 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hcl.json @@ -1,9 +1,9 @@ { "url": "https://github.com/MichaHoffmann/tree-sitter-hcl", - "rev": "3cb7fc28247efbcb2973b97e71c78838ad98a583", - "date": "2021-09-20T21:50:41+02:00", - "path": "/nix/store/rgd0p162smlfn90ggyq3y6y4q9sgybwh-tree-sitter-hcl", - "sha256": "0hg7w3hsvxjwz1rb1izknn46msm4mkjx2cnq603lzn7i9mb1pbyr", + "rev": "4ff21306a71269c4ac814769b90b0ecf3194d21d", + "date": "2022-06-02T20:13:06+02:00", + "path": "/nix/store/jsn5dixjqqvwagcgwgjdr91igic2r42w-tree-sitter-hcl", + "sha256": "1gvpl6kw83ywwd64ssz5xs4idc8ip2jmiz2mfy9xlkjbl9nfngci", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json index 1a067f18d14c..0220be6596c9 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json @@ -1,9 +1,9 @@ { "url": "https://github.com/connorlay/tree-sitter-heex", - "rev": "57e46b4b002d5fb5c1f2706fe42380e544ecab5f", - "date": "2022-04-17T10:39:01-07:00", - "path": "/nix/store/afmvzkh237ikn0b9fw51crzhyk4ys1d2-tree-sitter-heex", - "sha256": "0gfxqph5j3n3dlpnyw85lrwhgjh4zm7mdrnf0qyv0f2basayfabm", + "rev": "4d8d646bba27ec11bbf76ea37410a604d2e18bfc", + "date": "2022-06-09T17:09:44-05:00", + "path": "/nix/store/hcn9zl21asz1h6h2abqjpcc37sr56s6s-tree-sitter-heex", + "sha256": "0s38g23npq4k2yfwijmp14wmk7klhlycr4jl9a1hnh8qqihxjbj1", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json index 12c26b133ca7..43badeec1219 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json @@ -1,9 +1,9 @@ { "url": "https://github.com/latex-lsp/tree-sitter-latex", - "rev": "104a5dea952d5f00150afd6a8436e6cad95ef718", - "date": "2022-06-01T18:13:32+00:00", - "path": "/nix/store/7y5r30ylv51rqn3d8wk088ni7k58nzpm-tree-sitter-latex", - "sha256": "0b78hpp76hkpjd38zjfc2z98ipnazk2aza83k4r754gj8yshhsqx", + "rev": "9cbe0c6be9455b6d3be19f51daef6d08732abab1", + "date": "2022-06-05T08:50:52+02:00", + "path": "/nix/store/63i0iskmn862l0rm8gdkgs1bsxxpxw54-tree-sitter-latex", + "sha256": "1ahij4lwg59xvzy2jn8i4rpp6bjz8pl7sqwn6a3rwal3d2x89b3d", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json index 1bf9fe3c6c74..d7b8f83ef50a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-php", - "rev": "fdbef3621b62e098d7c9a34669cbe8a8bd807bf2", - "date": "2022-06-01T15:02:43+02:00", - "path": "/nix/store/rq8rljxmmnii1w2bw3n7224vmwnm0j1n-tree-sitter-php", - "sha256": "1bsdls8icmh6wnyhdibmxxignmdx3wh0bkcrwcwc7mc0xac5r4z2", + "rev": "866e4a155739a1374da5247b876e70f8639005f6", + "date": "2022-06-06T09:18:54+02:00", + "path": "/nix/store/23f9s4z321mnjnqfxjdj75rkcvwv2xpa-tree-sitter-php", + "sha256": "11nagsvq2jsinrhsfpnylz1lkp6hiw3jndshnjvzvkjmmpavm1gr", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json index 9688a1d2b7c7..0e0d0adde497 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json @@ -1,9 +1,9 @@ { "url": "https://github.com/victorhqc/tree-sitter-prisma", - "rev": "0ac307e4be0409d4327082ddc737ed432a49dfc3", - "date": "2022-04-20T10:52:00+02:00", - "path": "/nix/store/24vp6k2ijg832c95hx2x0j8x4i6pxffz-tree-sitter-prisma", - "sha256": "13rcwlkxv9dns7mgxrb34vzhq32c854bna6gsyczvs6vishm6i9l", + "rev": "17a59236ac25413b81b1613ea6ba5d8d52d7cd6c", + "date": "2022-06-11T23:04:44+02:00", + "path": "/nix/store/qdkwinjdy495z59wvxhifk8caksndswj-tree-sitter-prisma", + "sha256": "1pw9mi6hhvww4i7gf7snl893b3hwnfwp18rhbcsf7z52cr78mmqi", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json index 4cdaa55dd286..5650370f589a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-scala", - "rev": "8599058ef292e82203a1b23d10734dcbaf4d1b5c", - "date": "2022-05-09T16:17:13-07:00", - "path": "/nix/store/q802q124fq79wwr6m4xfcdmgw6fzjigw-tree-sitter-scala", - "sha256": "0i6qkgyv722jwma2rs0nf02jzl5dvml5m1whb7580qnza95x7py1", + "rev": "140c96cf398693189d4e50f76d19ddfcd8a018f8", + "date": "2022-06-06T08:54:55+02:00", + "path": "/nix/store/a1pi2xyaq2jjllbkj44xhi5cp0vnlnm4-tree-sitter-scala", + "sha256": "1hfx696x5pfww6zsfv36wkmxld14f02krmx55fy5rgzlz1m3xgja", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json index 5201d477c286..d54329b9aae7 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json @@ -1,9 +1,9 @@ { "url": "https://github.com/6cdh/tree-sitter-scheme", - "rev": "1448396b310486e7d15e5e056713457cb0413bc2", - "date": "2022-05-17T11:34:51+08:00", - "path": "/nix/store/bhwsjp4salwmfq5cyvr0dd3al5s9xhsl-tree-sitter-scheme", - "sha256": "1m9pzlzrmphx6162dq2nxry30wpjbsi1zhl4asjvmc0zy4r3427f", + "rev": "5bb5b2de83d548243fbcc77e76224882ffb4ce68", + "date": "2022-06-07T22:14:20+08:00", + "path": "/nix/store/jy8z2s9zmgxm8ziv39cqkkia52mq7mbx-tree-sitter-scheme", + "sha256": "1cdbzmgkz3f1zbhgps9q1zvy1hnwwj5rlr5fp4jbvbnwp13pd04a", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json index 44477aa24d3c..df1e810151ff 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-typescript", - "rev": "8e9dba7bd7cf089838a036a98be94db53ba2d0a9", - "date": "2022-04-13T09:44:02-07:00", - "path": "/nix/store/188d0ki07nhmihrl2b868vmb9rd4hf4q-tree-sitter-typescript", - "sha256": "010nnihmaw1a1l9mzjd1nmrb0z6j2h3pr872dzpdq7ajg0j3j1wl", + "rev": "1b3ba31c7538825b05815f4f5bffcca6394edc63", + "date": "2022-06-02T09:10:56-07:00", + "path": "/nix/store/g3q8azmyclcdns0ihwl5im46qlsfxbfj-tree-sitter-typescript", + "sha256": "1iw6823zh2m95gjmly34j49ixga07fhax7z6g2q6px06gj4fm5df", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, From 7b4b39cbc1d8d70c9d94f884130a9a4adc4d6e75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 12 Jun 2022 03:49:12 +0200 Subject: [PATCH 06/46] tree-sitter: init tree-sitter-rego --- .../tools/parsing/tree-sitter/grammars/default.nix | 1 + .../tree-sitter/grammars/tree-sitter-rego.json | 11 +++++++++++ pkgs/development/tools/parsing/tree-sitter/update.nix | 4 ++++ 3 files changed, 16 insertions(+) create mode 100644 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 0292a6f80e05..6fede9f6832f 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -69,6 +69,7 @@ tree-sitter-query = lib.importJSON ./tree-sitter-query.json; tree-sitter-r = lib.importJSON ./tree-sitter-r.json; tree-sitter-regex = lib.importJSON ./tree-sitter-regex.json; + tree-sitter-rego = lib.importJSON ./tree-sitter-rego.json; tree-sitter-rst = lib.importJSON ./tree-sitter-rst.json; tree-sitter-ruby = lib.importJSON ./tree-sitter-ruby.json; tree-sitter-rust = lib.importJSON ./tree-sitter-rust.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json new file mode 100644 index 000000000000..7540751ab7ab --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/FallenAngel97/tree-sitter-rego", + "rev": "6bf5f8878bef2fb760508bff1ce0262a31925018", + "date": "2022-04-23T19:59:01+03:00", + "path": "/nix/store/gnbksy85s2z7b8c02im8liaa1d7g07my-tree-sitter-rego", + "sha256": "1ly2lhk4mfqmsg3pzv21ikzsxaz39bah3sgd3lcbaiqd0zzgbzks", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index 34cda7ef33bf..a0cd14e1b67a 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -122,6 +122,10 @@ let orga = "MDeiml"; repo = "tree-sitter-markdown"; }; + "tree-sitter-rego" = { + orga = "FallenAngel97"; + repo = "tree-sitter-rego"; + }; "tree-sitter-rst" = { orga = "stsewd"; repo = "tree-sitter-rst"; From 4532226e4dc038217e83e5eaf80f17a983a25ae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 12 Jun 2022 04:00:00 +0200 Subject: [PATCH 07/46] tree-sitter: init tree-sitter-sql --- .../tools/parsing/tree-sitter/grammars/default.nix | 1 + .../parsing/tree-sitter/grammars/tree-sitter-sql.json | 11 +++++++++++ pkgs/development/tools/parsing/tree-sitter/update.nix | 4 ++++ 3 files changed, 16 insertions(+) create mode 100644 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 6fede9f6832f..d50106166c50 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -77,6 +77,7 @@ tree-sitter-scheme = lib.importJSON ./tree-sitter-scheme.json; tree-sitter-scss = lib.importJSON ./tree-sitter-scss.json; tree-sitter-sparql = lib.importJSON ./tree-sitter-sparql.json; + tree-sitter-sql = lib.importJSON ./tree-sitter-sql.json; tree-sitter-supercollider = lib.importJSON ./tree-sitter-supercollider.json; tree-sitter-surface = lib.importJSON ./tree-sitter-surface.json; tree-sitter-svelte = lib.importJSON ./tree-sitter-svelte.json; diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json new file mode 100644 index 000000000000..d8413f75d7d5 --- /dev/null +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json @@ -0,0 +1,11 @@ +{ + "url": "https://github.com/m-novikov/tree-sitter-sql", + "rev": "2ec2fedbb38d09737e2a1cdd207f6416dc1cb109", + "date": "2022-06-11T22:57:56+02:00", + "path": "/nix/store/zzx4b5cnsrrdzkb5rbmx5d8vzbyr0rbi-tree-sitter-sql", + "sha256": "0dcpdshymyszsr1dflsr3j6ynrnrq0g4qdxqcz7d0anpwh3xw4cs", + "fetchLFS": false, + "fetchSubmodules": false, + "deepClone": false, + "leaveDotGit": false +} diff --git a/pkgs/development/tools/parsing/tree-sitter/update.nix b/pkgs/development/tools/parsing/tree-sitter/update.nix index a0cd14e1b67a..61f80ce376e5 100644 --- a/pkgs/development/tools/parsing/tree-sitter/update.nix +++ b/pkgs/development/tools/parsing/tree-sitter/update.nix @@ -134,6 +134,10 @@ let orga = "Himujjal"; repo = "tree-sitter-svelte"; }; + "tree-sitter-sql" = { + orga = "m-novikov"; + repo = "tree-sitter-sql"; + }; "tree-sitter-vim" = { orga = "vigoux"; repo = "tree-sitter-viml"; From e25d36346f77491ce35b81d4e53368e2f9dc1007 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Mon, 13 Jun 2022 15:07:11 +0200 Subject: [PATCH 08/46] xdg-desktop-portal-wlr: 0.5.0 -> 0.6.0 --- .../xdg-desktop-portal-wlr/default.nix | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix index a8450b414e54..5ccd9d6fa49e 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-wlr/default.nix @@ -1,20 +1,35 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper -, meson, ninja, pkg-config, wayland-protocols -, pipewire, wayland, systemd, libdrm, inih, scdoc, grim, slurp }: +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, meson +, ninja +, pkg-config +, wayland-protocols +, grim +, inih +, libdrm +, mesa +, pipewire +, scdoc +, slurp +, systemd +, wayland +}: stdenv.mkDerivation rec { pname = "xdg-desktop-portal-wlr"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "emersion"; repo = pname; rev = "v${version}"; - sha256 = "sha256-weePlNcLmZ3R0IDQ95p0wQvsKTYp+sVlTENJtF8Z78Y="; + sha256 = "sha256-UztkfvMIbslPd/d262NZFb6WfESc9nBsSSH96BA4Aqw="; }; nativeBuildInputs = [ meson ninja pkg-config wayland-protocols makeWrapper ]; - buildInputs = [ pipewire wayland systemd libdrm inih scdoc ]; + buildInputs = [ inih libdrm mesa pipewire scdoc systemd wayland ]; mesonFlags = [ "-Dsd-bus-provider=libsystemd" From d22931cf0541895330b2d295a7be563e7a572231 Mon Sep 17 00:00:00 2001 From: kilianar Date: Mon, 13 Jun 2022 16:21:23 +0200 Subject: [PATCH 09/46] raven-reader: 1.0.72 -> 1.0.73 https://github.com/hello-efficiency-inc/raven-reader/releases/tag/v1.0.73 --- .../networking/newsreaders/raven-reader/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/raven-reader/default.nix b/pkgs/applications/networking/newsreaders/raven-reader/default.nix index 0858b4690bb8..f458efd92ebd 100644 --- a/pkgs/applications/networking/newsreaders/raven-reader/default.nix +++ b/pkgs/applications/networking/newsreaders/raven-reader/default.nix @@ -2,10 +2,10 @@ let pname = "raven-reader"; - version = "1.0.72"; + version = "1.0.73"; src = fetchurl { url = "https://github.com/hello-efficiency-inc/raven-reader/releases/download/v${version}/Raven-Reader-${version}.AppImage"; - sha256 = "sha256-Sx02VMAgmncT9f5Hvs0LugzhD6Z8cWXHx4kn8IG9seU="; + sha256 = "sha256-wU99+nDXHGMad94qszw5uThKckk1ToUvjNrIf/yTeTM="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; From 865a32dd51fa796ec105ff7fa72735b3a5529e5b Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Fri, 13 May 2022 08:05:35 -0400 Subject: [PATCH 10/46] vimPlugins.cmp-neosnippet: init at 2022-01-06 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index f2699445dbb1..b8af571928b0 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1168,6 +1168,18 @@ final: prev: meta.homepage = "https://github.com/kdheepak/cmp-latex-symbols/"; }; + cmp-neosnippet = buildVimPluginFrom2Nix { + pname = "cmp-neosnippet"; + version = "2022-01-06"; + src = fetchFromGitHub { + owner = "notomo"; + repo = "cmp-neosnippet"; + rev = "2d14526af3f02dcea738b4cea520e6ce55c09979"; + sha256 = "0xf3nfkgbrfhac8nadkzq22pzi9gsidax4ddavqkqqivlcgllrgf"; + }; + meta.homepage = "https://github.com/notomo/cmp-neosnippet/"; + }; + cmp-nvim-lsp = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp"; version = "2022-05-16"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index fa175badfd7b..08f90347a798 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -133,6 +133,10 @@ self: super: { ''; }); + cmp-neosnippet = super.cmp-neosnippet.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp neosnippet ]; + }); + cmp-tabnine = super.cmp-tabnine.overrideAttrs (old: { buildInputs = [ tabnine ]; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index f79b420714e7..5172fb203d14 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -98,6 +98,7 @@ https://github.com/hrsh7th/cmp-cmdline/,, https://github.com/PaterJason/cmp-conjure/,, https://github.com/hrsh7th/cmp-emoji/,, https://github.com/kdheepak/cmp-latex-symbols/,, +https://github.com/notomo/cmp-neosnippet/,HEAD, https://github.com/hrsh7th/cmp-nvim-lsp/,, https://github.com/hrsh7th/cmp-nvim-lsp-document-symbol/,, https://github.com/hrsh7th/cmp-nvim-lua/,, From 43c23c919e592d79943011b9a8a992b9edd58076 Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Fri, 13 May 2022 08:06:17 -0400 Subject: [PATCH 11/46] vimPlugins.cmp-snippy: init at 2021-09-20 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index b8af571928b0..53e040f6f532 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1264,6 +1264,18 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-path/"; }; + cmp-snippy = buildVimPluginFrom2Nix { + pname = "cmp-snippy"; + version = "2021-09-20"; + src = fetchFromGitHub { + owner = "dcampos"; + repo = "cmp-snippy"; + rev = "9af1635fe40385ffa3dabf322039cb5ae1fd7d35"; + sha256 = "1ag31kvd2q1awasdrc6pbbbsf0l3c99crz4h03337wj1kcssiixy"; + }; + meta.homepage = "https://github.com/dcampos/cmp-snippy/"; + }; + cmp-spell = buildVimPluginFrom2Nix { pname = "cmp-spell"; version = "2021-10-19"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 5172fb203d14..5d184acde4f7 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -106,6 +106,7 @@ https://github.com/quangnguyen30192/cmp-nvim-ultisnips/,, https://github.com/hrsh7th/cmp-omni/,, https://github.com/jc-doyle/cmp-pandoc-references/,, https://github.com/hrsh7th/cmp-path/,, +https://github.com/dcampos/cmp-snippy/,HEAD, https://github.com/f3fora/cmp-spell/,, https://github.com/tzachar/cmp-tabnine/,, https://github.com/andersevenrud/cmp-tmux/,, From 0d921381b640c30323432f8a4dcb0c272a83ca0e Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Fri, 13 May 2022 08:06:59 -0400 Subject: [PATCH 12/46] vimPlugins.cmp-dictionary: init at 2022-05-04 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 53e040f6f532..6174c9faf82b 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1144,6 +1144,18 @@ final: prev: meta.homepage = "https://github.com/PaterJason/cmp-conjure/"; }; + cmp-dictionary = buildVimPluginFrom2Nix { + pname = "cmp-dictionary"; + version = "2022-05-04"; + src = fetchFromGitHub { + owner = "uga-rosa"; + repo = "cmp-dictionary"; + rev = "0ba3df56258b48a5a6a0130d31ae3cf4908c9567"; + sha256 = "1ny42i913w476bwyrlkwkiv14bdakvnkqx26py45f9qlzrfqj2m5"; + }; + meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; + }; + cmp-emoji = buildVimPluginFrom2Nix { pname = "cmp-emoji"; version = "2021-09-28"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 5d184acde4f7..7210936bd262 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -96,6 +96,7 @@ https://github.com/hrsh7th/cmp-buffer/,, https://github.com/hrsh7th/cmp-calc/,, https://github.com/hrsh7th/cmp-cmdline/,, https://github.com/PaterJason/cmp-conjure/,, +https://github.com/uga-rosa/cmp-dictionary/,HEAD, https://github.com/hrsh7th/cmp-emoji/,, https://github.com/kdheepak/cmp-latex-symbols/,, https://github.com/notomo/cmp-neosnippet/,HEAD, From bcb285921bc134b18468452998bb114a88e93415 Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Fri, 13 May 2022 08:07:41 -0400 Subject: [PATCH 13/46] vimPlugins.cmp-digraphs: init at 2021-12-13 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 6174c9faf82b..58bf8ae7443b 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1156,6 +1156,18 @@ final: prev: meta.homepage = "https://github.com/uga-rosa/cmp-dictionary/"; }; + cmp-digraphs = buildVimPluginFrom2Nix { + pname = "cmp-digraphs"; + version = "2021-12-13"; + src = fetchFromGitHub { + owner = "dmitmel"; + repo = "cmp-digraphs"; + rev = "5efc1f0078d7c5f3ea1c8e3aad04da3fd6e081a9"; + sha256 = "061rf7c4lfghsryldmgk5inmwa1994imp1j0l94qgaig6s6hb0kg"; + }; + meta.homepage = "https://github.com/dmitmel/cmp-digraphs/"; + }; + cmp-emoji = buildVimPluginFrom2Nix { pname = "cmp-emoji"; version = "2021-09-28"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 7210936bd262..22155edd5ebf 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -97,6 +97,7 @@ https://github.com/hrsh7th/cmp-calc/,, https://github.com/hrsh7th/cmp-cmdline/,, https://github.com/PaterJason/cmp-conjure/,, https://github.com/uga-rosa/cmp-dictionary/,HEAD, +https://github.com/dmitmel/cmp-digraphs/,HEAD, https://github.com/hrsh7th/cmp-emoji/,, https://github.com/kdheepak/cmp-latex-symbols/,, https://github.com/notomo/cmp-neosnippet/,HEAD, From 9782b8161e8bd63dfa4e0f4da35a7145db010bf2 Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Fri, 13 May 2022 08:08:24 -0400 Subject: [PATCH 14/46] vimPlugins.cmp-nvim-lsp-signature-help: init at 2022-03-29 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 58bf8ae7443b..83dde418fd57 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1228,6 +1228,18 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp-document-symbol/"; }; + cmp-nvim-lsp-signature-help = buildVimPluginFrom2Nix { + pname = "cmp-nvim-lsp-signature-help"; + version = "2022-03-29"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "cmp-nvim-lsp-signature-help"; + rev = "8014f6d120f72fe0a135025c4d41e3fe41fd411b"; + sha256 = "1k61aw9mp012h625jqrf311vnsm2rg27k08lxa4nv8kp6nk7il29"; + }; + meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp-signature-help/"; + }; + cmp-nvim-lua = buildVimPluginFrom2Nix { pname = "cmp-nvim-lua"; version = "2021-10-11"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 22155edd5ebf..6072711912f8 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -103,6 +103,7 @@ https://github.com/kdheepak/cmp-latex-symbols/,, https://github.com/notomo/cmp-neosnippet/,HEAD, https://github.com/hrsh7th/cmp-nvim-lsp/,, https://github.com/hrsh7th/cmp-nvim-lsp-document-symbol/,, +https://github.com/hrsh7th/cmp-nvim-lsp-signature-help/,HEAD, https://github.com/hrsh7th/cmp-nvim-lua/,, https://github.com/quangnguyen30192/cmp-nvim-ultisnips/,, https://github.com/hrsh7th/cmp-omni/,, From 68dd2e5c8a5277c4ca2ea6ab253064d48abdfcee Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Fri, 13 May 2022 08:09:07 -0400 Subject: [PATCH 15/46] vimPlugins.cmp-vim-lsp: init at 2021-10-26 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 83dde418fd57..b50172ed3307 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1372,6 +1372,18 @@ final: prev: meta.homepage = "https://github.com/lukas-reineke/cmp-under-comparator/"; }; + cmp-vim-lsp = buildVimPluginFrom2Nix { + pname = "cmp-vim-lsp"; + version = "2021-10-26"; + src = fetchFromGitHub { + owner = "dmitmel"; + repo = "cmp-vim-lsp"; + rev = "b13312a8c1a74a8747e64117f26f17390e8abfa8"; + sha256 = "1f43qwxr8l2qj4mq1lfk5z3c0bqs8dlgyy1yj1acpnknrgi8572p"; + }; + meta.homepage = "https://github.com/dmitmel/cmp-vim-lsp/"; + }; + cmp-vsnip = buildVimPluginFrom2Nix { pname = "cmp-vsnip"; version = "2021-11-10"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 6072711912f8..6fdc6e4c4cc0 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -115,6 +115,7 @@ https://github.com/tzachar/cmp-tabnine/,, https://github.com/andersevenrud/cmp-tmux/,, https://github.com/ray-x/cmp-treesitter/,, https://github.com/lukas-reineke/cmp-under-comparator/,, +https://github.com/dmitmel/cmp-vim-lsp/,HEAD, https://github.com/hrsh7th/cmp-vsnip/,, https://github.com/saadparwaiz1/cmp_luasnip/,, https://github.com/vn-ki/coc-clap/,, From 14d7a9c473d41869e3e5a7d31d6a2a37acedccfa Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Fri, 13 May 2022 08:09:49 -0400 Subject: [PATCH 16/46] vimPlugins.cmp-git: init at 2022-05-11 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index b50172ed3307..f23c0952bdde 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1180,6 +1180,18 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-emoji/"; }; + cmp-git = buildVimPluginFrom2Nix { + pname = "cmp-git"; + version = "2022-05-11"; + src = fetchFromGitHub { + owner = "petertriho"; + repo = "cmp-git"; + rev = "60e3de62b925ea05c7aa37883408859c72d498fb"; + sha256 = "0qbfby0b7ix1x5ak130ja2h1ngq0p20jb9msr29bijfy68afpdw1"; + }; + meta.homepage = "https://github.com/petertriho/cmp-git/"; + }; + cmp-latex-symbols = buildVimPluginFrom2Nix { pname = "cmp-latex-symbols"; version = "2021-09-10"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 6fdc6e4c4cc0..ac3412559817 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -99,6 +99,7 @@ https://github.com/PaterJason/cmp-conjure/,, https://github.com/uga-rosa/cmp-dictionary/,HEAD, https://github.com/dmitmel/cmp-digraphs/,HEAD, https://github.com/hrsh7th/cmp-emoji/,, +https://github.com/petertriho/cmp-git/,HEAD, https://github.com/kdheepak/cmp-latex-symbols/,, https://github.com/notomo/cmp-neosnippet/,HEAD, https://github.com/hrsh7th/cmp-nvim-lsp/,, From 96fcb504d1f586908d20b95e49ca6781a5c9205c Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Fri, 13 May 2022 08:10:32 -0400 Subject: [PATCH 17/46] vimPlugins.cmp-conventionalcommits: init at 2021-10-28 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index f23c0952bdde..3d3352df0892 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1144,6 +1144,18 @@ final: prev: meta.homepage = "https://github.com/PaterJason/cmp-conjure/"; }; + cmp-conventionalcommits = buildVimPluginFrom2Nix { + pname = "cmp-conventionalcommits"; + version = "2021-10-28"; + src = fetchFromGitHub { + owner = "davidsierradz"; + repo = "cmp-conventionalcommits"; + rev = "5518362bc4f5dfbc9d242d9379fdec48b6278c5e"; + sha256 = "02jvz8sjrr4xw0wg5y03gnv5sc78gqvmblmqi02y748qgsd5grb6"; + }; + meta.homepage = "https://github.com/davidsierradz/cmp-conventionalcommits/"; + }; + cmp-dictionary = buildVimPluginFrom2Nix { pname = "cmp-dictionary"; version = "2022-05-04"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index ac3412559817..3a1676381c51 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -96,6 +96,7 @@ https://github.com/hrsh7th/cmp-buffer/,, https://github.com/hrsh7th/cmp-calc/,, https://github.com/hrsh7th/cmp-cmdline/,, https://github.com/PaterJason/cmp-conjure/,, +https://github.com/davidsierradz/cmp-conventionalcommits/,HEAD, https://github.com/uga-rosa/cmp-dictionary/,HEAD, https://github.com/dmitmel/cmp-digraphs/,HEAD, https://github.com/hrsh7th/cmp-emoji/,, From aa87d4786964b66b51c11b749c6685f374a43431 Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Fri, 13 May 2022 08:11:14 -0400 Subject: [PATCH 18/46] vimPlugins.cmp-cmdline-history: init at 2022-05-04 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 3d3352df0892..ac3deffd09be 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1132,6 +1132,18 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-cmdline/"; }; + cmp-cmdline-history = buildVimPluginFrom2Nix { + pname = "cmp-cmdline-history"; + version = "2022-05-04"; + src = fetchFromGitHub { + owner = "dmitmel"; + repo = "cmp-cmdline-history"; + rev = "003573b72d4635ce636234a826fa8c4ba2895ffe"; + sha256 = "1v2xyspm7k9jmnzbfg0js15c6sha7ravf4lddsk85icdw16fxji1"; + }; + meta.homepage = "https://github.com/dmitmel/cmp-cmdline-history/"; + }; + cmp-conjure = buildVimPluginFrom2Nix { pname = "cmp-conjure"; version = "2021-10-09"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 3a1676381c51..206dbfeac1df 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -95,6 +95,7 @@ https://github.com/winston0410/cmd-parser.nvim/,, https://github.com/hrsh7th/cmp-buffer/,, https://github.com/hrsh7th/cmp-calc/,, https://github.com/hrsh7th/cmp-cmdline/,, +https://github.com/dmitmel/cmp-cmdline-history/,HEAD, https://github.com/PaterJason/cmp-conjure/,, https://github.com/davidsierradz/cmp-conventionalcommits/,HEAD, https://github.com/uga-rosa/cmp-dictionary/,HEAD, From 010ef3dc36ff05ec033d1a75635b3eedacc28de6 Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Fri, 13 May 2022 08:11:57 -0400 Subject: [PATCH 19/46] vimPlugins.cmp-fuzzy-buffer: init at 2022-01-13 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index ac3deffd09be..6b1a73d16d1f 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1204,6 +1204,18 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-emoji/"; }; + cmp-fuzzy-buffer = buildVimPluginFrom2Nix { + pname = "cmp-fuzzy-buffer"; + version = "2022-01-13"; + src = fetchFromGitHub { + owner = "tzachar"; + repo = "cmp-fuzzy-buffer"; + rev = "c00e59019c5b3c00cb5590f9ae1fad4446fb855d"; + sha256 = "0zax13arc36db2w1l0xyriqskknnvg1wxs809737san70gh74p0w"; + }; + meta.homepage = "https://github.com/tzachar/cmp-fuzzy-buffer/"; + }; + cmp-git = buildVimPluginFrom2Nix { pname = "cmp-git"; version = "2022-05-11"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 206dbfeac1df..d1ee793bdd60 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -101,6 +101,7 @@ https://github.com/davidsierradz/cmp-conventionalcommits/,HEAD, https://github.com/uga-rosa/cmp-dictionary/,HEAD, https://github.com/dmitmel/cmp-digraphs/,HEAD, https://github.com/hrsh7th/cmp-emoji/,, +https://github.com/tzachar/cmp-fuzzy-buffer/,HEAD, https://github.com/petertriho/cmp-git/,HEAD, https://github.com/kdheepak/cmp-latex-symbols/,, https://github.com/notomo/cmp-neosnippet/,HEAD, From 6144604447a3c32eac51b17a298f86752b8fc787 Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Fri, 13 May 2022 08:12:40 -0400 Subject: [PATCH 20/46] vimPlugins.cmp-fuzzy-path: init at 2022-05-08 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 6b1a73d16d1f..02f1b7c29d0d 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1216,6 +1216,18 @@ final: prev: meta.homepage = "https://github.com/tzachar/cmp-fuzzy-buffer/"; }; + cmp-fuzzy-path = buildVimPluginFrom2Nix { + pname = "cmp-fuzzy-path"; + version = "2022-05-08"; + src = fetchFromGitHub { + owner = "tzachar"; + repo = "cmp-fuzzy-path"; + rev = "8c1ecaaf8bf16bc4af4eaaaac73ff5a29174406b"; + sha256 = "0c607vljcf5zwxvfj4s1vmqridwpwql7zynwc38zx9lafv7l2djb"; + }; + meta.homepage = "https://github.com/tzachar/cmp-fuzzy-path/"; + }; + cmp-git = buildVimPluginFrom2Nix { pname = "cmp-git"; version = "2022-05-11"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index d1ee793bdd60..c26185e82239 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -102,6 +102,7 @@ https://github.com/uga-rosa/cmp-dictionary/,HEAD, https://github.com/dmitmel/cmp-digraphs/,HEAD, https://github.com/hrsh7th/cmp-emoji/,, https://github.com/tzachar/cmp-fuzzy-buffer/,HEAD, +https://github.com/tzachar/cmp-fuzzy-path/,HEAD, https://github.com/petertriho/cmp-git/,HEAD, https://github.com/kdheepak/cmp-latex-symbols/,, https://github.com/notomo/cmp-neosnippet/,HEAD, From 586ed4541b6ffdb38d5e7ab53efa074acb66235a Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Fri, 13 May 2022 08:13:23 -0400 Subject: [PATCH 21/46] vimPlugins.cmp-rg: init at 2022-01-13 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 02f1b7c29d0d..64b464a26cbc 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1360,6 +1360,18 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-path/"; }; + cmp-rg = buildVimPluginFrom2Nix { + pname = "cmp-rg"; + version = "2022-01-13"; + src = fetchFromGitHub { + owner = "lukas-reineke"; + repo = "cmp-rg"; + rev = "fd92d70ff36b30924401b0cf7d4ce7344c8235f7"; + sha256 = "0z8knl4l5a7miw081h290s0g4icqqvn6qibr6jx4x71qwqb21w2y"; + }; + meta.homepage = "https://github.com/lukas-reineke/cmp-rg/"; + }; + cmp-snippy = buildVimPluginFrom2Nix { pname = "cmp-snippy"; version = "2021-09-20"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index c26185e82239..38c8f313dcad 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -114,6 +114,7 @@ https://github.com/quangnguyen30192/cmp-nvim-ultisnips/,, https://github.com/hrsh7th/cmp-omni/,, https://github.com/jc-doyle/cmp-pandoc-references/,, https://github.com/hrsh7th/cmp-path/,, +https://github.com/lukas-reineke/cmp-rg/,HEAD, https://github.com/dcampos/cmp-snippy/,HEAD, https://github.com/f3fora/cmp-spell/,, https://github.com/tzachar/cmp-tabnine/,, From b6e370d29140b55fd11ec4b08074d4d0b940b21a Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Fri, 13 May 2022 08:14:04 -0400 Subject: [PATCH 22/46] vimPlugins.cmp-fish: init at 2022-02-17 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 64b464a26cbc..42d0911a4e38 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1204,6 +1204,18 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-emoji/"; }; + cmp-fish = buildVimPluginFrom2Nix { + pname = "cmp-fish"; + version = "2022-02-17"; + src = fetchFromGitHub { + owner = "mtoohey31"; + repo = "cmp-fish"; + rev = "2ce8febeff3e4600acac498b7cde72cc9d2dd7b1"; + sha256 = "1clarmx43ygwsaxy73cgy86i33vjrfzr53z7ym29ynndb7zlzg6v"; + }; + meta.homepage = "https://github.com/mtoohey31/cmp-fish/"; + }; + cmp-fuzzy-buffer = buildVimPluginFrom2Nix { pname = "cmp-fuzzy-buffer"; version = "2022-01-13"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 38c8f313dcad..e0d33131992a 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -101,6 +101,7 @@ https://github.com/davidsierradz/cmp-conventionalcommits/,HEAD, https://github.com/uga-rosa/cmp-dictionary/,HEAD, https://github.com/dmitmel/cmp-digraphs/,HEAD, https://github.com/hrsh7th/cmp-emoji/,, +https://github.com/mtoohey31/cmp-fish/,HEAD, https://github.com/tzachar/cmp-fuzzy-buffer/,HEAD, https://github.com/tzachar/cmp-fuzzy-path/,HEAD, https://github.com/petertriho/cmp-git/,HEAD, From 82e3d3122b371b5d5390aa8c7e3add845f7796a4 Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Fri, 13 May 2022 08:14:49 -0400 Subject: [PATCH 23/46] vimPlugins.cmp-zsh: init at 2022-01-18 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 42d0911a4e38..771e3be87f04 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1480,6 +1480,18 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-vsnip/"; }; + cmp-zsh = buildVimPluginFrom2Nix { + pname = "cmp-zsh"; + version = "2022-01-18"; + src = fetchFromGitHub { + owner = "tamago324"; + repo = "cmp-zsh"; + rev = "1d8133e5637c73b3eb392682ae9661d521738268"; + sha256 = "0122lf44yqjp01znp7gnc682yx7fikjkzc5njp73lmys76321lz3"; + }; + meta.homepage = "https://github.com/tamago324/cmp-zsh/"; + }; + cmp_luasnip = buildVimPluginFrom2Nix { pname = "cmp_luasnip"; version = "2022-05-01"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index e0d33131992a..58d35894323b 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -124,6 +124,7 @@ https://github.com/ray-x/cmp-treesitter/,, https://github.com/lukas-reineke/cmp-under-comparator/,, https://github.com/dmitmel/cmp-vim-lsp/,HEAD, https://github.com/hrsh7th/cmp-vsnip/,, +https://github.com/tamago324/cmp-zsh/,HEAD, https://github.com/saadparwaiz1/cmp_luasnip/,, https://github.com/vn-ki/coc-clap/,, https://github.com/neoclide/coc-denite/,, From f845924568b3cc4a6b05c85ec881c2632b1f3d16 Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Fri, 13 May 2022 08:15:31 -0400 Subject: [PATCH 24/46] vimPlugins.cmp-npm: init at 2021-10-27 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 771e3be87f04..142934e8da26 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1276,6 +1276,18 @@ final: prev: meta.homepage = "https://github.com/notomo/cmp-neosnippet/"; }; + cmp-npm = buildVimPluginFrom2Nix { + pname = "cmp-npm"; + version = "2021-10-27"; + src = fetchFromGitHub { + owner = "David-Kunz"; + repo = "cmp-npm"; + rev = "4b6166c3feeaf8dae162e33ee319dc5880e44a29"; + sha256 = "0lkrbj5pswyb161hi424bii394qfdhm7v86x18a5fs2cmkwi0222"; + }; + meta.homepage = "https://github.com/David-Kunz/cmp-npm/"; + }; + cmp-nvim-lsp = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp"; version = "2022-05-16"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 58d35894323b..7d61c1b93e8b 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -107,6 +107,7 @@ https://github.com/tzachar/cmp-fuzzy-path/,HEAD, https://github.com/petertriho/cmp-git/,HEAD, https://github.com/kdheepak/cmp-latex-symbols/,, https://github.com/notomo/cmp-neosnippet/,HEAD, +https://github.com/David-Kunz/cmp-npm/,HEAD, https://github.com/hrsh7th/cmp-nvim-lsp/,, https://github.com/hrsh7th/cmp-nvim-lsp-document-symbol/,, https://github.com/hrsh7th/cmp-nvim-lsp-signature-help/,HEAD, From 12e88c597712e3529d8782206032449aa1ef8ef2 Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Fri, 13 May 2022 08:16:13 -0400 Subject: [PATCH 25/46] vimPlugins.cmp-clippy: init at 2021-10-24 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 142934e8da26..9f7d887a06e0 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1120,6 +1120,18 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-calc/"; }; + cmp-clippy = buildVimPluginFrom2Nix { + pname = "cmp-clippy"; + version = "2021-10-24"; + src = fetchFromGitHub { + owner = "vappolinario"; + repo = "cmp-clippy"; + rev = "9f8dd021f7b9326407a439105b0c646983191a49"; + sha256 = "02k0zwjbd98f76f3v46lvd8wfm8wibkh703g8vxr26yv1fwghs4n"; + }; + meta.homepage = "https://github.com/vappolinario/cmp-clippy/"; + }; + cmp-cmdline = buildVimPluginFrom2Nix { pname = "cmp-cmdline"; version = "2022-05-02"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 7d61c1b93e8b..5a416d79e647 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -94,6 +94,7 @@ https://github.com/bbchung/clighter8/,, https://github.com/winston0410/cmd-parser.nvim/,, https://github.com/hrsh7th/cmp-buffer/,, https://github.com/hrsh7th/cmp-calc/,, +https://github.com/vappolinario/cmp-clippy/,HEAD, https://github.com/hrsh7th/cmp-cmdline/,, https://github.com/dmitmel/cmp-cmdline-history/,HEAD, https://github.com/PaterJason/cmp-conjure/,, From 4704008b8b65bd6673881cc9ce6c618a2a11e693 Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Fri, 13 May 2022 08:16:57 -0400 Subject: [PATCH 26/46] vimPlugins.cmp-copilot: init at 2022-04-11 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 9f7d887a06e0..38b660d8d99d 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1180,6 +1180,18 @@ final: prev: meta.homepage = "https://github.com/davidsierradz/cmp-conventionalcommits/"; }; + cmp-copilot = buildVimPluginFrom2Nix { + pname = "cmp-copilot"; + version = "2022-04-11"; + src = fetchFromGitHub { + owner = "hrsh7th"; + repo = "cmp-copilot"; + rev = "1f3f31c54bd71e41ed157430702bc2837ea582ab"; + sha256 = "14nza4r8vr58s74f3fpzlmvrv9lcxzvfvizkz71p47f1zgddhgfs"; + }; + meta.homepage = "https://github.com/hrsh7th/cmp-copilot/"; + }; + cmp-dictionary = buildVimPluginFrom2Nix { pname = "cmp-dictionary"; version = "2022-05-04"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 5a416d79e647..245adea9508f 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -99,6 +99,7 @@ https://github.com/hrsh7th/cmp-cmdline/,, https://github.com/dmitmel/cmp-cmdline-history/,HEAD, https://github.com/PaterJason/cmp-conjure/,, https://github.com/davidsierradz/cmp-conventionalcommits/,HEAD, +https://github.com/hrsh7th/cmp-copilot/,HEAD, https://github.com/uga-rosa/cmp-dictionary/,HEAD, https://github.com/dmitmel/cmp-digraphs/,HEAD, https://github.com/hrsh7th/cmp-emoji/,, From 028ad31f5d3fa70688d62ba2fabf509dbe0d28ae Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Fri, 13 May 2022 08:17:41 -0400 Subject: [PATCH 27/46] vimPlugins.cmp-nvim-tags: init at 2022-03-31 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 38b660d8d99d..4e8395a537bf 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1360,6 +1360,18 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lua/"; }; + cmp-nvim-tags = buildVimPluginFrom2Nix { + pname = "cmp-nvim-tags"; + version = "2022-03-31"; + src = fetchFromGitHub { + owner = "quangnguyen30192"; + repo = "cmp-nvim-tags"; + rev = "98b15fee0cd64760345be3a30f1a592b5a9abb20"; + sha256 = "19fgzaxapazrl07q0ikximgm8k77vasz5fras3xnbax7r3bln127"; + }; + meta.homepage = "https://github.com/quangnguyen30192/cmp-nvim-tags/"; + }; + cmp-nvim-ultisnips = buildVimPluginFrom2Nix { pname = "cmp-nvim-ultisnips"; version = "2022-04-22"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 245adea9508f..7d9e32f6d888 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -114,6 +114,7 @@ https://github.com/hrsh7th/cmp-nvim-lsp/,, https://github.com/hrsh7th/cmp-nvim-lsp-document-symbol/,, https://github.com/hrsh7th/cmp-nvim-lsp-signature-help/,HEAD, https://github.com/hrsh7th/cmp-nvim-lua/,, +https://github.com/quangnguyen30192/cmp-nvim-tags/,HEAD, https://github.com/quangnguyen30192/cmp-nvim-ultisnips/,, https://github.com/hrsh7th/cmp-omni/,, https://github.com/jc-doyle/cmp-pandoc-references/,, From cbaec802b4c39b8388136a6bc1de7c2b945e4ab3 Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Fri, 13 May 2022 08:19:10 -0400 Subject: [PATCH 28/46] vimPlugins.cmp-greek: init at 2022-01-10 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 4e8395a537bf..4eac151b8875 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1276,6 +1276,18 @@ final: prev: meta.homepage = "https://github.com/petertriho/cmp-git/"; }; + cmp-greek = buildVimPluginFrom2Nix { + pname = "cmp-greek"; + version = "2022-01-10"; + src = fetchFromGitHub { + owner = "max397574"; + repo = "cmp-greek"; + rev = "799110b976f9194055e9d506931ac38171bc6bcd"; + sha256 = "049xi4ifla86fd5k68vqxwxxq5hg05y24z7yqg671hbw3lzpi0h9"; + }; + meta.homepage = "https://github.com/max397574/cmp-greek/"; + }; + cmp-latex-symbols = buildVimPluginFrom2Nix { pname = "cmp-latex-symbols"; version = "2021-09-10"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 7d9e32f6d888..901f177fa0a1 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -107,6 +107,7 @@ https://github.com/mtoohey31/cmp-fish/,HEAD, https://github.com/tzachar/cmp-fuzzy-buffer/,HEAD, https://github.com/tzachar/cmp-fuzzy-path/,HEAD, https://github.com/petertriho/cmp-git/,HEAD, +https://github.com/max397574/cmp-greek/,HEAD, https://github.com/kdheepak/cmp-latex-symbols/,, https://github.com/notomo/cmp-neosnippet/,HEAD, https://github.com/David-Kunz/cmp-npm/,HEAD, From dd3788435ae42fb6fe20c649345fdde72766de04 Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Fri, 13 May 2022 08:20:25 -0400 Subject: [PATCH 29/46] vimPlugins.cmp-look: init at 2022-03-21 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 4eac151b8875..46ed58fb04fb 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1300,6 +1300,18 @@ final: prev: meta.homepage = "https://github.com/kdheepak/cmp-latex-symbols/"; }; + cmp-look = buildVimPluginFrom2Nix { + pname = "cmp-look"; + version = "2022-03-21"; + src = fetchFromGitHub { + owner = "octaltree"; + repo = "cmp-look"; + rev = "58dd22adc34d21f95b93407719aa8a894c52c235"; + sha256 = "107nvm4xgd3bhz0sqxx4bj19xjli4c52r6jyajw50bv0my2afihq"; + }; + meta.homepage = "https://github.com/octaltree/cmp-look/"; + }; + cmp-neosnippet = buildVimPluginFrom2Nix { pname = "cmp-neosnippet"; version = "2022-01-06"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 901f177fa0a1..dc2f4e25b1b1 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -109,6 +109,7 @@ https://github.com/tzachar/cmp-fuzzy-path/,HEAD, https://github.com/petertriho/cmp-git/,HEAD, https://github.com/max397574/cmp-greek/,HEAD, https://github.com/kdheepak/cmp-latex-symbols/,, +https://github.com/octaltree/cmp-look/,HEAD, https://github.com/notomo/cmp-neosnippet/,HEAD, https://github.com/David-Kunz/cmp-npm/,HEAD, https://github.com/hrsh7th/cmp-nvim-lsp/,, From 36e86164d985d1244e606be07ff40f2e917a7ca8 Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Fri, 13 May 2022 08:38:45 -0400 Subject: [PATCH 30/46] vimPlugins.cmp-pandoc-nvim: init at 2022-05-03 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 46ed58fb04fb..7d5ca7473a23 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1432,6 +1432,18 @@ final: prev: meta.homepage = "https://github.com/jc-doyle/cmp-pandoc-references/"; }; + cmp-pandoc-nvim = buildVimPluginFrom2Nix { + pname = "cmp-pandoc.nvim"; + version = "2022-05-03"; + src = fetchFromGitHub { + owner = "aspeddro"; + repo = "cmp-pandoc.nvim"; + rev = "cb2980263e14fb3c1b776edbd2c7a312b67c65ae"; + sha256 = "0d439njzdnm1qhnig2qr9ywq3q72vpb6wqxwil9czhqzn80swrj9"; + }; + meta.homepage = "https://github.com/aspeddro/cmp-pandoc.nvim/"; + }; + cmp-path = buildVimPluginFrom2Nix { pname = "cmp-path"; version = "2022-02-02"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index dc2f4e25b1b1..1b1136b2a174 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -120,6 +120,7 @@ https://github.com/quangnguyen30192/cmp-nvim-tags/,HEAD, https://github.com/quangnguyen30192/cmp-nvim-ultisnips/,, https://github.com/hrsh7th/cmp-omni/,, https://github.com/jc-doyle/cmp-pandoc-references/,, +https://github.com/aspeddro/cmp-pandoc.nvim/,HEAD, https://github.com/hrsh7th/cmp-path/,, https://github.com/lukas-reineke/cmp-rg/,HEAD, https://github.com/dcampos/cmp-snippy/,HEAD, From 843fd83017b4ba38a4ec511916688aba2dd12323 Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Fri, 13 May 2022 08:40:28 -0400 Subject: [PATCH 31/46] vimPlugins.cmp-vimwiki-tags: init at 2022-04-25 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 7d5ca7473a23..e9e38b289162 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1552,6 +1552,18 @@ final: prev: meta.homepage = "https://github.com/dmitmel/cmp-vim-lsp/"; }; + cmp-vimwiki-tags = buildVimPluginFrom2Nix { + pname = "cmp-vimwiki-tags"; + version = "2022-04-25"; + src = fetchFromGitHub { + owner = "pontusk"; + repo = "cmp-vimwiki-tags"; + rev = "a9e631c8f4d64e009d253f741b035eb5d1bd404f"; + sha256 = "0j75bdcxbzm24mkq3lynm1crv5rqhw966aa7l27y12dlp6rbfvn0"; + }; + meta.homepage = "https://github.com/pontusk/cmp-vimwiki-tags/"; + }; + cmp-vsnip = buildVimPluginFrom2Nix { pname = "cmp-vsnip"; version = "2021-11-10"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 1b1136b2a174..b39281990625 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -130,6 +130,7 @@ https://github.com/andersevenrud/cmp-tmux/,, https://github.com/ray-x/cmp-treesitter/,, https://github.com/lukas-reineke/cmp-under-comparator/,, https://github.com/dmitmel/cmp-vim-lsp/,HEAD, +https://github.com/pontusk/cmp-vimwiki-tags/,HEAD, https://github.com/hrsh7th/cmp-vsnip/,, https://github.com/tamago324/cmp-zsh/,HEAD, https://github.com/saadparwaiz1/cmp_luasnip/,, From dafc5addaad24eb734cb6fbc47af63cf0c0286a2 Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Fri, 13 May 2022 08:41:11 -0400 Subject: [PATCH 32/46] vimPlugins.cmp-dap: init at 2022-04-27 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index e9e38b289162..007aeb8f6e76 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -1192,6 +1192,18 @@ final: prev: meta.homepage = "https://github.com/hrsh7th/cmp-copilot/"; }; + cmp-dap = buildVimPluginFrom2Nix { + pname = "cmp-dap"; + version = "2022-04-27"; + src = fetchFromGitHub { + owner = "rcarriga"; + repo = "cmp-dap"; + rev = "69f22863739482120f9240919db1ac7d4dea3278"; + sha256 = "03cxmnbr4sn69dzg1fg4r7rgja4invzfgpid123mhahq6sn7jir9"; + }; + meta.homepage = "https://github.com/rcarriga/cmp-dap/"; + }; + cmp-dictionary = buildVimPluginFrom2Nix { pname = "cmp-dictionary"; version = "2022-05-04"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index b39281990625..9a8b2d3953ce 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -100,6 +100,7 @@ https://github.com/dmitmel/cmp-cmdline-history/,HEAD, https://github.com/PaterJason/cmp-conjure/,, https://github.com/davidsierradz/cmp-conventionalcommits/,HEAD, https://github.com/hrsh7th/cmp-copilot/,HEAD, +https://github.com/rcarriga/cmp-dap/,HEAD, https://github.com/uga-rosa/cmp-dictionary/,HEAD, https://github.com/dmitmel/cmp-digraphs/,HEAD, https://github.com/hrsh7th/cmp-emoji/,, From fdaa8fc610c001173a29642b363e363b60f3c659 Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Fri, 13 May 2022 09:35:24 -0400 Subject: [PATCH 33/46] vimPlugins.nvim-snippy: init at 2022-05-01 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ .../editors/vim/plugins/vim-plugin-names | 1 + 2 files changed, 13 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 007aeb8f6e76..cddbee6b72c6 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -5566,6 +5566,18 @@ final: prev: meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; + nvim-snippy = buildVimPluginFrom2Nix { + pname = "nvim-snippy"; + version = "2022-05-01"; + src = fetchFromGitHub { + owner = "dcampos"; + repo = "nvim-snippy"; + rev = "a4512c9a9c0de83494fac66d02e04ff4f0805cae"; + sha256 = "0vaabj2m84ba3ryl6n5s5rryjg06kjk571z6cmdgccff4lvq9d4v"; + }; + meta.homepage = "https://github.com/dcampos/nvim-snippy/"; + }; + nvim-solarized-lua = buildVimPluginFrom2Nix { pname = "nvim-solarized-lua"; version = "2022-05-13"; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 9a8b2d3953ce..17defceb6ae2 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -468,6 +468,7 @@ https://github.com/yamatsum/nvim-nonicons/,, https://github.com/rcarriga/nvim-notify/,, https://github.com/gennaro-tedesco/nvim-peekup/,, https://github.com/dstein64/nvim-scrollview/,, +https://github.com/dcampos/nvim-snippy/,HEAD, https://github.com/ishan9299/nvim-solarized-lua/,, https://github.com/nvim-pack/nvim-spectre/,, https://github.com/norcalli/nvim-terminal.lua/,, From e05dc87e4153d1435e24629d5a8aea847ae2aa5c Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Fri, 13 May 2022 09:59:10 -0400 Subject: [PATCH 34/46] vimPlugins.fuzzy-nvim: init at 2022-02-20 --- pkgs/applications/editors/vim/plugins/generated.nix | 12 ++++++++++++ pkgs/applications/editors/vim/plugins/overrides.nix | 4 ++++ .../editors/vim/plugins/vim-plugin-names | 1 + 3 files changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index cddbee6b72c6..4ea3843c3f76 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -2938,6 +2938,18 @@ final: prev: meta.homepage = "https://github.com/BeneCollyridam/futhark-vim/"; }; + fuzzy-nvim = buildVimPluginFrom2Nix { + pname = "fuzzy.nvim"; + version = "2022-02-20"; + src = fetchFromGitHub { + owner = "tzachar"; + repo = "fuzzy.nvim"; + rev = "d5fee69b54ef400f0ccedf37917c4782e8929424"; + sha256 = "1xnmwmbrjsfj3v4vk57gcf4l3wl9n8jks50ds8gaawz5bpy54yff"; + }; + meta.homepage = "https://github.com/tzachar/fuzzy.nvim/"; + }; + fwatch-nvim = buildVimPluginFrom2Nix { pname = "fwatch.nvim"; version = "2021-07-25"; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 08f90347a798..0c3c96d50077 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -298,6 +298,10 @@ self: super: { ''; }); + fuzzy-nvim = super.fuzzy-nvim.overrideAttrs (old: { + dependencies = with self; [ telescope-fzy-native-nvim ]; + }); + fzf-checkout-vim = super.fzf-checkout-vim.overrideAttrs (old: { # The plugin has a makefile which tries to run tests in a docker container. # This prevents it. diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index 17defceb6ae2..5148efdf4c4a 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -245,6 +245,7 @@ https://github.com/rafamadriz/friendly-snippets/,, https://github.com/raghur/fruzzy/,, https://github.com/shumphrey/fugitive-gitlab.vim/,, https://github.com/BeneCollyridam/futhark-vim/,, +https://github.com/tzachar/fuzzy.nvim/,HEAD, https://github.com/rktjmp/fwatch.nvim/,, https://github.com/stsewd/fzf-checkout.vim/,, https://github.com/monkoose/fzf-hoogle.vim/,HEAD, From bd1a7eec9bdf47a5a226e91fd77c0ab9657ed4d4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 14 Jun 2022 04:20:00 +0000 Subject: [PATCH 35/46] resvg: 0.22.0 -> 0.23.0 https://github.com/RazrFalcon/resvg/releases/tag/v0.23.0 --- pkgs/tools/graphics/resvg/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/graphics/resvg/default.nix b/pkgs/tools/graphics/resvg/default.nix index 431814047147..245fc07cdb2d 100644 --- a/pkgs/tools/graphics/resvg/default.nix +++ b/pkgs/tools/graphics/resvg/default.nix @@ -1,21 +1,17 @@ -{ stdenv, lib, rustPlatform, fetchFromGitHub, libiconv }: +{ lib, rustPlatform, fetchFromGitHub }: rustPlatform.buildRustPackage rec { pname = "resvg"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "RazrFalcon"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3WFzLyg6335twcAMIjzza9r45ljcFlAzvTqyqXOfs1A="; + sha256 = "sha256-GiRLunAfDBqJtaq2ccQ3tvPDfmTg5OklkI6apAiMYL0="; }; - cargoSha256 = "sha256-twKiuxRpsiJu+hHrg6kUclX9+BWPUop492C+CkwQF2k="; - - buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; - - doCheck = false; + cargoSha256 = "sha256-rFhmR3H2u5LBBUCK5mCfHvIevFjbIe+CQLS535mJ53w="; meta = with lib; { description = "An SVG rendering library"; From d12ff5572571544989aa30abda50136dca81cf4a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Jun 2022 10:33:07 +0200 Subject: [PATCH 36/46] webanalyze: init at 0.3.6 --- pkgs/tools/security/webanalyze/default.nix | 25 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/security/webanalyze/default.nix diff --git a/pkgs/tools/security/webanalyze/default.nix b/pkgs/tools/security/webanalyze/default.nix new file mode 100644 index 000000000000..b61afb16fb67 --- /dev/null +++ b/pkgs/tools/security/webanalyze/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "webanalyze"; + version = "0.3.6"; + + src = fetchFromGitHub { + owner = "rverton"; + repo = pname; + rev = "v${version}"; + hash = "sha256-r5HIXh0mKCZmzOOAKThNUPtJLsTYvnVE8FYA6vV5xjg="; + }; + + vendorSha256 = "sha256-kXtWYGsZUUhBNvkTOah3Z+ta118k6PXfpBx6MLr/pq0="; + + meta = with lib; { + description = "Tool to uncover technologies used on websites"; + homepage = "https://github.com/rverton/webanalyze"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 280a79821a39..7a0300c5e855 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30615,6 +30615,8 @@ with pkgs; wayvnc = callPackage ../applications/networking/remote/wayvnc { }; + webanalyze = callPackage ../tools/security/webanalyze { }; + webcamoid = libsForQt5.callPackage ../applications/video/webcamoid { }; webmacs = libsForQt5.callPackage ../applications/networking/browsers/webmacs {}; From 54d4a1db73d19985c128005ca472c1edb56a429a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 14 Jun 2022 10:50:26 +0200 Subject: [PATCH 37/46] gowitness: init at 2.4.0 --- pkgs/tools/security/gowitness/default.nix | 25 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/security/gowitness/default.nix diff --git a/pkgs/tools/security/gowitness/default.nix b/pkgs/tools/security/gowitness/default.nix new file mode 100644 index 000000000000..ef0d25783c09 --- /dev/null +++ b/pkgs/tools/security/gowitness/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "gowitness"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "sensepost"; + repo = pname; + rev = version; + hash = "sha256-6O4pGsUu9tG3VAIGaD9aauXaVMhvK+HpEjByE0AwVnE="; + }; + + vendorSha256 = "sha256-6FgYDiz050ZlC1XBz7dKkVFKY7gkGhIm0ND23tMwxC8="; + + meta = with lib; { + description = "Web screenshot utility"; + homepage = "https://github.com/sensepost/gowitness"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 280a79821a39..172e824b55af 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34099,6 +34099,8 @@ with pkgs; gotestwaf = callPackage ../tools/security/gotestwaf { }; + gowitness = callPackage ../tools/security/gowitness { }; + guetzli = callPackage ../applications/graphics/guetzli { }; gummi = callPackage ../applications/misc/gummi { }; From 36b54d333db5928a841d49fccc09b13b999ca004 Mon Sep 17 00:00:00 2001 From: Xiami Date: Tue, 14 Jun 2022 16:59:24 +0800 Subject: [PATCH 38/46] logstash: fix sha256 --- pkgs/tools/misc/logstash/7.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/logstash/7.x.nix b/pkgs/tools/misc/logstash/7.x.nix index 69729b3f9578..f0a760e42f28 100644 --- a/pkgs/tools/misc/logstash/7.x.nix +++ b/pkgs/tools/misc/logstash/7.x.nix @@ -17,8 +17,8 @@ let shas = if enableUnfree then { - x86_64-linux = "698b6000788e123b647c988993f710c6d9bc44eb8c8e6f97d6b18a695a61f0a6"; - x86_64-darwin = "35e50e05fba0240aa5b138bc1c81f67addaf557701f8df41c682b5bc708f7455"; + x86_64-linux = "35e50e05fba0240aa5b138bc1c81f67addaf557701f8df41c682b5bc708f7455"; + x86_64-darwin = "698b6000788e123b647c988993f710c6d9bc44eb8c8e6f97d6b18a695a61f0a6"; aarch64-linux = "69694856fde11836eb1613bf3a2ba31fbdc933f58c8527b6180f6122c8bb528b"; } else { From 60ba9d65d326687bfec3a68f2c734a32cbbdd038 Mon Sep 17 00:00:00 2001 From: Mr Hedgehog Date: Fri, 13 May 2022 10:25:40 -0400 Subject: [PATCH 39/46] vimPlugins.cmp-*: Add overrides --- .../editors/vim/plugins/overrides.nix | 92 ++++++++++++++++++- 1 file changed, 91 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 0c3c96d50077..934bdfcf046a 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -19,8 +19,10 @@ , code-minimap , dasht , direnv +, fish , fzf , gawk +, git , gnome , himalaya , jq @@ -30,12 +32,15 @@ , meson , nim , nodePackages +, pandoc , parinfer-rust +, ripgrep , skim , sqlite , statix , stylish-haskell , tabnine +, tmux , tup , vim , which @@ -45,6 +50,7 @@ , nodejs , xdotool , xorg +, zsh # test dependencies , neovim-unwrapped @@ -133,8 +139,72 @@ self: super: { ''; }); + cmp-clippy = super.cmp-clippy.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp plenary-nvim ]; + }); + + cmp-copilot = super.cmp-copilot.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp copilot-vim ]; + }); + + cmp-dap = super.cmp-dap.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp nvim-dap ]; + }); + + cmp-dictionary = super.cmp-dictionary.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp ]; + }); + + cmp-digraphs = super.cmp-digraphs.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp ]; + }); + + cmp-fish = super.cmp-fish.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp fish ]; + }); + + cmp-fuzzy-buffer = super.cmp-fuzzy-buffer.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp fuzzy-nvim ]; + }); + + cmp-fuzzy-path = super.cmp-fuzzy-path.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp fuzzy-nvim ]; + }); + + cmp-git = super.cmp-git.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp curl git ]; + }); + + cmp-greek = super.cmp-greek.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp ]; + }); + + cmp-look = super.cmp-look.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp ]; + }); + cmp-neosnippet = super.cmp-neosnippet.overrideAttrs (old: { - dependencies = with self; [ nvim-cmp neosnippet ]; + dependencies = with self; [ nvim-cmp neosnippet-vim ]; + }); + + cmp-npm = super.cmp-npm.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp nodejs plenary-nvim ]; + }); + + cmp-nvim-lsp-signature-help = super.cmp-nvim-lsp-signature-help.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp ]; + }); + + cmp-pandoc-nvim = super.cmp-pandoc-nvim.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp pandoc plenary-nvim ]; + }); + + cmp-rg = super.cmp-rg.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp ripgrep ]; + }); + + cmp-snippy = super.cmp-snippy.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp nvim-snippy ]; }); cmp-tabnine = super.cmp-tabnine.overrideAttrs (old: { @@ -146,6 +216,26 @@ self: super: { ''; }); + cmp-nvim-tags = super.cmp-nvim-tags.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp ]; + }); + + cmp-tmux = super.cmp-tmux.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp tmux ]; + }); + + cmp-vimwiki-tags = super.cmp-vimwiki-tags.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp vimwiki ]; + }); + + cmp-vim-lsp = super.cmp-vim-lsp.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp vim-lsp ]; + }); + + cmp-zsh = super.cmp-zsh.overrideAttrs (old: { + dependencies = with self; [ nvim-cmp zsh ]; + }); + command-t = super.command-t.overrideAttrs (old: { buildInputs = [ ruby rake ]; buildPhase = '' From 6813740dc74cdc8bdf0d819d4df794428bf9c239 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Tue, 14 Jun 2022 14:12:20 +0200 Subject: [PATCH 40/46] rnix-lsp: 0.2.4 -> 0.2.5 ChangeLog: https://github.com/nix-community/rnix-lsp/blob/v0.2.5/CHANGELOG.md#v025---2022-06-14 --- pkgs/development/tools/rnix-lsp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rnix-lsp/default.nix b/pkgs/development/tools/rnix-lsp/default.nix index ccc8e88dec8b..a587f87b3da7 100644 --- a/pkgs/development/tools/rnix-lsp/default.nix +++ b/pkgs/development/tools/rnix-lsp/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rnix-lsp"; - version = "0.2.4"; + version = "0.2.5"; src = fetchFromGitHub { owner = "nix-community"; repo = "rnix-lsp"; rev = "v${version}"; - sha256 = "sha256-MfD07ugYYbcRaNoLxOcH9+SPbRewNxbHJA5blCSb4EM="; + sha256 = "sha256-WXpj2fgduYlF4t0QEvdfV1Eft8/nFXWF2zyEBKMUEIk="; }; - cargoSha256 = "sha256-23TJrJyfCuoOOOjZeWQnF/Ac0Xv2k6tZduuzapKvsgg="; + cargoSha256 = "sha256-LfbmOhZJVthsLm8lnzHvEt7Vy27y4w4wpPfrf/s3s84="; checkInputs = lib.optional (!stdenv.isDarwin) nix; From 66edc7241fb61c9b11ff598282b8298853cfb7be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 14 Jun 2022 13:07:43 +0000 Subject: [PATCH 41/46] python310Packages.enaml: 0.15.0 -> 0.15.1 --- pkgs/development/python-modules/enaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/enaml/default.nix b/pkgs/development/python-modules/enaml/default.nix index ccd8bb497d10..61ae38930fe1 100644 --- a/pkgs/development/python-modules/enaml/default.nix +++ b/pkgs/development/python-modules/enaml/default.nix @@ -13,13 +13,13 @@ buildPythonPackage rec { pname = "enaml"; - version = "0.15.0"; + version = "0.15.1"; src = fetchFromGitHub { owner = "nucleic"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-xSMgT8VooDS5kvf4BCcVbv/MNfRDTVnPKU3Ou+/Gq7I="; + sha256 = "sha256-kS15x7fZsHlARh1ILsQpJnwozutuoIysTCCKwkNCa7Y="; }; # qt bindings cannot be found during tests From 726e2f79e35405dc09580b847e12d972b2aab6bf Mon Sep 17 00:00:00 2001 From: Michael Adler Date: Tue, 14 Jun 2022 16:16:42 +0200 Subject: [PATCH 42/46] vale: 2.17.0 -> 2.18.0 --- pkgs/tools/text/vale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index f53816c46f20..a4d62af5b67a 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.17.0"; + version = "2.18.0"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "sha256-PUaIx6rEaLz0HUxkglsVHw0Kx/ovI2f4Yhknuysr5Gs="; + sha256 = "sha256-hstjE3+1QQSeS1z8fNhxTJI81liW77CdkEP+aS3c2zM="; }; vendorSha256 = "sha256-zdgLWEArmtHTDM844LoSJwKp0UGoAR8bHnFOSlrrjdg="; From 79441600c28c755a302f1e78eceb3c452c3bc7c9 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sun, 27 Sep 2020 17:15:57 +0200 Subject: [PATCH 43/46] lib/tests: Add submodule file propagation test --- lib/tests/modules.sh | 4 ++++ lib/tests/modules/submoduleFiles.nix | 21 +++++++++++++++++++++ 2 files changed, 25 insertions(+) create mode 100644 lib/tests/modules/submoduleFiles.nix diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh index 487fcd93641b..36af32ca89da 100755 --- a/lib/tests/modules.sh +++ b/lib/tests/modules.sh @@ -194,6 +194,10 @@ checkConfigOutput '^"submodule"$' options.submodule.type.description ./declare-s ## Paths should be allowed as values and work as expected checkConfigOutput '^true$' config.submodule.enable ./declare-submoduleWith-path.nix +# Check the file location information is propagated into submodules +checkConfigOutput the-file.nix config.submodule.internalFiles.0 ./submoduleFiles.nix + + # Check that disabledModules works recursively and correctly checkConfigOutput '^true$' config.enable ./disable-recursive/main.nix checkConfigOutput '^true$' config.enable ./disable-recursive/{main.nix,disable-foo.nix} diff --git a/lib/tests/modules/submoduleFiles.nix b/lib/tests/modules/submoduleFiles.nix new file mode 100644 index 000000000000..c0d9b2cef3e8 --- /dev/null +++ b/lib/tests/modules/submoduleFiles.nix @@ -0,0 +1,21 @@ +{ lib, ... }: { + options.submodule = lib.mkOption { + default = {}; + type = lib.types.submoduleWith { + modules = [ ({ options, ... }: { + options.value = lib.mkOption {}; + + options.internalFiles = lib.mkOption { + default = options.value.files; + }; + })]; + }; + }; + + imports = [ + { + _file = "the-file.nix"; + submodule.value = 10; + } + ]; +} From 907627f6563546c6304703cab94b8cc60b06a12d Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Sun, 27 Sep 2020 16:39:57 +0200 Subject: [PATCH 44/46] lib/types: Simplify submoduleWith shorthandOnlyDefinesConfig handling The module system already uses the parent module's _file as a fallback, so we don't need to inject the file in a weird way --- lib/types.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/lib/types.nix b/lib/types.nix index 147b92f784c9..977dd313cf86 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -580,19 +580,10 @@ rec { let inherit (lib.modules) evalModules; - shorthandToModule = if shorthandOnlyDefinesConfig == false - then value: value - else value: { config = value; }; - allModules = defs: imap1 (n: { value, file }: - if isFunction value - then setFunctionArgs - (args: lib.modules.unifyModuleSyntax file "${toString file}-${toString (n + extensionOffset)}" (value args)) - (functionArgs value) - else if isAttrs value - then - lib.modules.unifyModuleSyntax file "${toString file}-${toString (n + extensionOffset)}" (shorthandToModule value) - else value + if isAttrs value && shorthandOnlyDefinesConfig + then { _file = file; config = value; } + else { _file = file; imports = [ value ]; } ) defs; base = evalModules { From d4a84aeecaa765022a03c3ec03d214b93f46e804 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 14 Jun 2022 17:09:05 +0200 Subject: [PATCH 45/46] lib/types: Use map instead of imap1 in submoduleWith --- lib/types.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/types.nix b/lib/types.nix index 977dd313cf86..4af75a3d6423 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -580,7 +580,7 @@ rec { let inherit (lib.modules) evalModules; - allModules = defs: imap1 (n: { value, file }: + allModules = defs: map ({ value, file }: if isAttrs value && shorthandOnlyDefinesConfig then { _file = file; config = value; } else { _file = file; imports = [ value ]; } From 9dead5565a9ce7e25d9dfb7230b885bdaf634177 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 14 Jun 2022 17:25:06 +0200 Subject: [PATCH 46/46] lib/types, lib/modules: Remove unused extensionOffset --- lib/modules.nix | 8 +------- lib/types.nix | 6 ------ 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index 48ddb31508f2..d8ae497fb2d8 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -113,10 +113,6 @@ rec { args ? {} , # This would be remove in the future, Prefer _module.check option instead. check ? true - # Internal variable to avoid `_key` collisions regardless - # of `extendModules`. Used in `submoduleWith`. - # Test case: lib/tests/modules, "168767" - , extensionOffset ? 0 }: let withWarnings = x: @@ -345,17 +341,15 @@ rec { modules ? [], specialArgs ? {}, prefix ? [], - extensionOffset ? length modules, }: evalModules (evalModulesArgs // { modules = regularModules ++ modules; specialArgs = evalModulesArgs.specialArgs or {} // specialArgs; prefix = extendArgs.prefix or evalModulesArgs.prefix or []; - inherit extensionOffset; }); type = lib.types.submoduleWith { - inherit modules specialArgs extensionOffset; + inherit modules specialArgs; }; result = withWarnings { diff --git a/lib/types.nix b/lib/types.nix index 4af75a3d6423..caaa6dccc6d4 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -571,11 +571,6 @@ rec { , specialArgs ? {} , shorthandOnlyDefinesConfig ? false , description ? null - - # Internal variable to avoid `_key` collisions regardless - # of `extendModules`. Wired through by `evalModules`. - # Test case: lib/tests/modules, "168767" - , extensionOffset ? 0 }@attrs: let inherit (lib.modules) evalModules; @@ -623,7 +618,6 @@ rec { (base.extendModules { modules = [ { _module.args.name = last loc; } ] ++ allModules defs; prefix = loc; - extensionOffset = extensionOffset + length defs; }).config; emptyValue = { value = {}; }; getSubOptions = prefix: (base.extendModules