Merge remote-tracking branch 'refs/remotes/origin/master'

bandithedoge · Oct 31, 2023 · 8d2cc9d · 8d2cc9d
2 parents 3032882 + bec2bb4
commit 8d2cc9d
Show file tree

Hide file tree

Showing 8 changed files with 2,100 additions and 22 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,2 +1,5 @@
+<<<<<<< HEAD
 carla-git: ade014c97194486692c260b7cc09b04a92e58305 → 41f07e119252b8b14627bec8345cb7304485a815
 cardinal: 65cf557a6b023ffc9d43dd97e59bb0b410f23889 → da276ee93811c98571663b2e63309eba4eec6915
+=======
+>>>>>>> master
diff --git a/_sources/generated.json b/_sources/generated.json
@@ -36,7 +36,11 @@
   },
   "cardinal": {
     "cargoLocks": null,
+<<<<<<< HEAD
     "date": "2023-10-23",
+=======
+    "date": "2023-10-24",
+>>>>>>> master
     "extract": null,
     "name": "cardinal",
     "passthru": null,
@@ -48,11 +52,19 @@
       "name": null,
       "owner": "DISTRHO",
       "repo": "Cardinal",
+<<<<<<< HEAD
       "rev": "da276ee93811c98571663b2e63309eba4eec6915",
       "sha256": "sha256-xLNC8xp5Vw3OKO9DIrTia5YRnZGWvx+VzOOstSGSQiQ=",
       "type": "github"
     },
     "version": "da276ee93811c98571663b2e63309eba4eec6915"
+=======
+      "rev": "388fc8ddb202f8b87f86a0327b563f67ffaf5c2f",
+      "sha256": "sha256-WnF1eEwc6/vk0PgbZHBQRhJdKp45uAkHyRwnhPh9n8w=",
+      "type": "github"
+    },
+    "version": "388fc8ddb202f8b87f86a0327b563f67ffaf5c2f"
+>>>>>>> master
   },
   "carla-git": {
     "cargoLocks": null,
@@ -241,7 +253,11 @@
   },
   "kmonad": {
     "cargoLocks": null,
+<<<<<<< HEAD
     "date": "2023-10-17",
+=======
+    "date": "2023-10-25",
+>>>>>>> master
     "extract": null,
     "name": "kmonad",
     "passthru": null,
@@ -253,11 +269,19 @@
       "name": null,
       "owner": "kmonad",
       "repo": "kmonad",
+<<<<<<< HEAD
       "rev": "a1aea16c7a3239c0a3d7522b09edb1d6988bae02",
       "sha256": "sha256-hh5a82fbujCOitFjbzClCMZ/XZQeFsdOHxZWCXXv1i4=",
       "type": "github"
     },
     "version": "a1aea16c7a3239c0a3d7522b09edb1d6988bae02"
+=======
+      "rev": "1b2ec006259ddbe6cda30db8eb783e8177a9f12b",
+      "sha256": "sha256-RPfi08g5DHvq5oEX57sJ1al2smBk0d9d8gAzL7jRnNQ=",
+      "type": "github"
+    },
+    "version": "1b2ec006259ddbe6cda30db8eb783e8177a9f12b"
+>>>>>>> master
   },
   "libadwaita-1_4": {
     "cargoLocks": null,

diff --git a/_sources/generated.nix b/_sources/generated.nix
@@ -27,6 +27,7 @@
   };
   cardinal = {
     pname = "cardinal";
+<<<<<<< HEAD
     version = "da276ee93811c98571663b2e63309eba4eec6915";
     src = fetchFromGitHub {
       owner = "DISTRHO";
@@ -36,6 +37,17 @@
       sha256 = "sha256-xLNC8xp5Vw3OKO9DIrTia5YRnZGWvx+VzOOstSGSQiQ=";
     };
     date = "2023-10-23";
+=======
+    version = "388fc8ddb202f8b87f86a0327b563f67ffaf5c2f";
+    src = fetchFromGitHub {
+      owner = "DISTRHO";
+      repo = "Cardinal";
+      rev = "388fc8ddb202f8b87f86a0327b563f67ffaf5c2f";
+      fetchSubmodules = true;
+      sha256 = "sha256-WnF1eEwc6/vk0PgbZHBQRhJdKp45uAkHyRwnhPh9n8w=";
+    };
+    date = "2023-10-24";
+>>>>>>> master
   };
   carla-git = {
     pname = "carla-git";
@@ -150,6 +162,7 @@
   };
   kmonad = {
     pname = "kmonad";
+<<<<<<< HEAD
     version = "a1aea16c7a3239c0a3d7522b09edb1d6988bae02";
     src = fetchFromGitHub {
       owner = "kmonad";
@@ -159,6 +172,17 @@
       sha256 = "sha256-hh5a82fbujCOitFjbzClCMZ/XZQeFsdOHxZWCXXv1i4=";
     };
     date = "2023-10-17";
+=======
+    version = "1b2ec006259ddbe6cda30db8eb783e8177a9f12b";
+    src = fetchFromGitHub {
+      owner = "kmonad";
+      repo = "kmonad";
+      rev = "1b2ec006259ddbe6cda30db8eb783e8177a9f12b";
+      fetchSubmodules = false;
+      sha256 = "sha256-RPfi08g5DHvq5oEX57sJ1al2smBk0d9d8gAzL7jRnNQ=";
+    };
+    date = "2023-10-25";
+>>>>>>> master
   };
   libadwaita-1_4 = {
     pname = "libadwaita-1_4";

diff --git a/flake.lock b/flake.lock
diff --git a/pkgs/firefoxAddons/generated.nix b/pkgs/firefoxAddons/generated.nix
@@ -1146,10 +1146,17 @@
   };
   "sponsorblock" = buildFirefoxXpiAddon {
     pname = "sponsorblock";
+<<<<<<< HEAD
     version = "5.4.24";
     addonId = "[email protected]";
     url = "https://addons.mozilla.org/firefox/downloads/file/4181516/sponsorblock-5.4.24.xpi";
     sha256 = "3624120b2d8d64ab9b0aa535784fa38e1914b6a0dc043d391fd5c4a96eec4f54";
+=======
+    version = "5.4.25";
+    addonId = "[email protected]";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4185110/sponsorblock-5.4.25.xpi";
+    sha256 = "7bb6d42b76acca487be8e11af23db9c3df916b40e3665446d6335d3e1c7a16f4";
+>>>>>>> master
     meta = with lib; {
       homepage = "https://sponsor.ajay.app";
       description = "Easily skip YouTube video sponsors. When you visit a YouTube video, the extension will check the database for reported sponsors and automatically skip known sponsors. You can also report sponsors in videos.\n\nOther browsers: https://sponsor.ajay.app";
@@ -1166,10 +1173,10 @@
   };
   "steam-database" = buildFirefoxXpiAddon {
     pname = "steam-database";
-    version = "3.7.2";
+    version = "3.7.3";
     addonId = "[email protected]";
-    url = "https://addons.mozilla.org/firefox/downloads/file/4163150/steam_database-3.7.2.xpi";
-    sha256 = "d53ebbb78cab59de0111ededc3a66ff98a8ecf5580d09608579a3692d34682eb";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4185700/steam_database-3.7.3.xpi";
+    sha256 = "8f30be33fc633489e9b2e2e0b225ab83cd497603b9d6de01582190e15b58ccf9";
     meta = with lib; {
       homepage = "https://steamdb.info/";
       description = "Adds SteamDB links and new features on the Steam store and community. View lowest game prices and stats.";

diff --git a/pkgs/nodePackages/node2nix/node-packages.nix b/pkgs/nodePackages/node2nix/node-packages.nix
@@ -90,13 +90,13 @@
         sha512 = "MaGuyW+fa13q3aYsluKqclmh62Hgp0BpKIqS66fCxfOaBcVQ1OnMQxRRgQUYnCkxFISAQlkJ0qWWPyXjro1Qrg==";
       };
     };
-    "acorn-8.10.0" = {
+    "acorn-8.11.1" = {
       name = "acorn";
       packageName = "acorn";
-      version = "8.10.0";
+      version = "8.11.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-8.10.0.tgz";
-        sha512 = "F0SAmZ8iUtS//m8DmCTA0jlh6TDKkHQyK6xc6V4KDTyZKA9dnvX9/3sRTVQrWm79glUAZbnmmNcdYwUIHWVybw==";
+        url = "https://registry.npmjs.org/acorn/-/acorn-8.11.1.tgz";
+        sha512 = "IJTNCJMRHfRfb8un89z1QtS0x890C2QUrUxFMK8zy+RizcId6mfnqOf68Bu9YkDgpLYuvCm6aYbwDatXVZPjMQ==";
       };
     };
     "agent-base-7.1.0" = {
@@ -216,22 +216,22 @@
         sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==";
       };
     };
-    "defu-6.1.2" = {
+    "defu-6.1.3" = {
       name = "defu";
       packageName = "defu";
-      version = "6.1.2";
+      version = "6.1.3";
       src = fetchurl {
-        url = "https://registry.npmjs.org/defu/-/defu-6.1.2.tgz";
-        sha512 = "+uO4+qr7msjNNWKYPHqN/3+Dx3NFkmIzayk2L1MyZQlvgZb/J1A0fo410dpKrN2SnqFjt8n4JL8fDJE0wIgjFQ==";
+        url = "https://registry.npmjs.org/defu/-/defu-6.1.3.tgz";
+        sha512 = "Vy2wmG3NTkmHNg/kzpuvHhkqeIx3ODWqasgCRbKtbXEN0G+HpEEv9BtJLp7ZG1CZloFaC41Ah3ZFbq7aqCqMeQ==";
       };
     };
-    "destr-2.0.1" = {
+    "destr-2.0.2" = {
       name = "destr";
       packageName = "destr";
-      version = "2.0.1";
+      version = "2.0.2";
       src = fetchurl {
-        url = "https://registry.npmjs.org/destr/-/destr-2.0.1.tgz";
-        sha512 = "M1Ob1zPSIvlARiJUkKqvAZ3VAqQY6Jcuth/pBKQ2b1dX/Qx0OnJ8Vux6J2H5PTMQeRzWrrbTu70VxBfv/OPDJA==";
+        url = "https://registry.npmjs.org/destr/-/destr-2.0.2.tgz";
+        sha512 = "65AlobnZMiCET00KaFFjUefxDX0khFA/E4myqZ7a6Sq1yZtR8+FVIvilVX66vF2uobSumxooYZChiRPCKNqhmg==";
       };
     };
     "dotenv-16.3.1" = {
@@ -504,13 +504,13 @@
         sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==";
       };
     };
-    "node-fetch-native-1.4.0" = {
+    "node-fetch-native-1.4.1" = {
       name = "node-fetch-native";
       packageName = "node-fetch-native";
-      version = "1.4.0";
+      version = "1.4.1";
       src = fetchurl {
-        url = "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.4.0.tgz";
-        sha512 = "F5kfEj95kX8tkDhUCYdV8dg3/8Olx/94zB8+ZNthFs6Bz31UpUi8Xh40TN3thLwXgrwXry1pEg9lJ++tLWTcqA==";
+        url = "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.4.1.tgz";
+        sha512 = "NsXBU0UgBxo2rQLOeWNZqS3fvflWePMECr8CoSWoSTqCqGbVVsvl9vZu1HfQicYN0g5piV9Gh8RTEvo/uP752w==";
       };
     };
     "normalize-path-3.0.0" = {
@@ -905,7 +905,11 @@ in {
       sources."@nodelib/fs.stat-2.0.5"
       sources."@nodelib/fs.walk-1.2.8"
       sources."@vscode/emmet-helper-2.9.2"
+<<<<<<< HEAD
       sources."acorn-8.10.0"
+=======
+      sources."acorn-8.11.1"
+>>>>>>> master
       sources."agent-base-7.1.0"
       sources."anymatch-3.1.3"
       sources."binary-extensions-2.2.0"
@@ -919,8 +923,8 @@ in {
       sources."colorette-2.0.20"
       sources."cross-spawn-7.0.3"
       sources."debug-4.3.4"
-      sources."defu-6.1.2"
-      sources."destr-2.0.1"
+      sources."defu-6.1.3"
+      sources."destr-2.0.2"
       sources."dotenv-16.3.1"
       sources."emmet-2.4.6"
       sources."fast-glob-3.3.1"
@@ -959,7 +963,7 @@ in {
       sources."mlly-1.4.2"
       sources."mri-1.2.0"
       sources."ms-2.1.2"
-      sources."node-fetch-native-1.4.0"
+      sources."node-fetch-native-1.4.1"
       sources."normalize-path-3.0.0"
       sources."ohash-1.1.3"
       sources."path-key-3.1.1"

diff --git a/pkgs/vimPlugins/README.md b/pkgs/vimPlugins/README.md
@@ -104,6 +104,7 @@
 | [nvim-lint](https://github.com/mfussenegger/nvim-lint)                                          | An asynchronous linter plugin for Neovim complementary to the built-in Language Server Protocol support.                                                        |
 | [nvim-lspconfig](https://github.com/neovim/nvim-lspconfig)                                      | Quickstart configurations for the Nvim LSP client                                                                                                               |
 | [nvim-luaref](https://github.com/milisims/nvim-luaref)                                          | Add a vim :help reference for lua                                                                                                                               |
+| [nvim-navic](https://github.com/SmiteshP/nvim-navic)                                            | Simple winbar/statusline plugin that shows your current code context                                                                                            |
 | [nvim-nonicons](https://github.com/yamatsum/nvim-nonicons)                                      | Icon set using nonicons for neovim plugins and settings                                                                                                         |
 | [nvim-notify](https://github.com/rcarriga/nvim-notify)                                          | A fancy, configurable, notification manager for NeoVim                                                                                                          |
 | [nvim-numbertoggle](https://github.com/sitiom/nvim-numbertoggle)                                | Neovim plugin to automatically toggle between relative and absolute line numbers. Written in Lua.                                                               |