Merge remote-tracking branch 'origin/master' into staging-next

2024-11-25 08:23:09 +00:00 · 2024-10-19 15:07:50 +03:00 · 2024-10-19 15:07:50 +03:00 · 2ab7280fa2
commit 2ab7280fa2
parent 894462661c f7db4165e1
66 changed files with 2905 additions and 9649 deletions
--- a/doc/languages-frameworks/gnome.section.md
+++ b/doc/languages-frameworks/gnome.section.md
@ -155,9 +155,11 @@ There are no schemas available in `XDG_DATA_DIRS`. Temporarily add a random pack

 Package is missing some GSettings schemas. You can find out the package containing the schema with `nix-locate org.gnome.foo.gschema.xml` and let the hooks handle the wrapping as [above](#ssec-gnome-common-issues-no-schemas).

-### When using `wrapGApps*` hook with special derivers you can end up with double wrapped binaries. {#ssec-gnome-common-issues-double-wrapped}
+### When using `wrapGApps*` hook with special derivers or hooks you can end up with double wrapped binaries. {#ssec-gnome-common-issues-double-wrapped}

-This is because derivers like `python.pkgs.buildPythonApplication` or `qt5.mkDerivation` have setup-hooks automatically added that produce wrappers with makeWrapper. The simplest way to workaround that is to disable the `wrapGApps*` hook automatic wrapping with `dontWrapGApps = true;` and pass the arguments it intended to pass to makeWrapper to another.
+This is because some setup hooks like `qt6.wrapQtAppsHook` also wrap programs using `makeWrapper`.  Likewise, some derivers (e.g. `python.pkgs.buildPythonApplication`) automatically pull in their own setup hooks that produce wrappers.
+
+The simplest workaround is to disable the `wrapGApps*` hook's automatic wrapping using `dontWrapGApps = true;` while passing its `makeWrapper` arguments to another wrapper.

 In the case of a Python application it could look like:

@ -184,19 +186,19 @@ python3.pkgs.buildPythonApplication {
 And for a QT app like:

 ```nix
-mkDerivation {
+stdenv.mkDerivation {
  pname = "calibre";
  version = "3.47.0";

  nativeBuildInputs = [
    wrapGAppsHook3
+    qt6.wrapQtAppsHook
    qmake
    # ...
  ];

  dontWrapGApps = true;

-  # Arguments to be passed to `makeWrapper`, only used by qt5’s mkDerivation
  preFixup = ''
    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
  '';
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -2328,6 +2328,12 @@
    githubId = 18467667;
    name = "Alexander Bantyev";
  };
+  balssh = {
+    email = "george.bals25@gmail.com";
+    github = "balssh";
+    githubId = 82440615;
+    name = "George Bals";
+  };
  bananad3v = {
    email = "banana@banana.is-cool.dev";
    github = "BANanaD3V";
@ -16187,6 +16193,12 @@
    githubId = 10776658;
    name = "Patrick Gordon";
  };
+  paepcke = {
+    email = "git@paepcke.de";
+    github = "paepckehh";
+    githubId = 120342602;
+    name = "Michael Paepcke";
+  };
  paholg = {
    email = "paho@paholg.com";
    github = "paholg";
--- a/nixos/modules/services/monitoring/netdata.nix
+++ b/nixos/modules/services/monitoring/netdata.nix
@ -218,7 +218,6 @@ in {
      ps.psycopg2
      ps.python-ldap
      ps.netdata-pandas
-      ps.changefinder
    ]);

    services.netdata.configDir.".opt-out-from-anonymous-statistics" = mkIf (!cfg.enableAnalyticsReporting) (pkgs.writeText ".opt-out-from-anonymous-statistics" "");
--- a/nixos/tests/keymap.nix
+++ b/nixos/tests/keymap.nix
@ -11,15 +11,15 @@ let

  testReader = pkgs.writeScript "test-input-reader" ''
    rm -f ${resultFile} ${resultFile}.tmp
-    logger "testReader: START: Waiting for $1 characters, expecting '$2'."
+    logger "testReader: START: expecting '$1'."
    touch ${readyFile}
-    read -r -N $1 chars
+    read -r -N ''${#1} -t 60 chars
    rm -f ${readyFile}

-    if [ "$chars" == "$2" ]; then
-      logger -s "testReader: PASS: Got '$2' as expected." 2>${resultFile}.tmp
+    if [ "$chars" == "$1" ]; then
+      logger -s "testReader: PASS: Got '$1' as expected." 2>${resultFile}.tmp
    else
-      logger -s "testReader: FAIL: Expected '$2' but got '$chars'." 2>${resultFile}.tmp
+      logger -s "testReader: FAIL: Expected '$1' but got '$chars'." 2>${resultFile}.tmp
    fi
    # rename after the file is written to prevent a race condition
    mv  ${resultFile}.tmp ${resultFile}
@ -39,39 +39,29 @@ let
      import shlex


-      def run_test_case(cmd, xorg_keymap, test_case_name, inputs, expected):
-          with subtest(test_case_name):
-              assert len(inputs) == len(expected)
-              machine.execute("rm -f ${readyFile} ${resultFile}")
+      def run_test_case(cmd, inputs, expected):
+          assert len(inputs) == len(expected)
+          machine.execute("rm -f ${readyFile} ${resultFile}")

-              # set up process that expects all the keys to be entered
-              machine.succeed(
-                  "{} {} {} {} >&2 &".format(
-                      cmd,
-                      "${testReader}",
-                      len(inputs),
-                      shlex.quote("".join(expected)),
-                  )
+          # set up process that expects all the keys to be entered
+          machine.succeed(
+              "${pkgs.systemd}/bin/systemd-cat -t input-test-reader -- {} {} {} &".format(
+                  cmd,
+                  "${testReader}",
+                  shlex.quote("".join(expected)),
              )
+          )

-              if xorg_keymap:
-                  # make sure the xterm window is open and has focus
-                  machine.wait_for_window("testterm")
-                  machine.wait_until_succeeds(
-                      "${pkgs.xdotool}/bin/xdotool search --sync --onlyvisible "
-                      "--class testterm windowfocus --sync"
-                  )
+          # wait for reader to be ready
+          machine.wait_for_file("${readyFile}")

-              # wait for reader to be ready
-              machine.wait_for_file("${readyFile}")
+          # send all keys
+          for key in inputs:
+              machine.send_key(key)

-              # send all keys
-              for key in inputs:
-                  machine.send_key(key)
-
-              # wait for result and check
-              machine.wait_for_file("${resultFile}")
-              machine.succeed("grep -q 'PASS:' ${resultFile}")
+          # wait for result and check
+          machine.wait_for_file("${resultFile}")
+          machine.succeed("grep -q 'PASS:' ${resultFile}")


      with open("${pkgs.writeText "tests.json" (builtins.toJSON tests)}") as json_file:
@ -87,19 +77,17 @@ let
      # fighting over the virtual terminal. This does not appear to be a problem
      # when the X test runs first.
      keymap_environments = {
-          "Xorg Keymap": "DISPLAY=:0 xterm -title testterm -class testterm -fullscreen -e",
-          "VT Keymap": "openvt -sw --",
+          "Xorg Keymap": "env DISPLAY=:0 xterm -title testterm -class testterm -fullscreen -e",
+          "VT Keymap": "openvt -c 2 -sw --",
      }

      machine.wait_for_x()

-      for keymap_env_name, command in keymap_environments.items():
-          with subtest(keymap_env_name):
-              for test_case_name, test_data in tests.items():
+      for test_case_name, test_data in tests.items():
+          for keymap_env_name, command in keymap_environments.items():
+              with subtest(f"{test_case_name} - {keymap_env_name}"):
                  run_test_case(
                      command,
-                      False,
-                      test_case_name,
                      test_data["qwerty"],
                      test_data["expect"],
                  )
--- a/nixos/tests/teleport.nix
+++ b/nixos/tests/teleport.nix
@ -9,7 +9,6 @@ with import ../lib/testing-python.nix { inherit system pkgs; };
 let
  packages = with pkgs; {
    "default" = teleport;
-    "14" = teleport_14;
    "15" = teleport_15;
  };

--- a/pkgs/applications/editors/vim/plugins/blink-cmp/Cargo.lock
+++ b/pkgs/applications/editors/vim/plugins/blink-cmp/Cargo.lock
@ -0,0 +1,572 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "bincode"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "bitflags"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "blink-cmp-fuzzy"
+version = "0.1.0"
+dependencies = [
+ "c-marshalling",
+ "frizbee",
+ "generator",
+ "heed",
+ "lazy_static",
+ "libc",
+ "lua-marshalling",
+ "regex",
+ "serde",
+]
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "c-marshalling"
+version = "0.2.0"
+source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6"
+dependencies = [
+ "libc",
+ "quick-error",
+]
+
+[[package]]
+name = "cc"
+version = "1.1.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58e804ac3194a48bb129643eb1d62fcc20d18c6b8c181704489353d13120bcd1"
+dependencies = [
+ "shlex",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
+
+[[package]]
+name = "derive-c-marshalling-library"
+version = "0.1.0"
+source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6"
+dependencies = [
+ "libc",
+ "quote 0.4.2",
+ "syn 0.12.15",
+]
+
+[[package]]
+name = "derive-lua-marshalling"
+version = "0.2.0"
+source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6"
+dependencies = [
+ "derive-c-marshalling-library",
+ "libc",
+ "quote 0.4.2",
+ "syn 0.12.15",
+]
+
+[[package]]
+name = "doxygen-rs"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "415b6ec780d34dcf624666747194393603d0373b7141eef01d12ee58881507d9"
+dependencies = [
+ "phf",
+]
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "frizbee"
+version = "0.1.0"
+source = "git+https://github.com/saghen/frizbee#d910bec53b867ce06702520c7e05f9862bf78dd9"
+dependencies = [
+ "memchr",
+ "smith_waterman_macro",
+]
+
+[[package]]
+name = "generator"
+version = "2.0.0"
+source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6"
+dependencies = [
+ "parser",
+ "quote 0.4.2",
+ "syn 0.12.15",
+]
+
+[[package]]
+name = "heed"
+version = "0.20.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d4f449bab7320c56003d37732a917e18798e2f1709d80263face2b4f9436ddb"
+dependencies = [
+ "bitflags",
+ "byteorder",
+ "heed-traits",
+ "heed-types",
+ "libc",
+ "lmdb-master-sys",
+ "once_cell",
+ "page_size",
+ "serde",
+ "synchronoise",
+ "url",
+]
+
+[[package]]
+name = "heed-traits"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb3130048d404c57ce5a1ac61a903696e8fcde7e8c2991e9fcfc1f27c3ef74ff"
+
+[[package]]
+name = "heed-types"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d3f528b053a6d700b2734eabcd0fd49cb8230647aa72958467527b0b7917114"
+dependencies = [
+ "bincode",
+ "byteorder",
+ "heed-traits",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "idna"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+
+[[package]]
+name = "libc"
+version = "0.2.159"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+
+[[package]]
+name = "lmdb-master-sys"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "472c3760e2a8d0f61f322fb36788021bb36d573c502b50fa3e2bcaac3ec326c9"
+dependencies = [
+ "cc",
+ "doxygen-rs",
+ "libc",
+]
+
+[[package]]
+name = "lua-marshalling"
+version = "0.3.0"
+source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6"
+dependencies = [
+ "c-marshalling",
+ "derive-lua-marshalling",
+ "lazy_static",
+ "libc",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
+
+[[package]]
+name = "once_cell"
+version = "1.20.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
+
+[[package]]
+name = "page_size"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30d5b2194ed13191c1999ae0704b7839fb18384fa22e49b57eeaa97d79ce40da"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "parser"
+version = "0.2.0"
+source = "git+https://github.com/distil/rust_lua_ffi#30820cdc9282c938dbf8e7bb0a1ea31cf56b25a6"
+dependencies = [
+ "quote 0.4.2",
+ "syn 0.12.15",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+
+[[package]]
+name = "phf"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc"
+dependencies = [
+ "phf_macros",
+ "phf_shared",
+]
+
+[[package]]
+name = "phf_generator"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0"
+dependencies = [
+ "phf_shared",
+ "rand",
+]
+
+[[package]]
+name = "phf_macros"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b"
+dependencies = [
+ "phf_generator",
+ "phf_shared",
+ "proc-macro2 1.0.87",
+ "quote 1.0.37",
+ "syn 2.0.79",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd07deb3c6d1d9ff827999c7f9b04cdfd66b1b17ae508e14fe47b620f2282ae0"
+dependencies = [
+ "unicode-xid",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quick-error"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
+
+[[package]]
+name = "quote"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1eca14c727ad12702eb4b6bfb5a232287dcf8385cb8ca83a3eeaf6519c44c408"
+dependencies = [
+ "proc-macro2 0.2.3",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+dependencies = [
+ "proc-macro2 1.0.87",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+
+[[package]]
+name = "regex"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+
+[[package]]
+name = "ryu"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
+
+[[package]]
+name = "serde"
+version = "1.0.210"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.210"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+dependencies = [
+ "proc-macro2 1.0.87",
+ "quote 1.0.37",
+ "syn 2.0.79",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.128"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "siphasher"
+version = "0.3.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+
+[[package]]
+name = "smith_waterman_macro"
+version = "0.1.0"
+source = "git+https://github.com/saghen/frizbee#d910bec53b867ce06702520c7e05f9862bf78dd9"
+dependencies = [
+ "proc-macro2 1.0.87",
+ "quote 1.0.37",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "syn"
+version = "0.12.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c97c05b8ebc34ddd6b967994d5c6e9852fa92f8b82b3858c39451f97346dcce5"
+dependencies = [
+ "proc-macro2 0.2.3",
+ "quote 0.4.2",
+ "unicode-xid",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2 1.0.87",
+ "quote 1.0.37",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
+dependencies = [
+ "proc-macro2 1.0.87",
+ "quote 1.0.37",
+ "unicode-ident",
+]
+
+[[package]]
+name = "synchronoise"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dbc01390fc626ce8d1cffe3376ded2b72a11bb70e1c75f404a210e4daa4def2"
+dependencies = [
+ "crossbeam-queue",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-xid"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
+
+[[package]]
+name = "url"
+version = "2.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+]
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
--- a/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix
+++ b/pkgs/applications/editors/vim/plugins/blink-cmp/default.nix
@ -0,0 +1,50 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  stdenv,
+  vimUtils,
+}:
+let
+  version = "0.3.1";
+  src = fetchFromGitHub {
+    owner = "Saghen";
+    repo = "blink.cmp";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-bvhLOM0NMx5S069uX2OecEpzYaR3hV4r8nCIPD0f0XQ=";
+  };
+  libExt = if stdenv.hostPlatform.isDarwin then "dylib" else "so";
+  blink-fuzzy-lib = rustPlatform.buildRustPackage {
+    inherit version src;
+    pname = "blink-fuzzy-lib";
+    env = {
+      # TODO: remove this if plugin stops using nightly rust
+      RUSTC_BOOTSTRAP = true;
+    };
+    cargoLock = {
+      lockFile = ./Cargo.lock;
+      outputHashes = {
+        "c-marshalling-0.2.0" = "sha256-eL6nkZOtuLLQ0r31X7uroUUDYZsWOJ9KNXl4NCVNRuw=";
+        "frizbee-0.1.0" = "sha256-zO2S282DVCjnALMXu3GxmAfjCXsPNUZ7+xgiqITfGmU=";
+      };
+    };
+  };
+in
+vimUtils.buildVimPlugin {
+  pname = "blink-cmp";
+  inherit version src;
+  preInstall = ''
+    mkdir -p target/release
+    ln -s ${blink-fuzzy-lib}/lib/libblink_cmp_fuzzy.${libExt} target/release/libblink_cmp_fuzzy.${libExt}
+  '';
+  meta = {
+    description = "Performant, batteries-included completion plugin for Neovim";
+    homepage = "https://github.com/saghen/blink.cmp";
+    maintainers = with lib.maintainers; [
+      balssh
+      redxtech
+    ];
+  };
+  doInstallCheck = true;
+  nvimRequireCheck = "blink-cmp";
+}
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -329,12 +329,12 @@ final: prev:

  SchemaStore-nvim = buildVimPlugin {
    pname = "SchemaStore.nvim";
-    version = "2024-10-15";
+    version = "2024-10-18";
    src = fetchFromGitHub {
      owner = "b0o";
      repo = "SchemaStore.nvim";
-      rev = "6796194ae7db1c4c79c904e31ba2f8cfd7b0cd12";
-      sha256 = "04knqshjbjjqvg4drpfz6fc5w3jndsr5jb71jf5w0r3h0jyxdb55";
+      rev = "30eacb81f0202c0d5718fb27e3ec0b03945a03c7";
+      sha256 = "0q75ql3fg84nb8vhfxgi1wpmpfz7yk0wqkiw3l7zf1j5xmqskl4y";
    };
    meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
  };
@ -558,12 +558,12 @@ final: prev:

  aerial-nvim = buildVimPlugin {
    pname = "aerial.nvim";
-    version = "2024-10-03";
+    version = "2024-10-16";
    src = fetchFromGitHub {
      owner = "stevearc";
      repo = "aerial.nvim";
-      rev = "603156d4fd58963a05f221e76b1a25bc79ed55b0";
-      sha256 = "1qd15mv20aplnb4nj1lz0hi6in0vl7g7h4jjj7ma7w7ld7slgvnx";
+      rev = "60a784614acb1d7695bd9ae0fee8ada1bf7b0c28";
+      sha256 = "0irll73fsi0y005gxvvhjga35gfl2bjyg5q9hgdczagy42xb6hvw";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/stevearc/aerial.nvim/";
@ -955,12 +955,12 @@ final: prev:

  auto-session = buildVimPlugin {
    pname = "auto-session";
-    version = "2024-10-05";
+    version = "2024-10-18";
    src = fetchFromGitHub {
      owner = "rmagatti";
      repo = "auto-session";
-      rev = "9d02776ed42874d37869dc683396234e3724b52d";
-      sha256 = "126r6kwc7xm132c8v1q830gncyb1iinkh2jalnxg64iw7jdd9ksq";
+      rev = "3cd531ce4d46fb156268ddedf5f3e6822ef26af7";
+      sha256 = "0jjc2ziw4v6xma416mz4ixk9svsf25p58wc3wvr1v1zsc6nkzvfd";
    };
    meta.homepage = "https://github.com/rmagatti/auto-session/";
  };
@ -1076,24 +1076,24 @@ final: prev:

  bamboo-nvim = buildVimPlugin {
    pname = "bamboo.nvim";
-    version = "2024-09-20";
+    version = "2024-10-16";
    src = fetchFromGitHub {
      owner = "ribru17";
      repo = "bamboo.nvim";
-      rev = "c245d90c490c681470389e28782b161491bec97c";
-      sha256 = "1nycgf8lrvjsswr0z60kbi6s1c14fgzmichmyymm4100ywyp4k6s";
+      rev = "7e5bcd10ae1f1f7cd315fa88049ea21babe11815";
+      sha256 = "1srrhhiy8vh4myggwsgn98a1ig26dg9p12zl27zcls1jpd59p0d6";
    };
    meta.homepage = "https://github.com/ribru17/bamboo.nvim/";
  };

  barbar-nvim = buildVimPlugin {
    pname = "barbar.nvim";
-    version = "2024-09-30";
+    version = "2024-10-16";
    src = fetchFromGitHub {
      owner = "romgrk";
      repo = "barbar.nvim";
-      rev = "ca1326f7d87acfd47b0cbeeb3bef98cec73a92be";
-      sha256 = "0irbz0f061fl8f9y45gy7kg9fbgn4qwp51knqh1q1q2fm5nhlvwh";
+      rev = "7c28de8c22f4c00ed43a78ae16c13dd6a248fe1a";
+      sha256 = "0cd93xldgqbkfbkq5s2bmq6j9mzzgfq5vk8rqbff938j0y3d7ldd";
    };
    meta.homepage = "https://github.com/romgrk/barbar.nvim/";
  };
@ -1316,12 +1316,12 @@ final: prev:

  bufexplorer = buildVimPlugin {
    pname = "bufexplorer";
-    version = "2024-08-13";
+    version = "2024-10-16";
    src = fetchFromGitHub {
      owner = "jlanzarotta";
      repo = "bufexplorer";
-      rev = "fcf3a65a69020f0f54be8fa925f841874a5f3a01";
-      sha256 = "0nbskarlk7byghv3w852hlsmc3rylw43x873a4n2nszywc50zahk";
+      rev = "3828d24435c86bfa32847c04d1ca4e3606736d89";
+      sha256 = "1rj5zgqwbcf31v8py3bixc068cbri4y59xqcj4g3hav3qnsqh08v";
    };
    meta.homepage = "https://github.com/jlanzarotta/bufexplorer/";
  };
@ -2059,12 +2059,12 @@ final: prev:

  cmp-rg = buildVimPlugin {
    pname = "cmp-rg";
-    version = "2023-09-01";
+    version = "2024-10-17";
    src = fetchFromGitHub {
      owner = "lukas-reineke";
      repo = "cmp-rg";
-      rev = "677a7874ee8f1afc648c2e7d63a97bc21a7663c5";
-      sha256 = "0cahyz5i6iyjqb4cklrkimw5pjajfnlazpmky617ysl3m1b6pwk3";
+      rev = "d6cea15ad504369ec98f3de73b9631dfdd23a671";
+      sha256 = "1rjhlc1rldqz79b1han5xrbwqvx514h3yvlsz7rgx58jscv6mmx9";
    };
    meta.homepage = "https://github.com/lukas-reineke/cmp-rg/";
  };
@ -2647,12 +2647,12 @@ final: prev:

  conform-nvim = buildVimPlugin {
    pname = "conform.nvim";
-    version = "2024-10-04";
+    version = "2024-10-16";
    src = fetchFromGitHub {
      owner = "stevearc";
      repo = "conform.nvim";
-      rev = "40d4e98fcc3e6f485f0e8924c63734bc7e305967";
-      sha256 = "0w78hq284hl3c8wqvsxfkpwpcr1phby5xnnb7wmj4lqr4rak5k1w";
+      rev = "f5bd8419f8a29451e20bdb1061a54fe13d5c8de3";
+      sha256 = "0s8q34ibc48dx2mavz4m04gjyjh0z4al7xhbb6c9m620gmgpxvsz";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/stevearc/conform.nvim/";
@ -2780,12 +2780,12 @@ final: prev:

  coq_nvim = buildVimPlugin {
    pname = "coq_nvim";
-    version = "2024-10-15";
+    version = "2024-10-17";
    src = fetchFromGitHub {
      owner = "ms-jpq";
      repo = "coq_nvim";
-      rev = "27cca63337debdea4a8da61f758abc82a0045bfb";
-      sha256 = "1f08b0p2ffqkswwlx32h6b16q4n2mafcs9q612yfzcp7hkx9ffs2";
+      rev = "a23759c0d6f48f5b6b5b1504f24d2021fb87f374";
+      sha256 = "0cx46c93bzss1rdxncy6ypscmanj5ywzdmzgn01cby05z44188q0";
    };
    meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
  };
@ -2924,12 +2924,12 @@ final: prev:

  cyberdream-nvim = buildVimPlugin {
    pname = "cyberdream.nvim";
-    version = "2024-10-09";
+    version = "2024-10-17";
    src = fetchFromGitHub {
      owner = "scottmckendry";
      repo = "cyberdream.nvim";
-      rev = "e2ff36e57bb6f75a627e282fa2c6654e658d3052";
-      sha256 = "0fdhamfbvlzjjsla81a20pkyaw71ras3zkba41j1vfas9h6kjr0g";
+      rev = "358f6bfdd06115c139fb5518d3b95688083b7f70";
+      sha256 = "0cvsj55jv3aggqkrk611hmhb0kcvy7z6xal5p9af00bql97hqh4a";
    };
    meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/";
  };
@ -3044,12 +3044,12 @@ final: prev:

  ddc-vim = buildVimPlugin {
    pname = "ddc.vim";
-    version = "2024-10-14";
+    version = "2024-10-16";
    src = fetchFromGitHub {
      owner = "Shougo";
      repo = "ddc.vim";
-      rev = "517a127d10b7babe46647fd571ae468cf3a2b647";
-      sha256 = "1y2wm3hqikyp23msbbxa64yxkpg9nb87gfyff5ad845x9w0sl18i";
+      rev = "ae43c61dd0ebcf6ce7549c7c7bfebcdfaeac7d07";
+      sha256 = "0wxaziykndc6p9nzlizfm6i7pxa9fylb1yg3hymia39v67ywphf5";
    };
    meta.homepage = "https://github.com/Shougo/ddc.vim/";
  };
@ -3176,12 +3176,12 @@ final: prev:

  deol-nvim = buildVimPlugin {
    pname = "deol.nvim";
-    version = "2024-10-03";
+    version = "2024-10-16";
    src = fetchFromGitHub {
      owner = "Shougo";
      repo = "deol.nvim";
-      rev = "f5d32c646e7d4d43ca5b376cff2c1edc67070832";
-      sha256 = "0dl3ihcv6sgwylx305ays7w8lgrlw961bgnpzqwn5bq96z984ffj";
+      rev = "72997a29dbc1f75b5b6df71d2392abb5ef92e6dd";
+      sha256 = "1w880g2g5f3p5slk7swcgbz8psk8c2wm54klmk4khmyx79b643jn";
    };
    meta.homepage = "https://github.com/Shougo/deol.nvim/";
  };
@ -3514,12 +3514,12 @@ final: prev:

  distant-nvim = buildVimPlugin {
    pname = "distant.nvim";
-    version = "2024-10-08";
+    version = "2024-10-17";
    src = fetchFromGitHub {
      owner = "chipsenkbeil";
      repo = "distant.nvim";
-      rev = "cf8f00d88fac3ed52ecdd8d485e4a565ba4c660f";
-      sha256 = "0677mgkp91nx9hbmjkxpagqbpzxiapylz89yiq50al34hqaqbl4w";
+      rev = "67d6b066e8490725718b79f643966f4eafc7da3c";
+      sha256 = "1vdcndix4rb3c8p4yjhrwach5p708qbi2bmhb7xlx2rlfph2if89";
    };
    meta.homepage = "https://github.com/chipsenkbeil/distant.nvim/";
  };
@ -3550,12 +3550,12 @@ final: prev:

  dracula-nvim = buildVimPlugin {
    pname = "dracula.nvim";
-    version = "2024-07-12";
+    version = "2024-10-16";
    src = fetchFromGitHub {
      owner = "Mofiqul";
      repo = "dracula.nvim";
-      rev = "fdf503e52ec1c8aae07353604d891fe5a3ed5201";
-      sha256 = "1f032gwhr92w57mb5bfsgr14ayi7qg93rvjq04cy5kwdniqg92ij";
+      rev = "94fa7885a06a67f0a8bfa03e064619d05d1ba496";
+      sha256 = "1yxkhi11a81nmll9il3jq2ii8nbh7x2mf2k5w8ql5y27bdl4wcfy";
    };
    meta.homepage = "https://github.com/Mofiqul/dracula.nvim/";
  };
@ -3671,12 +3671,12 @@ final: prev:

  efmls-configs-nvim = buildVimPlugin {
    pname = "efmls-configs-nvim";
-    version = "2024-10-14";
+    version = "2024-10-15";
    src = fetchFromGitHub {
      owner = "creativenull";
      repo = "efmls-configs-nvim";
-      rev = "6c9dd80d4c2071a0328947cf6bcb6b91cc62c7b5";
-      sha256 = "1vxw7xd999iyb6lbyhy5k9d4vw0d96b54712vh4kj7m1bpbbgmjp";
+      rev = "e44e39c962dc1629a341fc71cfc8feaa09cefa6f";
+      sha256 = "1ca5wrkkdf1p0lzj6h34mxvk55gy416zy153ksk6rlcf2ci5hg69";
    };
    meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/";
  };
@ -4081,12 +4081,12 @@ final: prev:

  formatter-nvim = buildVimPlugin {
    pname = "formatter.nvim";
-    version = "2024-10-10";
+    version = "2024-10-17";
    src = fetchFromGitHub {
      owner = "mhartington";
      repo = "formatter.nvim";
-      rev = "77979a90a80849e60c6a9249427421b65d5a9a68";
-      sha256 = "139wx2bhvs2iyyc3bysgln40rj1jcm5iag5yd39hcwwdk2f6f4iz";
+      rev = "04547bdfe89035731a2815a3875b87f77d43e36d";
+      sha256 = "1ih28z1y6g8r20si698zispkwra5mll0g8b1lc6778cjfd4dy32j";
    };
    meta.homepage = "https://github.com/mhartington/formatter.nvim/";
  };
@ -4585,12 +4585,12 @@ final: prev:

  grug-far-nvim = buildVimPlugin {
    pname = "grug-far.nvim";
-    version = "2024-10-09";
+    version = "2024-10-16";
    src = fetchFromGitHub {
      owner = "MagicDuck";
      repo = "grug-far.nvim";
-      rev = "f47594f05d10b0bedfc0ed78e488e7fd714d57be";
-      sha256 = "14s0y1lzchqghr1rkirwmfys0q1l3rl9h1b80acik3pcmdzgr1i5";
+      rev = "190c03d54e8976491e6e49acb97087bf4182b079";
+      sha256 = "1awfikdwh03i0wjdfr9aa2nwzsmgmiv9dqpfq0613z8wr8dw8xn3";
    };
    meta.homepage = "https://github.com/MagicDuck/grug-far.nvim/";
  };
@ -4969,12 +4969,12 @@ final: prev:

  hop-nvim = buildVimPlugin {
    pname = "hop.nvim";
-    version = "2024-08-08";
+    version = "2024-10-17";
    src = fetchFromGitHub {
      owner = "smoka7";
      repo = "hop.nvim";
-      rev = "8f51ef02700bb3cdcce94e92eff16170a6343c4f";
-      sha256 = "07py0rhr6wx1nbq8i20a71iv0arp7ym75ffyb3d3n5icmf53inl4";
+      rev = "08ddca799089ab96a6d1763db0b8adc5320bf050";
+      sha256 = "07mydcm3x7xc7x6wg5l6kcx8yrrv9bwy2p44y17ajyx37c5lmwwn";
    };
    meta.homepage = "https://github.com/smoka7/hop.nvim/";
  };
@ -5378,12 +5378,12 @@ final: prev:

  jinja-vim = buildVimPlugin {
    pname = "jinja.vim";
-    version = "2024-09-09";
+    version = "2024-10-17";
    src = fetchFromGitHub {
      owner = "HiPhish";
      repo = "jinja.vim";
-      rev = "d112541c062122969c6c0bc3df7e3cab3595c253";
-      sha256 = "0xcvzjnhgwjw42mm0j5ikw2yqsm4w7ibgmkfxf61fn23npzjalf7";
+      rev = "a6a6477f6f75604ce3df6d870bbfbd8dc176e196";
+      sha256 = "095d32c5v8rj5zf86cdasn7xr4qbvrw65mhzh3jj1hq84229bd3k";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/HiPhish/jinja.vim/";
@ -5462,6 +5462,18 @@ final: prev:
    meta.homepage = "https://github.com/rebelot/kanagawa.nvim/";
  };

+  kdl-vim = buildVimPlugin {
+    pname = "kdl.vim";
+    version = "2023-02-20";
+    src = fetchFromGitHub {
+      owner = "imsnif";
+      repo = "kdl.vim";
+      rev = "b84d7d3a15d8d30da016cf9e98e2cfbe35cddee5";
+      sha256 = "0kh0wgwpjbp2iaznk2s8xy0l2l26zvlb9s3adwxapb13a4mwma11";
+    };
+    meta.homepage = "https://github.com/imsnif/kdl.vim/";
+  };
+
  keymap-layer-nvim = buildVimPlugin {
    pname = "keymap-layer.nvim";
    version = "2022-07-16";
@ -5524,12 +5536,12 @@ final: prev:

  kulala-nvim = buildVimPlugin {
    pname = "kulala.nvim";
-    version = "2024-10-14";
+    version = "2024-10-17";
    src = fetchFromGitHub {
      owner = "mistweaverco";
      repo = "kulala.nvim";
-      rev = "c7a2c793dca8509f9792e9d35d377de016c88a5b";
-      sha256 = "1w8riv2bvqbl6dvllx7kn0j8aa33mcp44j7ghczjd5kzbxqpzksr";
+      rev = "c1eebbd9ee63e020ab3fdece1e2ec377ce6da096";
+      sha256 = "1iz9376w1chzl98743mz654mdbynwm6v0bvqg3klmpl70pj3bp1x";
    };
    meta.homepage = "https://github.com/mistweaverco/kulala.nvim/";
  };
@ -5632,12 +5644,12 @@ final: prev:

  lean-nvim = buildVimPlugin {
    pname = "lean.nvim";
-    version = "2024-10-15";
+    version = "2024-10-18";
    src = fetchFromGitHub {
      owner = "Julian";
      repo = "lean.nvim";
-      rev = "273749f1769f6fd5f45aba44af0b0c7ac47c3f5a";
-      sha256 = "1kkvcm11sd4kj729dgnn6fclx8v8s4nq464mnd5am7igrkpjrmrv";
+      rev = "e217e5eff207c2136a8c3ff65454a04a9dbc4284";
+      sha256 = "06dhmy10yvxvws9dmp6r9ybpi1y9qhxcx5s4xd1k8b5h65ny7ir6";
    };
    meta.homepage = "https://github.com/Julian/lean.nvim/";
  };
@ -5692,12 +5704,12 @@ final: prev:

  legendary-nvim = buildVimPlugin {
    pname = "legendary.nvim";
-    version = "2024-10-12";
+    version = "2024-10-18";
    src = fetchFromGitHub {
      owner = "mrjones2014";
      repo = "legendary.nvim";
-      rev = "192fbef32d1f7d70463c4c8a634c2a75adc41348";
-      sha256 = "0grhj484513hrnmpr9wlvc6fa44lm3jr65cm50ymkza3qjnjnbcj";
+      rev = "cf49f78dac43031e1b924a5fce2e538581c36d76";
+      sha256 = "19nf2j61y3rrj9yx5mqryi59wcwvf4n2z9gsjbsg1p1nal0zl3qw";
    };
    meta.homepage = "https://github.com/mrjones2014/legendary.nvim/";
  };
@ -6111,12 +6123,12 @@ final: prev:

  lspsaga-nvim = buildVimPlugin {
    pname = "lspsaga.nvim";
-    version = "2024-10-13";
+    version = "2024-10-17";
    src = fetchFromGitHub {
      owner = "nvimdev";
      repo = "lspsaga.nvim";
-      rev = "3c1af059348350b0bbb81c5ca3c1f8f573dbd64a";
-      sha256 = "15y7bv8ywaihc1s0ifs5g8a6pcpdlqm4c15ahg8ygys2hnb4l5r7";
+      rev = "d027f8b9c7c55e26cf4030c8657a2fc8222ed762";
+      sha256 = "07lpv4swni0z8z76q7mrmis003rm5p25fj2dwy0j8gf1hpigak2g";
    };
    meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/";
  };
@ -6617,12 +6629,12 @@ final: prev:

  mini-deps = buildVimPlugin {
    pname = "mini.deps";
-    version = "2024-09-06";
+    version = "2024-10-18";
    src = fetchFromGitHub {
      owner = "echasnovski";
      repo = "mini.deps";
-      rev = "203dd6d947e3415711c732530a82f9c3f2f046a4";
-      sha256 = "1xydh3l41hifwmns6aqnrch545h1hqsq4a7mgk915wzp1g843qfs";
+      rev = "bafaa69d9054fc01ef8dbff8e4f0211c285cd840";
+      sha256 = "12vahms3vpvinp362x1zi3z9si7r912bps55yp6v9vlvfdjmc9gf";
    };
    meta.homepage = "https://github.com/echasnovski/mini.deps/";
  };
@ -6809,12 +6821,12 @@ final: prev:

  mini-nvim = buildVimPlugin {
    pname = "mini.nvim";
-    version = "2024-10-15";
+    version = "2024-10-18";
    src = fetchFromGitHub {
      owner = "echasnovski";
      repo = "mini.nvim";
-      rev = "d4ce7d025f9c7bb4d55ebc4fd88987651e632893";
-      sha256 = "10cls549nsv4bgmqqky5acdy8f912901084vbqzrgq7dnx7j3vzg";
+      rev = "9618cf56e76cc0caab54ad60116a8d72f99d7b3b";
+      sha256 = "0vqyspxincyhck5fmx4b35y0k5m33d76c6v7n9cq1a2c970grlij";
    };
    meta.homepage = "https://github.com/echasnovski/mini.nvim/";
  };
@ -6857,12 +6869,12 @@ final: prev:

  mini-sessions = buildVimPlugin {
    pname = "mini.sessions";
-    version = "2024-09-12";
+    version = "2024-10-18";
    src = fetchFromGitHub {
      owner = "echasnovski";
      repo = "mini.sessions";
-      rev = "62f2e3823f98673fcf1b79322cc06d8a1f453d30";
-      sha256 = "1js9ma0i7a4lil6h4bzbxjx6s63hj4z7qy5ixf737x34ba5d0ipr";
+      rev = "c9c633f3e423885f91c49e3b9e8e6141af25429e";
+      sha256 = "0ds8dx3gazmsvdmj50mlfan9xzvak87rx96cg1kpwqjw06y972pf";
    };
    meta.homepage = "https://github.com/echasnovski/mini.sessions/";
  };
@ -6917,12 +6929,12 @@ final: prev:

  mini-tabline = buildVimPlugin {
    pname = "mini.tabline";
-    version = "2024-09-06";
+    version = "2024-10-17";
    src = fetchFromGitHub {
      owner = "echasnovski";
      repo = "mini.tabline";
-      rev = "2316dd47e1e1f4a8e9255c9060acbee89bb26e59";
-      sha256 = "1lbh0qzjdhx7vkycl799byjn3a62frrfgdczyzj2xdyfxv6823h9";
+      rev = "06ef4ecaeca2e362c7d31113435d86d144b3cbbe";
+      sha256 = "1z808l3z7ywqxmqwfr1ab9ynyma5c1878x9ski0nrhvw4fli9rwy";
    };
    meta.homepage = "https://github.com/echasnovski/mini.tabline/";
  };
@ -7385,12 +7397,12 @@ final: prev:

  neoconf-nvim = buildVimPlugin {
    pname = "neoconf.nvim";
-    version = "2024-10-15";
+    version = "2024-10-18";
    src = fetchFromGitHub {
      owner = "folke";
      repo = "neoconf.nvim";
-      rev = "887be0ddcf27f6684898e5f9f33297365146a5ec";
-      sha256 = "0i2fafb3wdwpzs2899d9r0nmfxpq22d05vvvwrbkhpa77lwli7sm";
+      rev = "125a2f5cb8689a5a452c34afea9104eaf8fa0a5e";
+      sha256 = "1zbrh46qfafbvzxiqkga5ldssdnn0vnvbi2zcrs740prb7psp7wv";
    };
    meta.homepage = "https://github.com/folke/neoconf.nvim/";
  };
@ -7457,12 +7469,12 @@ final: prev:

  neogit = buildVimPlugin {
    pname = "neogit";
-    version = "2024-10-14";
+    version = "2024-10-18";
    src = fetchFromGitHub {
      owner = "NeogitOrg";
      repo = "neogit";
-      rev = "eda716c44d3b5a424ea8604b10756c7fd8bed93a";
-      sha256 = "1mdyn40ih75pnqrmayiqc3pcwzi80h3y4s60k2yxbbgr0dp9c8rc";
+      rev = "aa3a343c58c378e91d2457f19952f9f2ee3aacc3";
+      sha256 = "05g62dii54b45q94hnirx7s0xqjdq743aq46y57npah6x2lz8zr0";
    };
    meta.homepage = "https://github.com/NeogitOrg/neogit/";
  };
@ -8120,12 +8132,12 @@ final: prev:

  nlsp-settings-nvim = buildVimPlugin {
    pname = "nlsp-settings.nvim";
-    version = "2024-10-10";
+    version = "2024-10-18";
    src = fetchFromGitHub {
      owner = "tamago324";
      repo = "nlsp-settings.nvim";
-      rev = "941dd4b9d8c9420968dfdef0675f120965f7d637";
-      sha256 = "099mql8lw6xbvdvdqbg0ks2l0z1xy4k895kc8cl0bl89970r5908";
+      rev = "522c89562e3ca1eeb8f29435db2d4e9e4995c55e";
+      sha256 = "1zpdrw9hslybsjkqrgfqw5lvn5zszb1k4wvqb11gnaxd1xbvm426";
    };
    meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
  };
@ -8192,12 +8204,12 @@ final: prev:

  none-ls-nvim = buildVimPlugin {
    pname = "none-ls.nvim";
-    version = "2024-10-11";
+    version = "2024-10-17";
    src = fetchFromGitHub {
      owner = "nvimtools";
      repo = "none-ls.nvim";
-      rev = "6bdd9b3364e12ffb346ac224db3df37de0b1429b";
-      sha256 = "145jzbjsx10dl4n9ni7p0ggcnhjwbz5fs6ksyrq73h9f0h6vcfxw";
+      rev = "dcc8cd4efdcb29275681a3c95786a816330dbca6";
+      sha256 = "1na4w7daxsi25hiadffc2j4vz3zkxs3p0al0zgmgaazf36qywys0";
    };
    meta.homepage = "https://github.com/nvimtools/none-ls.nvim/";
  };
@ -8288,12 +8300,12 @@ final: prev:

  nvchad = buildVimPlugin {
    pname = "nvchad";
-    version = "2024-10-10";
+    version = "2024-10-16";
    src = fetchFromGitHub {
      owner = "nvchad";
      repo = "nvchad";
-      rev = "f6025f0788880989484733c90deff07dff01ef02";
-      sha256 = "0y7pi4czifx7di9j8msd8nicqvn6scd4vysg7zbrxpkavzzg09jy";
+      rev = "8792679a08c6747ba3f5890a01561442abec6935";
+      sha256 = "05f8srjvs2x4ivvg40a2y7ir0jj4z1id8qssmqky217ghqry2778";
    };
    meta.homepage = "https://github.com/nvchad/nvchad/";
  };
@ -8803,12 +8815,12 @@ final: prev:

  nvim-lightbulb = buildVimPlugin {
    pname = "nvim-lightbulb";
-    version = "2024-08-16";
+    version = "2024-10-17";
    src = fetchFromGitHub {
      owner = "kosayoda";
      repo = "nvim-lightbulb";
-      rev = "1cae7b7153ae98dcf1b11173a443ac1b6d8e3d49";
-      sha256 = "1wf5pfjpvn7hvm9p9mc7w9j7wz2rr7ppdys8cx4jcqib9ja5vy99";
+      rev = "33d4c95e0e853956bc9468b70b3064c87d5abaca";
+      sha256 = "1njf3f3jw1ynpac20rf688g1gais7ca71wzwzh3iijvhw2wd5x95";
    };
    meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/";
  };
@ -8839,12 +8851,12 @@ final: prev:

  nvim-lint = buildVimPlugin {
    pname = "nvim-lint";
-    version = "2024-10-10";
+    version = "2024-10-17";
    src = fetchFromGitHub {
      owner = "mfussenegger";
      repo = "nvim-lint";
-      rev = "f707b3ae50417067fa63fdfe179b0bff6b380da1";
-      sha256 = "0zws4m0jcprpn0d0ny2k6pvkmca917wjbqwk13g1p8rp87ia5yy1";
+      rev = "16b21a7d04d06661f92f273a0744fd81fb19e09e";
+      sha256 = "1krhqq16nrz3hm9h0a5yqir75lv8nrc62ii4kxjr885b4bvr9hg2";
    };
    meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
  };
@ -8875,12 +8887,12 @@ final: prev:

  nvim-lspconfig = buildVimPlugin {
    pname = "nvim-lspconfig";
-    version = "2024-10-15";
+    version = "2024-10-18";
    src = fetchFromGitHub {
      owner = "neovim";
      repo = "nvim-lspconfig";
-      rev = "9b2509f17c284486497358ccea1019cc17c28af6";
-      sha256 = "09g1zcpg1b98fgv6siibd683ci5yfih4papv56nc9h2vk01a9p8d";
+      rev = "b55b9659de9ac17e05df4787bb023e4c7ef45329";
+      sha256 = "0887n4q7z2k9faqd43ki7gpq30dn9vjk217kafj9hwymamqqfmk2";
    };
    meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
  };
@ -9055,12 +9067,12 @@ final: prev:

  nvim-paredit = buildVimPlugin {
    pname = "nvim-paredit";
-    version = "2024-10-15";
+    version = "2024-10-17";
    src = fetchFromGitHub {
      owner = "julienvincent";
      repo = "nvim-paredit";
-      rev = "2f0e7fc4fc5c25cb0e8af7fc0bd1fe00f1fe131a";
-      sha256 = "1qphsmankkrxgnbxac8ja366akp22139p4c9j6pa9z988ipq4bz2";
+      rev = "f842d84854f3ad5231bc85f52ee94f3fb4ede326";
+      sha256 = "00v0hi4xlg5aln8cl2a6gl4d4kdrx5ixnr6llfk59x48cgcvj97z";
    };
    meta.homepage = "https://github.com/julienvincent/nvim-paredit/";
  };
@ -9139,24 +9151,24 @@ final: prev:

  nvim-scrollbar = buildVimPlugin {
    pname = "nvim-scrollbar";
-    version = "2024-06-03";
+    version = "2024-10-17";
    src = fetchFromGitHub {
      owner = "petertriho";
      repo = "nvim-scrollbar";
-      rev = "d09f14aa16c9f2748e77008f9da7b1f76e4e7b85";
-      sha256 = "1zm0xaph29hk2dw4rpmpz67nxxbr39f67zfil5gwyzk3d87q56k3";
+      rev = "6994eb9f73d5fdc36ee2c8717940e8c853e51a49";
+      sha256 = "0h01gcaqgjkb2392zl2jwvlsh5qmz10k9sy5rhyz1kwizmw7nw7y";
    };
    meta.homepage = "https://github.com/petertriho/nvim-scrollbar/";
  };

  nvim-scrollview = buildVimPlugin {
    pname = "nvim-scrollview";
-    version = "2024-10-15";
+    version = "2024-10-16";
    src = fetchFromGitHub {
      owner = "dstein64";
      repo = "nvim-scrollview";
-      rev = "db413e93ef6d50b4e92bbfd7a82263057a6cf28a";
-      sha256 = "1jshj0qq80pnf0x6np76xrvwswawl5yyikzvxid8kan0s86gs3nf";
+      rev = "c82821508e50d07fc0696af764fa8604c9f66de8";
+      sha256 = "0v5v2m4akjrbi1qcqpjl5bj8wwh3g863mhkj8k8sf922flyh0mxp";
    };
    meta.homepage = "https://github.com/dstein64/nvim-scrollview/";
  };
@ -9295,36 +9307,36 @@ final: prev:

  nvim-tree-lua = buildVimPlugin {
    pname = "nvim-tree.lua";
-    version = "2024-10-14";
+    version = "2024-10-18";
    src = fetchFromGitHub {
      owner = "nvim-tree";
      repo = "nvim-tree.lua";
-      rev = "f5f67892996b280ae78b1b0a2d07c4fa29ae0905";
-      sha256 = "0pqzd4yqsajr26b1bc359ylj7ywiiallc5akq7996hnakcx6r1c9";
+      rev = "2a268f631da85e83b7a95291be589bcddfc785d8";
+      sha256 = "0ka4y3af9lfslmn08gsr0q9saldcf5fz7ham1f5x59rw5vndnaq5";
    };
    meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/";
  };

  nvim-treesitter = buildVimPlugin {
    pname = "nvim-treesitter";
-    version = "2024-10-15";
+    version = "2024-10-18";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter";
-      rev = "da926103921117cc6dc8a518bc9b949c90d1c70c";
-      sha256 = "006crqfchxf94x5y1v5hi9jf023m7k39xqjh8yjffwzc8whsyd4m";
+      rev = "68b2bdd99d889e9705f7e90ae64d990f3ff03cf3";
+      sha256 = "0mwyk0i03dy73djhni55zf3dvlxkx3y4104xhkvlbgp60nl71b1h";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
  };

  nvim-treesitter-context = buildVimPlugin {
    pname = "nvim-treesitter-context";
-    version = "2024-10-04";
+    version = "2024-10-18";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter-context";
-      rev = "78a81c7494e7d1a08dd1200b556933e513fd9f29";
-      sha256 = "19vf1wlvi7nggwzawaqyp81jk8hp85xsg1nm9cgjzk9fvywddnpc";
+      rev = "e7fdb4cdf0942cd6e63dd822110a93c0ec777fe5";
+      sha256 = "1d14699z9wdgjlksbdgkib2dr6ja0kpda9ymrv3yfyc7fyia7kjw";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
  };
@ -9367,12 +9379,12 @@ final: prev:

  nvim-treesitter-textobjects = buildVimPlugin {
    pname = "nvim-treesitter-textobjects";
-    version = "2024-10-06";
+    version = "2024-10-16";
    src = fetchFromGitHub {
      owner = "nvim-treesitter";
      repo = "nvim-treesitter-textobjects";
-      rev = "b91c98afa6c42819aea6cbc1ba38272f5456a5cf";
-      sha256 = "08chzl9943657f7mp8f83k95cic14br0d8n9233nj17fng0k127v";
+      rev = "0d79d169fcd45a8da464727ac893044728f121d4";
+      sha256 = "0qhndwxbbaf324gp8hqd33x6a3z1vkq8jgv5aqpcb05v2i2byfzp";
    };
    meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
  };
@ -9571,24 +9583,24 @@ final: prev:

  octo-nvim = buildVimPlugin {
    pname = "octo.nvim";
-    version = "2024-10-15";
+    version = "2024-10-17";
    src = fetchFromGitHub {
      owner = "pwntester";
      repo = "octo.nvim";
-      rev = "896d48b6184f69113599e9ecc46611e9d0b5fbcf";
-      sha256 = "1p1618cnf1ag6nmirpm6z9hx57cwrpn5wfnhncr6rifjndjfmas1";
+      rev = "a83ca8bcee6cf4a9288bbfd1b97a51ba32068c21";
+      sha256 = "03pwwkb06b7dfd0m5w98b05dfggn1vnpcxk531p0vsmiy263qyyh";
    };
    meta.homepage = "https://github.com/pwntester/octo.nvim/";
  };

  oil-nvim = buildVimPlugin {
    pname = "oil.nvim";
-    version = "2024-10-04";
+    version = "2024-10-16";
    src = fetchFromGitHub {
      owner = "stevearc";
      repo = "oil.nvim";
-      rev = "ccab9d5e09e2d0042fbbe5b6bd05e82426247067";
-      sha256 = "08ywsapg9j6simfixj7bxw4b011d8dbsrvy7yiawzvfry1hpqmxx";
+      rev = "39dbf875861449cf09e936fa80073f3413e9439c";
+      sha256 = "1j97c6f5x6vv5rdsb92d64hi1d9p2gd84n4awl6x5bdzqnjr55pn";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/stevearc/oil.nvim/";
@ -9680,12 +9692,12 @@ final: prev:

  onedarkpro-nvim = buildVimPlugin {
    pname = "onedarkpro.nvim";
-    version = "2024-08-22";
+    version = "2024-10-17";
    src = fetchFromGitHub {
      owner = "olimorris";
      repo = "onedarkpro.nvim";
-      rev = "ada0798b1bf6d0bde1fbf239c22de778bf5efbd1";
-      sha256 = "065f1cvdkaphdpqnslyaj7bk4wqkwa5rk8a2xh39j00migqw9p09";
+      rev = "035d63a2fd13885d526f1b90b0aa16a949310ec1";
+      sha256 = "1wpyy0kax9v7177njpc3l3sz77zd39ysglppgmgb8sjs9a4qh6bs";
    };
    meta.homepage = "https://github.com/olimorris/onedarkpro.nvim/";
  };
@ -9764,12 +9776,12 @@ final: prev:

  orgmode = buildVimPlugin {
    pname = "orgmode";
-    version = "2024-10-09";
+    version = "2024-10-17";
    src = fetchFromGitHub {
      owner = "nvim-orgmode";
      repo = "orgmode";
-      rev = "a5aeb14663ef08e0bb4bb847f8d79f9c253094a0";
-      sha256 = "0hwplx3dj7mn95cqhj9hrc9dl2q211ib8hlz3fn4771bsadabxzh";
+      rev = "05d69831e57996d09d9c6d9b135d141d6c051035";
+      sha256 = "05scr3vhdhq11sk4fbqbndska8nfsw63mqpx7kllalzvkcdw31pi";
    };
    meta.homepage = "https://github.com/nvim-orgmode/orgmode/";
  };
@ -9812,12 +9824,12 @@ final: prev:

  overseer-nvim = buildVimPlugin {
    pname = "overseer.nvim";
-    version = "2024-10-04";
+    version = "2024-10-16";
    src = fetchFromGitHub {
      owner = "stevearc";
      repo = "overseer.nvim";
-      rev = "965f8159408cee5970421ad36c4523333b798502";
-      sha256 = "1z6mrgkh0rkpc565r5hlfqnfqgfywcxz9hizw69zyrfhy8x8yg58";
+      rev = "6f8bc37eb729a00e185cdf38b1ed3309a05bfeef";
+      sha256 = "0817pw0vaa9war0d7skf9438mazdf9ip29amw77zlbjqcdzg5nbi";
      fetchSubmodules = true;
    };
    meta.homepage = "https://github.com/stevearc/overseer.nvim/";
@ -9945,12 +9957,12 @@ final: prev:

  persisted-nvim = buildVimPlugin {
    pname = "persisted.nvim";
-    version = "2024-09-13";
+    version = "2024-10-17";
    src = fetchFromGitHub {
      owner = "olimorris";
      repo = "persisted.nvim";
-      rev = "3006e641e2892b58fe51511c31595515e1a7dc00";
-      sha256 = "19zp691z8lbxyg1fisqz8lf3jgra4sww6c6qj270im8kqc4h2spp";
+      rev = "e9a179271b1c7888e0a87448b3cf81652a6606c1";
+      sha256 = "1d0yyl9qm0diwmz0ma44x8sj964qq82hrc0pyz9lg8qmpi9di093";
    };
    meta.homepage = "https://github.com/olimorris/persisted.nvim/";
  };
@ -10498,12 +10510,12 @@ final: prev:

  render-markdown-nvim = buildVimPlugin {
    pname = "render-markdown.nvim";
-    version = "2024-10-15";
+    version = "2024-10-18";
    src = fetchFromGitHub {
      owner = "MeanderingProgrammer";
      repo = "render-markdown.nvim";
-      rev = "5925f48b8c00bb6911763f2a2de19ce05d375e85";
-      sha256 = "1vn7nnr7h8g5i8ljqfrj11mzbqs6qamw2rwi5xrihaxmjnhbp24z";
+      rev = "1871dc4ced6fd775591a63df8e4c343ebaf1a2d2";
+      sha256 = "0pjhn4wrbbd7mbkxa6i7ifalf3p41srbabn6likngl8sj4bxdc2h";
    };
    meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/";
  };
@ -10896,12 +10908,12 @@ final: prev:

  smart-splits-nvim = buildVimPlugin {
    pname = "smart-splits.nvim";
-    version = "2024-10-12";
+    version = "2024-10-18";
    src = fetchFromGitHub {
      owner = "mrjones2014";
      repo = "smart-splits.nvim";
-      rev = "70f9e4f36082bf28b8bc1d05e2ea7c3f6aeb51ff";
-      sha256 = "1rkwqh6nnf9fv2s1g4fbwsqb6jydkr5zspb60sy1bs1y4maj3lv2";
+      rev = "32172b6598c1c647b96aeead67896c59ca4b7aa6";
+      sha256 = "14bi0qwrlfgb2f1bjp6y18ldp4j71afyqsmykby740fzvxgkmmj0";
    };
    meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
  };
@ -11245,12 +11257,12 @@ final: prev:

  statuscol-nvim = buildVimPlugin {
    pname = "statuscol.nvim";
-    version = "2024-10-01";
+    version = "2024-10-16";
    src = fetchFromGitHub {
      owner = "luukvbaal";
      repo = "statuscol.nvim";
-      rev = "ecc04176e364dd7f614edfc4325e3a8521905ad6";
-      sha256 = "01vb1l97n4slijbn2ljwgpdmdsk4xgp1cj7d001rvi7kc3vlvbrh";
+      rev = "5998d16044159ad3779f62c45e756c555e3051f0";
+      sha256 = "1irwr533hn5321wglrl08cvnk4jwdnyh1zs9433cffl0lzf86a1b";
    };
    meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/";
  };
@ -11487,12 +11499,12 @@ final: prev:

  taboo-vim = buildVimPlugin {
    pname = "taboo.vim";
-    version = "2019-08-27";
+    version = "2024-10-17";
    src = fetchFromGitHub {
      owner = "gcmt";
      repo = "taboo.vim";
-      rev = "caf948187694d3f1374913d36f947b3f9fa1c22f";
-      sha256 = "06pizdnb3gr4pf5hrm3yfzkz99y9bi2vwqm85xknzgdvl1lisj99";
+      rev = "937f67ab9dc2ba1861fabc40ca367e5622c30d36";
+      sha256 = "0rrhakigsyvbhmiwr5ywrnq9ixh19xk906b76bqqlw783cwp5p06";
    };
    meta.homepage = "https://github.com/gcmt/taboo.vim/";
  };
@ -12018,12 +12030,12 @@ final: prev:

  term-edit-nvim = buildVimPlugin {
    pname = "term-edit.nvim";
-    version = "2024-09-30";
+    version = "2024-10-17";
    src = fetchFromGitHub {
      owner = "chomosuke";
      repo = "term-edit.nvim";
-      rev = "b190a91178ef98beefac2ec0823db047978ea327";
-      sha256 = "038aqf5bpx233w49gdvpmci56rl1m60cqkkwq2h5fkc4amxf67l8";
+      rev = "29c4584c2cef44a3fdcc55860957d081b892a569";
+      sha256 = "0g05gi46i4yx1k5fhqrlv9rvw2nvikdc1dpr4d5yjzjhbpx2gkmc";
    };
    meta.homepage = "https://github.com/chomosuke/term-edit.nvim/";
  };
@ -12162,12 +12174,12 @@ final: prev:

  tiny-inline-diagnostic-nvim = buildVimPlugin {
    pname = "tiny-inline-diagnostic.nvim";
-    version = "2024-10-15";
+    version = "2024-10-16";
    src = fetchFromGitHub {
      owner = "rachartier";
      repo = "tiny-inline-diagnostic.nvim";
-      rev = "1618f75a6c1dab4e96a1c0fbf436da346bc2db18";
-      sha256 = "1i58y1hz9kxxq9ca69g392hjjvlbif884vgybakd73ywcsx14bgr";
+      rev = "a4f8b29eb318b507a5e5c11e6d69bea4f5bc2ab2";
+      sha256 = "03q8j80ra185jrvxxbj462apvyb86xa25w049xmpf5r1in2bkqsb";
    };
    meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/";
  };
@ -12548,12 +12560,12 @@ final: prev:

  unison = buildVimPlugin {
    pname = "unison";
-    version = "2024-10-10";
+    version = "2024-10-17";
    src = fetchFromGitHub {
      owner = "unisonweb";
      repo = "unison";
-      rev = "e2c42cac45a77b5548ddcec57eb79b6996659d2a";
-      sha256 = "1cjg9plvwq00plynk7k993rbg65zdwgmyv0jvl824wa3inh0fv7w";
+      rev = "b1ac7ba1b984dc5bbabee7e136fea5674218e791";
+      sha256 = "05df053ddczcv243kd5bcyz1h2p2kwivqqk8rmangs3h66dzvp98";
    };
    meta.homepage = "https://github.com/unisonweb/unison/";
  };
@ -15094,12 +15106,12 @@ final: prev:

  vim-just = buildVimPlugin {
    pname = "vim-just";
-    version = "2024-10-06";
+    version = "2024-10-17";
    src = fetchFromGitHub {
      owner = "NoahTheDuke";
      repo = "vim-just";
-      rev = "f08fa6b29dbfc486696fa606d44af86bc88fb1e8";
-      sha256 = "1sprx6dzc0lbdrjcq6m2dzbb2r1jk1wwfqapbd7a2cvypc18gqf2";
+      rev = "c11e414956e748255ee56cba9a8a10ae68dff728";
+      sha256 = "05cggnd8gcbyhqvyvnq4y16imiaj2f3njr6nwmcq7qi1gbgz9x1x";
    };
    meta.homepage = "https://github.com/NoahTheDuke/vim-just/";
  };
@ -15491,12 +15503,12 @@ final: prev:

  vim-matchup = buildVimPlugin {
    pname = "vim-matchup";
-    version = "2024-09-12";
+    version = "2024-10-18";
    src = fetchFromGitHub {
      owner = "andymass";
      repo = "vim-matchup";
-      rev = "1975afe63198ab6a0dff7200919828e5cd4330b9";
-      sha256 = "05gwlf5fmkvs4p92n7l397brb8g6g62pvxcd93kffv289vmx7rzk";
+      rev = "57d3a4bbf4c9a0ab73f2cb90c4a9c93fef4c420f";
+      sha256 = "1b0qvf0kd69b4y5r0c32ajy8gyj63c8bmknc43hycicij3dh3bsz";
    };
    meta.homepage = "https://github.com/andymass/vim-matchup/";
  };
@ -15575,12 +15587,12 @@ final: prev:

  vim-monokai = buildVimPlugin {
    pname = "vim-monokai";
-    version = "2024-09-30";
+    version = "2024-10-16";
    src = fetchFromGitHub {
      owner = "crusoexia";
      repo = "vim-monokai";
-      rev = "9db250617c625d3265b54a500d9774debcdf4749";
-      sha256 = "18fj5m39amap98g8p3qbqw3h0wrir57g8qkgp8bxv16bwlxdlj9k";
+      rev = "c3efbdefa3d43d739e61294ac39af4a68806a889";
+      sha256 = "1hyvp5sf807an2s3ld08xs4p3xisd9s0rnpc0w6w1kald2ffzlq0";
    };
    meta.homepage = "https://github.com/crusoexia/vim-monokai/";
  };
@ -17496,12 +17508,12 @@ final: prev:

  vim-vsnip-integ = buildVimPlugin {
    pname = "vim-vsnip-integ";
-    version = "2023-07-01";
+    version = "2024-10-18";
    src = fetchFromGitHub {
      owner = "hrsh7th";
      repo = "vim-vsnip-integ";
-      rev = "1914e72cf3de70df7f5dde476cd299aba2440aef";
-      sha256 = "0jqnzvvhlvwrqbxk70j1z7qx5hgzqjnv0hp8rzs9sfbv3wkgq12q";
+      rev = "90ae474e8b05ed41e36d6f58382a9fbfb4b672c4";
+      sha256 = "1n8g9knii0y5c7gnwmndbw2c2ii5xji0i90cfdcdvrkdhfacpyha";
    };
    meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/";
  };
@ -17869,12 +17881,12 @@ final: prev:

  vimtex = buildVimPlugin {
    pname = "vimtex";
-    version = "2024-10-13";
+    version = "2024-10-17";
    src = fetchFromGitHub {
      owner = "lervag";
      repo = "vimtex";
-      rev = "9a5ef1d4ac8e4e06071179ebe8121350fcb97861";
-      sha256 = "1zp8wvys8m61sqpyil7ra33pinnq8kliadric0d7iii9d4gjqidd";
+      rev = "4dd3be5cc4e8f6ee7401e303a8211efb4d91bcf6";
+      sha256 = "11a84xcm0rm4mv8521pi5a9dgiv8lys11nrda5kwh5vlrzxdwdwx";
    };
    meta.homepage = "https://github.com/lervag/vimtex/";
  };
@ -18242,12 +18254,12 @@ final: prev:

  yazi-nvim = buildVimPlugin {
    pname = "yazi.nvim";
-    version = "2024-10-14";
+    version = "2024-10-18";
    src = fetchFromGitHub {
      owner = "mikavilpas";
      repo = "yazi.nvim";
-      rev = "519940019913a5e742e2dd2f04712d9ff8869a10";
-      sha256 = "1yir1h5k6ni6wqbxbj5fs2rmd7bwl1asj6nh82h987mg8s7w3gf5";
+      rev = "6a233f7bbdd2aa57a169471cd783c17e48b1be33";
+      sha256 = "0b7p3zn0c35gcf5bn41a06rwghn818699jy7qmbpjaqs2nq2ica1";
    };
    meta.homepage = "https://github.com/mikavilpas/yazi.nvim/";
  };
@ -18542,12 +18554,12 @@ final: prev:

  nvchad-ui = buildVimPlugin {
    pname = "nvchad-ui";
-    version = "2024-10-15";
+    version = "2024-10-18";
    src = fetchFromGitHub {
      owner = "nvchad";
      repo = "ui";
-      rev = "e0891549ec3ccff7d68a57915e7af97c9608ffad";
-      sha256 = "1sj9gjzr8g035dhszpcg19a6f68ibqj65bfss39vm4qhk9zr85kn";
+      rev = "87578bb7e2bc106127f013f9a1edd7a716f4f6c6";
+      sha256 = "0jz4wgh67xqlmhn0aqlx7i4v7idbxgbmvgysf0crmwps0i80j4ds";
    };
    meta.homepage = "https://github.com/nvchad/ui/";
  };
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@ -559,12 +559,12 @@
  };
  elixir = buildGrammar {
    language = "elixir";
-    version = "0.0.0+rev=827d15d";
+    version = "0.0.0+rev=2ac7a0f";
    src = fetchFromGitHub {
      owner = "elixir-lang";
      repo = "tree-sitter-elixir";
-      rev = "827d15deada6ca2f40eece82d1bbe65df07af954";
-      hash = "sha256-yKeSOH1/6R1km3vzIZurVwVE1hxVoGMBCFGHkHFkt20=";
+      rev = "2ac7a0f81f0731d83068b2872c4a8fee39263a85";
+      hash = "sha256-u0gwq4eIoFNcTeoJpY2lRE97M7JSHZ5X2zSKrNlTycM=";
    };
    meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir";
  };
@ -735,12 +735,12 @@
  };
  fsharp = buildGrammar {
    language = "fsharp";
-    version = "0.0.0+rev=5202637";
+    version = "0.0.0+rev=971da5f";
    src = fetchFromGitHub {
      owner = "ionide";
      repo = "tree-sitter-fsharp";
-      rev = "5202637c203fcf8876affbd18b04ff43256d4c4a";
-      hash = "sha256-OjCwEhTACaVcnR/NyfUGZN/juLUHgqY6h+3DSrqUuiQ=";
+      rev = "971da5ff0266bfe4a6ecfb94616548032d6d1ba0";
+      hash = "sha256-0jrbznAXcjXrbJ5jnxWMzPKxRopxKCtoQXGl80R1M0M=";
    };
    location = "fsharp";
    meta.homepage = "https://github.com/ionide/tree-sitter-fsharp";
@ -846,12 +846,12 @@
  };
  gitcommit = buildGrammar {
    language = "gitcommit";
-    version = "0.0.0+rev=79fdc5d";
+    version = "0.0.0+rev=66e2585";
    src = fetchFromGitHub {
      owner = "gbprod";
      repo = "tree-sitter-gitcommit";
-      rev = "79fdc5de52d0e2c6854db924525196af22100dad";
-      hash = "sha256-SvYMfldARrwhte6lJrCwpVaBjCerCsYwL4Z+qjdhHKs=";
+      rev = "66e2585f4a3e73e768d42ef1223a5fb0a447bae6";
+      hash = "sha256-TZYdYTyDjvbvkuaKORLpQBqkcSCdG7ZSO1Jo64YkJ3o=";
    };
    meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit";
  };
@ -890,23 +890,23 @@
  };
  glimmer_javascript = buildGrammar {
    language = "glimmer_javascript";
-    version = "0.0.0+rev=a260911";
+    version = "0.0.0+rev=7e8ea8c";
    src = fetchFromGitHub {
      owner = "NullVoxPopuli";
      repo = "tree-sitter-glimmer-javascript";
-      rev = "a260911201684f80cf815418b3771e6c39309f81";
-      hash = "sha256-fpVlfYjVI1ricwNfuzI5AV3RV4ijFTYOf/2NhCirCvU=";
+      rev = "7e8ea8cf39fc360cb97bd253442cd48e4f7a9ce3";
+      hash = "sha256-gqadIB5tB7aIOl3g6pxDeOsuENAwzb5RLVFn4d0G9MY=";
    };
    meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript";
  };
  glimmer_typescript = buildGrammar {
    language = "glimmer_typescript";
-    version = "0.0.0+rev=9d018a0";
+    version = "0.0.0+rev=4006128";
    src = fetchFromGitHub {
      owner = "NullVoxPopuli";
      repo = "tree-sitter-glimmer-typescript";
-      rev = "9d018a0f93417e6951264a26093b89ee63df7315";
-      hash = "sha256-ZV6q4OEwj0ulGh5PO5XEMvT4WJQHkMmMXFJs8mcJqXk=";
+      rev = "4006128790efb58ca82a4492d8ef0983b260fc6a";
+      hash = "sha256-oOF36q09hcOCdFWrFQlhDX79tS9xBNVgcp1vmxjRdGM=";
    };
    meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-typescript";
  };
@ -1042,6 +1042,17 @@
    };
    meta.homepage = "https://github.com/bkegley/tree-sitter-graphql";
  };
+  gren = buildGrammar {
+    language = "gren";
+    version = "0.0.0+rev=c06e272";
+    src = fetchFromGitHub {
+      owner = "MaeBrooks";
+      repo = "tree-sitter-gren";
+      rev = "c06e272341363c5d8e19ac34bc7c56258a37e71b";
+      hash = "sha256-Zxa/5hTFrkVRzswKion1tzrwp//ASuZKQjw7g/znBsI=";
+    };
+    meta.homepage = "https://github.com/MaeBrooks/tree-sitter-gren";
+  };
  groovy = buildGrammar {
    language = "groovy";
    version = "0.0.0+rev=0d88845";
@ -1309,12 +1320,12 @@
  };
  java = buildGrammar {
    language = "java";
-    version = "0.0.0+rev=3f86793";
+    version = "0.0.0+rev=b864ed9";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-java";
-      rev = "3f8679368cf00ed10ec086975fa87f697b91b7bc";
-      hash = "sha256-Mkh3zwZmErBEwzQ1yLTo9kyEhSZm6WigXtWKZpPYyXY=";
+      rev = "b864ed97b9675e86de7c15a70c12e4c1ca85fbf9";
+      hash = "sha256-CiWIh8IFmK1xW7DfERWqsnFjtveAevANlzJbPOwA7Z0=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-java";
  };
@ -1943,24 +1954,24 @@
  };
  php = buildGrammar {
    language = "php";
-    version = "0.0.0+rev=69af07e";
+    version = "0.0.0+rev=2bce5a6";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-php";
-      rev = "69af07eedf60bc1992c59a8fd6b5e41f25442715";
-      hash = "sha256-uS5MTotJypsawMR1z/KmZCNxfTuFIyimqbms5IEJ0cE=";
+      rev = "2bce5a6588ad6d53ffe5effaf9708682f0fbfc9b";
+      hash = "sha256-0yWXwRc0cMMLL8P99eW3BwYIrm6FDG7eBNfjmIDzZIU=";
    };
    location = "php";
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
  };
  php_only = buildGrammar {
    language = "php_only";
-    version = "0.0.0+rev=69af07e";
+    version = "0.0.0+rev=2bce5a6";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-php";
-      rev = "69af07eedf60bc1992c59a8fd6b5e41f25442715";
-      hash = "sha256-uS5MTotJypsawMR1z/KmZCNxfTuFIyimqbms5IEJ0cE=";
+      rev = "2bce5a6588ad6d53ffe5effaf9708682f0fbfc9b";
+      hash = "sha256-0yWXwRc0cMMLL8P99eW3BwYIrm6FDG7eBNfjmIDzZIU=";
    };
    location = "php_only";
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-php";
@ -2454,12 +2465,12 @@
  };
  scala = buildGrammar {
    language = "scala";
-    version = "0.0.0+rev=2cfbb6e";
+    version = "0.0.0+rev=a9af635";
    src = fetchFromGitHub {
      owner = "tree-sitter";
      repo = "tree-sitter-scala";
-      rev = "2cfbb6e3fcdfd51e0d477a43cc37ae8c6f87dc2e";
-      hash = "sha256-8s5Li+fuHyr19KYaC/UzXc7ASLimwAu1VS+8lc5rNLA=";
+      rev = "a9af6356f8e31f04e870587bca79bc2b15808ff5";
+      hash = "sha256-nZUQh42OsPnQffixOklbAmAIGtct/AaKOn4fE6ndTfQ=";
    };
    meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala";
  };
@ -2700,12 +2711,12 @@
  };
  superhtml = buildGrammar {
    language = "superhtml";
-    version = "0.0.0+rev=36f37aa";
+    version = "0.0.0+rev=3325bbb";
    src = fetchFromGitHub {
      owner = "kristoff-it";
      repo = "superhtml";
-      rev = "36f37aa5aa440805f27d4a9f5203e616a303c6a1";
-      hash = "sha256-oegEpBCk7Fhx4SbXebBq33b7Ef9XshYfx2SciaKwINY=";
+      rev = "3325bbb2dda260131a8db0cae1f1f557d17ebced";
+      hash = "sha256-3NAS3eqayFYRziryNgOWfY+3d1HcVe+jPcKkkL9jbWY=";
    };
    location = "tree-sitter-superhtml";
    meta.homepage = "https://github.com/kristoff-it/superhtml";
@ -2766,25 +2777,14 @@
    };
    meta.homepage = "https://github.com/ok-ryoko/tree-sitter-systemtap";
  };
-  systemverilog = buildGrammar {
-    language = "systemverilog";
-    version = "0.0.0+rev=4f897d5";
-    src = fetchFromGitHub {
-      owner = "zhangwwpeng";
-      repo = "tree-sitter-systemverilog";
-      rev = "4f897d5e3f0e38bf8fbb55e8f39dc97d2bc2229e";
-      hash = "sha256-guNdS07QqbqegFICNHP1ECX9bc+ZCW9li3ILIZVHRwM=";
-    };
-    meta.homepage = "https://github.com/zhangwwpeng/tree-sitter-systemverilog";
-  };
  t32 = buildGrammar {
    language = "t32";
-    version = "0.0.0+rev=6182836";
+    version = "0.0.0+rev=0f6a5b1";
    src = fetchFromGitLab {
      owner = "xasc";
      repo = "tree-sitter-t32";
-      rev = "6182836f4128725f1e74ce986840d7317021a015";
-      hash = "sha256-w9X/CL5X6Lwr4/GGVQcMZ1O2HfJmdNiVjRQKGZHrRqg=";
+      rev = "0f6a5b1e031c97ebf58d3c76eadb2c6bf1e4f780";
+      hash = "sha256-Pd6rudBmDVvBwlVSLtBmSsoOBU9aG0iSyEPbTaYX6JE=";
    };
    meta.homepage = "https://gitlab.com/xasc/tree-sitter-t32.git";
  };
@ -2858,12 +2858,12 @@
  };
  textproto = buildGrammar {
    language = "textproto";
-    version = "0.0.0+rev=d900077";
+    version = "0.0.0+rev=568471b";
    src = fetchFromGitHub {
      owner = "PorterAtGoogle";
      repo = "tree-sitter-textproto";
-      rev = "d900077aef9f5dcb0d47c86be33585013ed5db9a";
-      hash = "sha256-PZMhYhIpGa7Y50jxvXZ0Z5l9e26P5q55sC18ptDi/uU=";
+      rev = "568471b80fd8793d37ed01865d8c2208a9fefd1b";
+      hash = "sha256-VAj8qSxbkFqNp0X8BOZNvGTggSXZvzDjODedY11J0BQ=";
    };
    meta.homepage = "https://github.com/PorterAtGoogle/tree-sitter-textproto";
  };
@ -3116,14 +3116,14 @@
  };
  verilog = buildGrammar {
    language = "verilog";
-    version = "0.0.0+rev=5a01c57";
+    version = "0.0.0+rev=0dacb91";
    src = fetchFromGitHub {
-      owner = "tree-sitter";
-      repo = "tree-sitter-verilog";
-      rev = "5a01c57fa8e3d8801953a67ae7c6b240e2284ee8";
-      hash = "sha256-Q8RaoL/1vNd553VFOI8crRffV8iVmAnMVCC+O2zjEZU=";
+      owner = "gmlarumbe";
+      repo = "tree-sitter-systemverilog";
+      rev = "0dacb911daa9614a7c7e79a594d4cb9f478e6554";
+      hash = "sha256-WATrVeP3c//tWLG8VibXZrYrChBs7d4V6LCcEGcofdg=";
    };
-    meta.homepage = "https://github.com/tree-sitter/tree-sitter-verilog";
+    meta.homepage = "https://github.com/gmlarumbe/tree-sitter-systemverilog";
  };
  vhdl = buildGrammar {
    language = "vhdl";
@ -3204,12 +3204,12 @@
  };
  wgsl_bevy = buildGrammar {
    language = "wgsl_bevy";
-    version = "0.0.0+rev=0f06f24";
+    version = "0.0.0+rev=47c1818";
    src = fetchFromGitHub {
      owner = "theHamsta";
      repo = "tree-sitter-wgsl-bevy";
-      rev = "0f06f24e259ac725045956436b9025dab008ff9f";
-      hash = "sha256-/HNDdI2Tg6YG/lAvubZtN2g6pUCk0Kl4kRTRsABIm0Y=";
+      rev = "47c1818d245a6156a488c4c4d06e9336714bae9b";
+      hash = "sha256-oL9HDMDl6MgDLZw4NWtdX7W775JZKwD2BweAO+9iI/k=";
    };
    meta.homepage = "https://github.com/theHamsta/tree-sitter-wgsl-bevy";
  };
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@ -199,6 +199,8 @@ in
    meta.homepage = "https://github.com/sblumentritt/bitbake.vim/";
  };

+  blink-cmp = callPackage ./blink-cmp { };
+
  # The GitHub repository returns 404, which breaks the update script
  vim-pony = buildVimPlugin {
    pname = "vim-pony";
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -457,6 +457,7 @@ https://github.com/Myzel394/jsonfly.nvim/,HEAD,
 https://github.com/JuliaEditorSupport/julia-vim/,,
 https://github.com/GCBallesteros/jupytext.nvim/,HEAD,
 https://github.com/rebelot/kanagawa.nvim/,,
+https://github.com/imsnif/kdl.vim/,HEAD,
 https://github.com/anuvyklack/keymap-layer.nvim/,HEAD,
 https://github.com/kmonad/kmonad-vim/,,
 https://github.com/frabjous/knap/,HEAD,
--- a/pkgs/applications/misc/input-leap/default.nix
+++ b/pkgs/applications/misc/input-leap/default.nix
@ -1,5 +1,5 @@
 { lib
-, mkDerivation
+, stdenv
 , fetchFromGitHub
 , cmake

@ -22,21 +22,22 @@
 , qtbase
 , qttools
 , wrapGAppsHook3
+, wrapQtAppsHook
 }:

-mkDerivation rec {
+stdenv.mkDerivation rec {
  pname = "input-leap";
-  version = "unstable-2023-12-27";
+  version = "3.0.2";

  src = fetchFromGitHub {
    owner = "input-leap";
    repo = "input-leap";
-    rev = "ecf1fb6645af7b79e6ea984d3c9698ca0ab6f391";
-    hash = "sha256-TEv1xR1wUG3wXNATLLIZKOtW05X96wsPNOlE77OQK54=";
+    rev = "v${version}";
+    hash = "sha256-YkBHvwN573qqQWe/p0n4C2NlyNQHSZNz2jyMKGPITF4=";
    fetchSubmodules = true;
  };

-  nativeBuildInputs = [ pkg-config cmake wrapGAppsHook3 qttools ];
+  nativeBuildInputs = [ pkg-config cmake wrapGAppsHook3 wrapQtAppsHook qttools ];
  buildInputs = [
    curl qtbase avahi
    libX11 libXext libXtst libXinerama libXrandr libXdmcp libICE libSM
--- a/pkgs/applications/networking/cluster/k0sctl/default.nix
+++ b/pkgs/applications/networking/cluster/k0sctl/default.nix
@ -12,8 +12,8 @@ buildGoModule rec {

  src = fetchFromGitHub {
    owner = "k0sproject";
-    repo = pname;
-    rev = "v${version}";
+    repo = "k0sctl";
+    rev = "refs/tags/v${version}";
    hash = "sha256-86MLQdXc10bvDFeq3ImD19ytjVPVD19eJzicIo6oJZc=";
  };

@ -22,9 +22,9 @@ buildGoModule rec {
  ldflags = [
    "-s"
    "-w"
-    "-X github.com/k0sproject/k0sctl/version.Environment=production"
-    "-X github.com/carlmjohnson/versioninfo.Version=v${version}" # Doesn't work currently: https://github.com/carlmjohnson/versioninfo/discussions/12
-    "-X github.com/carlmjohnson/versioninfo.Revision=v${version}"
+    "-X=github.com/k0sproject/k0sctl/version.Environment=production"
+    "-X=github.com/carlmjohnson/versioninfo.Version=v${version}" # Doesn't work currently: https://github.com/carlmjohnson/versioninfo/discussions/12
+    "-X=github.com/carlmjohnson/versioninfo.Revision=v${version}"
  ];

  nativeBuildInputs = [ installShellFiles ];
@ -46,6 +46,7 @@ buildGoModule rec {
  meta = with lib; {
    description = "Bootstrapping and management tool for k0s clusters";
    homepage = "https://k0sproject.io/";
+    changelog = "https://github.com/k0sproject/k0sctl/releases/tag/v${version}";
    license = licenses.asl20;
    mainProgram = "k0sctl";
    maintainers = with maintainers; [ nickcao qjoly ];
--- a/pkgs/applications/networking/dnscontrol/default.nix
+++ b/pkgs/applications/networking/dnscontrol/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "dnscontrol";
-  version = "4.13.0";
+  version = "4.14.0";

  src = fetchFromGitHub {
    owner = "StackExchange";
    repo = "dnscontrol";
    rev = "v${version}";
-    hash = "sha256-qDCt1Ld3xHPexpCv/0SbvQwGhWE46cVX3BJ0PoBsKcA=";
+    hash = "sha256-XKsP6ZJCY196wYsp54d0OgF4zj0b9H8820wBAOjrDbg=";
  };

-  vendorHash = "sha256-qEIvxQ4PRtDWyIw3MWmyXV4HLraCLSglHivlV7UJ9jM=";
+  vendorHash = "sha256-6ePEgHVFPtkW+C57+cPLj5yc9YaCRKrnBFo2Y1pcglM=";

  nativeBuildInputs = [ installShellFiles ];

--- a/pkgs/by-name/al/aldente/package.nix
+++ b/pkgs/by-name/al/aldente/package.nix
@ -8,11 +8,11 @@

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "aldente";
-  version = "1.28.4";
+  version = "1.28.5";

  src = fetchurl {
    url = "https://github.com/davidwernhart/aldente-charge-limiter/releases/download/${finalAttrs.version}/AlDente.dmg";
-    hash = "sha256-ihfTVVc6kM+rOyPG7k2rkLVmCsOlBA7Uik8KrWhrdp0=";
+    hash = "sha256-N+0bNgD80LLzwRAvYwxcLC0WnMgpvS4DnX/dZx0nIvE=";
  };

  dontBuild = true;
--- a/pkgs/by-name/an/anchor/package.nix
+++ b/pkgs/by-name/an/anchor/package.nix
@ -46,7 +46,7 @@ rustPlatform.buildRustPackage rec {
    homepage = "https://github.com/coral-xyz/anchor";
    changelog = "https://github.com/coral-xyz/anchor/blob/${src.rev}/CHANGELOG.md";
    license = licenses.asl20;
-    maintainers = with maintainers; [ xrelkd ];
+    maintainers = [ ];
    mainProgram = "anchor";
  };
 }
--- a/pkgs/by-name/ba/bash-language-server/package.nix
+++ b/pkgs/by-name/ba/bash-language-server/package.nix
@ -45,13 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
    pnpm --offline \
      --frozen-lockfile --ignore-script \
      --filter=bash-language-server \
-      deploy $out/lib/bash-language-server
-    # Cleanup directory a bit, to save space, and make fixup phase a bit faster
-    rm -r $out/lib/bash-language-server/src
-    find $out/lib/bash-language-server -name '*.ts' -delete
-    rm -r \
-      $out/lib/bash-language-server/node_modules/.bin \
-      $out/lib/bash-language-server/node_modules/*/bin
+      deploy --prod $out/lib/bash-language-server

    # Create the executable, based upon what happens in npmHooks.npmInstallHook
    makeWrapper ${lib.getExe nodejs} $out/bin/bash-language-server \
--- a/pkgs/by-name/co/cosmic-wallpapers/package.nix
+++ b/pkgs/by-name/co/cosmic-wallpapers/package.nix
@ -39,9 +39,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    description = "Wallpapers for the COSMIC Desktop Environment";
    homepage = "https://system76.com/cosmic";
    license = with lib.licenses; [
-      unfree # https://github.com/pop-os/cosmic-wallpapers/issues/1 https://github.com/pop-os/cosmic-wallpapers/issues/3 https://github.com/pop-os/cosmic-wallpapers/issues/4
+      unfree # https://github.com/pop-os/cosmic-wallpapers/issues/1 https://github.com/pop-os/cosmic-wallpapers/issues/3
      cc-by-40 # https://www.esa.int/ESA_Multimedia/Images/2017/06/A_stormy_stellar_nursery (A_stormy_stellar_nursery_esa_379309.jpg)
-      publicDomain # https://earthobservatory.nasa.gov/image-use-policy (otherworldly_earth_nasa_ISS064-E-29444.jpg, phytoplankton_bloom_nasa_oli2_20240121.jpg); https://hubblesite.org/copyright (orion_nebula_nasa_heic0601a.jpg); https://webbtelescope.org/copyright (tarantula_nebula_nasa_PIA23646.jpg)
+      publicDomain # https://earthobservatory.nasa.gov/image-use-policy (otherworldly_earth_nasa_ISS064-E-29444.jpg, phytoplankton_bloom_nasa_oli2_20240121.jpg); https://hubblesite.org/copyright (orion_nebula_nasa_heic0601a.jpg); https://webbtelescope.org/copyright (tarantula_nebula_nasa_PIA23646.jpg); https://www.planetary.org/space-images/the-solar-systems-round-moons (round_moons_nasa.jpg)
    ];
    maintainers = with lib.maintainers; [ pandapip1 ];
    platforms = lib.platforms.unix;
--- a/pkgs/by-name/fo/foxmarks/package.nix
+++ b/pkgs/by-name/fo/foxmarks/package.nix
@ -0,0 +1,30 @@
+{
+  lib,
+  fetchFromGitHub,
+  rustPlatform,
+  sqlite,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "foxmarks";
+  version = "2.1.0";
+
+  src = fetchFromGitHub {
+    owner = "zer0-x";
+    repo = "foxmarks";
+    rev = "v${version}";
+    hash = "sha256-tkmmu6A7vqK4yO9zHjVEeACaOHP3+hJQLBK7p/Svn7Q=";
+  };
+
+  cargoHash = "sha256-m3JtibgNHsZScxziNEu1ycslJocBXRbtloMWE0G5ZyM=";
+
+  buildInputs = [ sqlite ];
+
+  meta = {
+    description = "CLI read-only interface for Mozilla Firefox's bookmarks";
+    homepage = "https://github.com/zer0-x/foxmarks";
+    changelog = "https://github.com/zer0-x/foxmarks/blobl/v${version}/CHANGELOG.md";
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ loicreynier ];
+  };
+}
--- a/pkgs/by-name/gi/git-spice/package.nix
+++ b/pkgs/by-name/gi/git-spice/package.nix
@ -1,5 +1,6 @@
 {
  lib,
+  stdenv,
  buildGo123Module,
  fetchFromGitHub,
  git,
@ -31,6 +32,14 @@ buildGo123Module rec {
    "-X=main._version=${version}"
  ];

+  __darwinAllowLocalNetworking = true;
+
+  preCheck = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
+    # timeout
+    rm testdata/script/branch_submit_remote_prompt.txt
+    rm testdata/script/branch_submit_multiple_pr_templates.txt
+  '';
+
  passthru.updateScript = nix-update-script { };

  meta = {
--- a/pkgs/by-name/ht/httpie-desktop/package.nix
+++ b/pkgs/by-name/ht/httpie-desktop/package.nix
@ -2,16 +2,24 @@
  appimageTools,
  lib,
  fetchurl,
+  stdenv,
 }:

 appimageTools.wrapType2 rec {
  pname = "httpie-desktop";
  version = "2024.1.2";

-  src = fetchurl {
-    url = "https://github.com/httpie/desktop/releases/download/v${version}/HTTPie-${version}.AppImage";
-    hash = "sha256-OOP1l7J2BgO3nOPSipxfwfN/lOUsl80UzYMBosyBHrM=";
-  };
+  src =
+    if stdenv.hostPlatform.system == "aarch64-linux" then
+      fetchurl {
+        url = "https://github.com/httpie/desktop/releases/download/v${version}/HTTPie-${version}-arm64.AppImage";
+        hash = "sha256-RhIyLakCkMUcXvu0sgl5MtV4YXXkqqH1UUS7bptUzww=";
+      }
+    else
+      fetchurl {
+        url = "https://github.com/httpie/desktop/releases/download/v${version}/HTTPie-${version}.AppImage";
+        hash = "sha256-OOP1l7J2BgO3nOPSipxfwfN/lOUsl80UzYMBosyBHrM=";
+      };

  extraInstallCommands =
    let
@ -32,6 +40,9 @@ appimageTools.wrapType2 rec {
    license = licenses.unfree;
    maintainers = with maintainers; [ luftmensch-luftmensch ];
    mainProgram = "httpie-desktop";
-    platforms = [ "x86_64-linux" ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
  };
 }
--- a/pkgs/by-name/ki/kiwitalk/Cargo.lock
+++ b/pkgs/by-name/ki/kiwitalk/Cargo.lock
--- a/pkgs/by-name/ki/kiwitalk/package.nix
+++ b/pkgs/by-name/ki/kiwitalk/package.nix
@ -1,79 +0,0 @@
-{ lib
-, fetchFromGitHub
-, stdenv
-, rustc
-, rustPlatform
-, cargo
-, cargo-tauri
-, desktop-file-utils
-, openssl
-, libayatana-appindicator
-, webkitgtk_4_0
-, pkg-config
-, pnpm
-, nodejs
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "kiwitalk";
-  version = "0.5.1";
-
-  src = fetchFromGitHub {
-    owner = "KiwiTalk";
-    repo = "KiwiTalk";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-Th8q+Zbc102fIk2v7O3OOeSriUV/ydz60QwxzmS7AY8=";
-  };
-
-  postPatch = ''
-    substituteInPlace $cargoDepsCopy/libappindicator-sys-*/src/lib.rs \
-      --replace-warn "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1"
-    ln -sf ${./Cargo.lock} Cargo.lock
-  '';
-
-  pnpmDeps = pnpm.fetchDeps {
-    inherit (finalAttrs) pname version src;
-    hash = "sha256-gf3vmKUta8KksUOxyhQS4UO6ycAJDfEicyXVGMW8+4c=";
-  };
-
-  cargoDeps = rustPlatform.importCargoLock {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "tauri-plugin-log-0.0.0" = "sha256-8BrFf7vheMJIaZD0oXpi8V4hmUJFzHJmkcRtPL1/J48=";
-      "tauri-plugin-single-instance-0.0.0" = "sha256-8BrFf7vheMJIaZD0oXpi8V4hmUJFzHJmkcRtPL1/J48=";
-    };
-  };
-
-  nativeBuildInputs = [
-    rustPlatform.cargoSetupHook
-    cargo
-    rustc
-    cargo-tauri.hook
-    desktop-file-utils
-    nodejs
-    pnpm.configHook
-    pkg-config
-  ];
-
-  buildInputs = [
-    openssl
-    libayatana-appindicator
-    webkitgtk_4_0
-  ];
-
-  postInstall = lib.optionalString stdenv.isLinux ''
-    desktop-file-edit \
-      --set-comment "An UNOFFICIAL cross-platform KakaoTalk client" \
-      --set-key="Categories" --set-value="Network;InstantMessaging;" \
-      $out/share/applications/kiwi-talk.desktop
-  '';
-
-  meta = with lib; {
-    description = "UNOFFICIAL cross-platform KakaoTalk client written in TypeScript & Rust (SolidJS, tauri)";
-    homepage = "https://github.com/KiwiTalk/KiwiTalk";
-    maintainers = with maintainers; [ honnip ];
-    license = licenses.asl20;
-    platforms = platforms.linux ++ platforms.darwin;
-    mainProgram = "kiwi-talk";
-  };
-})
--- a/pkgs/development/libraries/libguestfs/appliance.nix
+++ b/pkgs/development/libraries/libguestfs/appliance.nix
@ -1,15 +1,16 @@
-{ lib
-, stdenvNoCC
-, fetchurl
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
 }:

 stdenvNoCC.mkDerivation rec {
  pname = "libguestfs-appliance";
-  version = "1.46.0";
+  version = "1.54.0";

  src = fetchurl {
    url = "http://download.libguestfs.org/binaries/appliance/appliance-${version}.tar.xz";
-    hash = "sha256-p1UN5wv3y+V5dFMG5yM3bVf1vaoDzQnVv9apfwC4gNg=";
+    hash = "sha256-D7f4Cnjx+OmLfqQWmauyXZiSjayG9TCmxftj0iOPFso=";
  };

  installPhase = ''
@ -24,8 +25,15 @@ stdenvNoCC.mkDerivation rec {
  meta = with lib; {
    description = "VM appliance disk image used in libguestfs package";
    homepage = "https://libguestfs.org";
-    license = with licenses; [ gpl2Plus lgpl2Plus ];
-    platforms = [ "i686-linux" "x86_64-linux" ];
+    license = with licenses; [
+      gpl2Plus
+      lgpl2Plus
+    ];
+    maintainers = with maintainers; [ lukts30 ];
+    platforms = [
+      "i686-linux"
+      "x86_64-linux"
+    ];
    hydraPlatforms = [ ]; # Hydra fails with "Output limit exceeded"
  };
 }
--- a/pkgs/by-name/li/libguestfs-with-appliance/package.nix
+++ b/pkgs/by-name/li/libguestfs-with-appliance/package.nix
@ -0,0 +1,12 @@
+{
+  lib,
+  libguestfs,
+  libguestfs-appliance,
+}:
+
+# https://github.com/NixOS/nixpkgs/issues/280881
+lib.warnIf (builtins.compareVersions libguestfs.version libguestfs-appliance.version > 0)
+  "libguestfs has a higher version than libguestfs-appliance (${libguestfs.version} > ${libguestfs-appliance.version}), runtime errors may occur!"
+
+  libguestfs.override
+  { appliance = libguestfs-appliance; }
--- a/pkgs/by-name/li/libguestfs/Revert-perl-Pass-CFLAGS-through-extra_linker_flags.patch
+++ b/pkgs/by-name/li/libguestfs/Revert-perl-Pass-CFLAGS-through-extra_linker_flags.patch
@ -0,0 +1,17 @@
+Subject: [PATCH] Revert "perl: Pass @CFLAGS@ through extra_linker_flags"
+
+This reverts commit be06cb048b595200bf7d1cec9684ab7958188b97.
+---
+--- a/perl/Build.PL.in
+++ b/perl/Build.PL.in
+@@ -65,8 +65,6 @@ my $build = Module::Build->new (
+         '@top_srcdir@/include',
+     ],
+     extra_linker_flags => [
+-        '-DGUESTFS_PRIVATE=1',
+-        split (' ', '@CFLAGS@'),
+         '-L@top_builddir@/lib/.libs',
+         '-lguestfs',
+     ],
+-- 
+2.44.1
--- a/pkgs/development/libraries/libguestfs/libguestfs-syms.patch
+++ b/pkgs/development/libraries/libguestfs/libguestfs-syms.patch
--- a/pkgs/by-name/li/libguestfs/package.nix
+++ b/pkgs/by-name/li/libguestfs/package.nix
@ -0,0 +1,201 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  autoreconfHook,
+  makeWrapper,
+  removeReferencesTo,
+  libxcrypt,
+  ncurses,
+  cpio,
+  gperf,
+  cdrkit,
+  flex,
+  bison,
+  qemu,
+  pcre2,
+  augeas,
+  libxml2,
+  acl,
+  libcap,
+  libcap_ng,
+  libconfig,
+  systemdLibs,
+  fuse,
+  yajl,
+  libvirt,
+  hivex,
+  db,
+  gmp,
+  readline,
+  file,
+  numactl,
+  libapparmor,
+  jansson,
+  getopt,
+  perlPackages,
+  ocamlPackages,
+  libtirpc,
+  appliance ? null,
+  javaSupport ? false,
+  jdk,
+  zstd,
+}:
+
+assert appliance == null || lib.isDerivation appliance;
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libguestfs";
+
+  version = "1.54.0";
+
+  src = fetchurl {
+    url = "https://libguestfs.org/download/${lib.versions.majorMinor finalAttrs.version}-stable/${finalAttrs.pname}-${finalAttrs.version}.tar.gz";
+    sha256 = "sha256-tK+g+P1YAgXqVUjUaLxuQ8O+y5leL2DmMmVSemMFQkY=";
+  };
+
+  strictDeps = true;
+  nativeBuildInputs =
+    [
+      autoreconfHook
+      removeReferencesTo
+      bison
+      cdrkit
+      cpio
+      flex
+      getopt
+      gperf
+      makeWrapper
+      pkg-config
+      qemu
+      zstd
+    ]
+    ++ (with perlPackages; [
+      perl
+      libintl-perl
+      GetoptLong
+      ModuleBuild
+    ])
+    ++ (with ocamlPackages; [
+      ocaml
+      findlib
+    ]);
+  buildInputs = [
+    libxcrypt
+    ncurses
+    jansson
+    pcre2
+    augeas
+    libxml2
+    acl
+    libcap
+    libcap_ng
+    libconfig
+    systemdLibs
+    fuse
+    yajl
+    libvirt
+    gmp
+    readline
+    file
+    hivex
+    db
+    numactl
+    libapparmor
+    perlPackages.ModuleBuild
+    libtirpc
+    zstd
+    ocamlPackages.ocamlbuild
+    ocamlPackages.ocaml_libvirt
+    ocamlPackages.ounit
+    ocamlPackages.augeas
+    ocamlPackages.ocamlbuild
+  ] ++ lib.optional javaSupport jdk;
+
+  prePatch = ''
+    patchShebangs .
+  '';
+  configureFlags = [
+    "--enable-daemon"
+    "--enable-install-daemon"
+    "--disable-appliance"
+    "--with-distro=NixOS"
+    "--with-readline"
+    "CPPFLAGS=-I${lib.getDev libxml2}/include/libxml2"
+    "INSTALL_OCAMLLIB=${placeholder "out"}/lib/ocaml"
+    "--with-guestfs-path=${placeholder "out"}/lib/guestfs"
+  ] ++ lib.optionals (!javaSupport) [ "--without-java" ];
+
+  patches = [
+    ./libguestfs-syms.patch
+    # Fixes PERL Sys-Guestfs build failure
+    ./Revert-perl-Pass-CFLAGS-through-extra_linker_flags.patch
+  ];
+
+  createFindlibDestdir = true;
+
+  installFlags = [ "REALLY_INSTALL=yes" ];
+  enableParallelBuilding = true;
+
+  outputs = [
+    "out"
+    "guestfsd"
+  ];
+
+  postInstall = ''
+    # move guestfsd (the component running in the appliance) to a separate output
+    mkdir -p $guestfsd/bin
+    mv $out/sbin/guestfsd $guestfsd/bin/guestfsd
+    remove-references-to -t $out $guestfsd/bin/guestfsd
+
+    mv "$out/lib/ocaml/guestfs" "$OCAMLFIND_DESTDIR/guestfs"
+    for bin in $out/bin/*; do
+      wrapProgram "$bin" \
+        --prefix PATH     : "$out/bin:${hivex}/bin:${qemu}/bin" \
+        --prefix PERL5LIB : "$out/${perlPackages.perl.libPrefix}"
+    done
+  '';
+
+  postFixup = lib.optionalString (appliance != null) ''
+    mkdir -p $out/{lib,lib64}
+    ln -s ${appliance} $out/lib64/guestfs
+    ln -s ${appliance} $out/lib/guestfs
+  '';
+
+  doInstallCheck = appliance != null;
+  installCheckPhase = ''
+    runHook preInstallCheck
+
+    export HOME=$(mktemp -d) # avoid access to /homeless-shelter/.guestfish
+
+    ${qemu}/bin/qemu-img create -f qcow2 disk1.img 10G
+
+    $out/bin/guestfish <<'EOF'
+    add-drive disk1.img
+    run
+    list-filesystems
+    part-disk /dev/sda mbr
+    mkfs ext2 /dev/sda1
+    list-filesystems
+    EOF
+
+    runHook postInstallCheck
+  '';
+
+  meta = {
+    description = "Tools for accessing and modifying virtual machine disk images";
+    license = with lib.licenses; [
+      gpl2Plus
+      lgpl21Plus
+    ];
+    homepage = "https://libguestfs.org/";
+    maintainers = with lib.maintainers; [
+      offline
+      lukts30
+    ];
+    platforms = lib.platforms.linux;
+    # this is to avoid "output size exceeded"
+    hydraPlatforms = if appliance != null then appliance.meta.hydraPlatforms else lib.platforms.linux;
+  };
+})
--- a/pkgs/by-name/py/pylyzer/Cargo.lock
+++ b/pkgs/by-name/py/pylyzer/Cargo.lock
@ -37,9 +37,9 @@ dependencies = [

 [[package]]
 name = "anyhow"
-version = "1.0.89"
+version = "1.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
+checksum = "37bf3594c4c988a53154954629820791dde498571819ae4ca50ca811e060cc95"

 [[package]]
 name = "autocfg"
@ -145,9 +145,9 @@ checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"

 [[package]]
 name = "els"
-version = "0.1.58"
+version = "0.1.59-nightly.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab76dea4883a3e75fab38a6cd6c761346fec5909850c557fcbd683f7bd30b54e"
+checksum = "a2f90c210a0919808e48b96ecffd370ac788386ab061203132872e9bf1ad9f7f"
 dependencies = [
 "erg_common",
 "erg_compiler",
@ -161,9 +161,9 @@ dependencies = [

 [[package]]
 name = "erg_common"
-version = "0.6.46"
+version = "0.6.47-nightly.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cef7281a06474cd12e7eb653d164777023440b13a28c8834124770c4b8f65fa"
+checksum = "d41f171eb77bf2763b119893966358ad9da72a3edd43cf278a78cf1c16daa2cf"
 dependencies = [
 "backtrace-on-stack-overflow",
 "erg_proc_macros",
@ -174,9 +174,9 @@ dependencies = [

 [[package]]
 name = "erg_compiler"
-version = "0.6.46"
+version = "0.6.47-nightly.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bf1c1e83a364fafbcec194a27affd02bf4538740c34c1617c45d960d4a3e33c"
+checksum = "93d0486bc668c120faf7af954dd4046224185c28821fb945a97eedcadf3e7d58"
 dependencies = [
 "erg_common",
 "erg_parser",
@ -184,9 +184,9 @@ dependencies = [

 [[package]]
 name = "erg_parser"
-version = "0.6.46"
+version = "0.6.47-nightly.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c65037a0c9b890d8f810f7a827b897fba6ae950b34258b1450c9ab1e310813c"
+checksum = "98c37f58f3aef2e765610e7281ada15dbba707beaa0262a71e7f6958ee058ed0"
 dependencies = [
 "erg_common",
 "erg_proc_macros",
@ -195,9 +195,9 @@ dependencies = [

 [[package]]
 name = "erg_proc_macros"
-version = "0.6.46"
+version = "0.6.47-nightly.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29d7235082b39bf55cdec52da8c010c2d2d9ff7d41dde051158b7815f560f321"
+checksum = "97fa545f626fd04abea193a07c364c4fca3903c228bbe9cca4895500944b5aaf"
 dependencies = [
 "quote",
 "syn 1.0.109",
@ -292,9 +292,9 @@ checksum = "507460a910eb7b32ee961886ff48539633b788a36b65692b95f225b844c82553"

 [[package]]
 name = "libc"
-version = "0.2.159"
+version = "0.2.161"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
+checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"

 [[package]]
 name = "libm"
@ -554,16 +554,16 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.87"
+version = "1.0.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"
+checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
 dependencies = [
 "unicode-ident",
 ]

 [[package]]
 name = "py2erg"
-version = "0.0.66"
+version = "0.0.67"
 dependencies = [
 "erg_common",
 "erg_compiler",
@ -573,7 +573,7 @@ dependencies = [

 [[package]]
 name = "pylyzer"
-version = "0.0.66"
+version = "0.0.67"
 dependencies = [
 "els",
 "erg_common",
@ -583,7 +583,7 @@ dependencies = [

 [[package]]
 name = "pylyzer_core"
-version = "0.0.66"
+version = "0.0.67"
 dependencies = [
 "erg_common",
 "erg_compiler",
@ -594,7 +594,7 @@ dependencies = [

 [[package]]
 name = "pylyzer_wasm"
-version = "0.0.66"
+version = "0.0.67"
 dependencies = [
 "erg_common",
 "erg_compiler",
@ -764,9 +764,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.128"
+version = "1.0.131"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
+checksum = "67d42a0bd4ac281beff598909bb56a86acaf979b84483e1c79c10dcaf98f8cf3"
 dependencies = [
 "itoa",
 "memchr",
--- a/pkgs/by-name/py/pylyzer/package.nix
+++ b/pkgs/by-name/py/pylyzer/package.nix
@ -15,13 +15,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "pylyzer";
-  version = "0.0.66";
+  version = "0.0.67";

  src = fetchFromGitHub {
    owner = "mtshiba";
    repo = "pylyzer";
    rev = "refs/tags/v${version}";
-    hash = "sha256-vDeQ7IuECykBtcu4qvKKhcr/3vCXjN1JyL3/D4kwnng=";
+    hash = "sha256-UMNyztdcFr88wOpRMBtLigGJcxR+0uScN+8i0+WfeYU=";
  };

  cargoLock = {
--- a/pkgs/by-name/re/reader/package.nix
+++ b/pkgs/by-name/re/reader/package.nix
@ -0,0 +1,30 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+}:
+let
+  self = buildGoModule {
+    pname = "reader";
+    version = "0.4.5";
+
+    src = fetchFromGitHub {
+      owner = "mrusme";
+      repo = "reader";
+      rev = "v${self.version}";
+      hash = "sha256-9hZ7ZS+p6PoLKcuHS2re537wxojN2SzhOm5gBuRX9Xc=";
+    };
+
+    vendorHash = "sha256-obYdifg3WrTyxgN/VtzgpL31ZOyPNtVT8UDQts0WodQ=";
+
+    meta = {
+      description = "Lightweight tool offering better readability of web pages on the CLI";
+      homepage = "https://github.com/mrusme/reader";
+      changelog = "https://github.com/mrusme/reader/releases";
+      license = lib.licenses.gpl3Plus;
+      maintainers = with lib.maintainers; [ theobori ];
+      mainProgram = "reader";
+    };
+  };
+in
+self
--- a/pkgs/by-name/si/simpleini/package.nix
+++ b/pkgs/by-name/si/simpleini/package.nix
@ -0,0 +1,53 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  gtest,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "simpleini";
+  version = "4.22";
+
+  src = fetchFromGitHub {
+    name = "simpleini-sources-${finalAttrs.version}";
+    owner = "brofield";
+    repo = "simpleini";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-H4J4+v/3A8ZTOp4iMeiZ0OClu68oP4vUZ8YOFZbllcM=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    gtest
+  ];
+
+  strictDeps = true;
+
+  cmakeFlags = [ (lib.cmakeBool "SIMPLEINI_USE_SYSTEM_GTEST" true) ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Cross-platform C++ library providing a simple API to read and write INI-style configuration files";
+    longDescription = ''
+      A cross-platform library that provides a simple API to read and write
+      INI-style configuration files. It supports data files in ASCII, MBCS and
+      Unicode. It is designed explicitly to be portable to any platform and has
+      been tested on Windows, WinCE and Linux. Released as open-source and free
+      using the MIT licence.
+    '';
+    homepage = "https://github.com/brofield/simpleini";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      HeitorAugustoLN
+      AndersonTorres
+    ];
+    platforms = lib.platforms.all;
+  };
+})
--- a/pkgs/by-name/ss/ssh-tpm-agent/package.nix
+++ b/pkgs/by-name/ss/ssh-tpm-agent/package.nix
@ -1,28 +1,31 @@
 { lib
 , buildGoModule
 , fetchFromGitHub
+, nix-update-script
 , openssl
 }:

 buildGoModule rec {
  pname = "ssh-tpm-agent";
-  version = "0.6.0";
+  version = "0.7.0";

  src = fetchFromGitHub {
    owner = "Foxboron";
    repo = "ssh-tpm-agent";
    rev = "v${version}";
-    hash = "sha256-gO9qVAVCvaiLrC/GiTJ0NghiXVRXXRBlvOIVSAOftR8=";
+    hash = "sha256-yK7G+wZIn+kJazKOFOs8EYlRWZkCQuT0qZfmdqbcOnM=";
  };

  proxyVendor = true;

-  vendorHash = "sha256-Upq8u5Ip0HQW5FGyqhVUT6rINXz2BpCE7lbtk9fPaWs=";
+  vendorHash = "sha256-njKyBfTG/QCPBBsj3Aom42cv2XqLv4YeS4DhwNQNaLA=";

  buildInputs = [
    openssl
  ];

+  passthru.updateScript = nix-update-script { };
+
  meta = with lib; {
    description = "SSH agent with support for TPM sealed keys for public key authentication";
    homepage = "https://github.com/Foxboron/ssh-tpm-agent";
--- a/pkgs/by-name/ty/typstyle/Cargo.lock
+++ b/pkgs/by-name/ty/typstyle/Cargo.lock
--- a/pkgs/by-name/ty/typstyle/package.nix
+++ b/pkgs/by-name/ty/typstyle/package.nix
@ -13,16 +13,21 @@

 rustPlatform.buildRustPackage rec {
  pname = "typstyle";
-  version = "0.11.35";
+  version = "0.12.0";

  src = fetchFromGitHub {
    owner = "Enter-tainer";
    repo = "typstyle";
    rev = "refs/tags/v${version}";
-    hash = "sha256-mPppnbgTXJ4ALIHrI0q9UpwGPDoTGitw5KRY8eA/vJg=";
+    hash = "sha256-jrhxOtaawZ2vCiK8BQ9G09HTC5F6cnEK/Ji567xYfXw=";
  };

-  cargoHash = "sha256-30xinYXS+OGYE1H0Eutwpjgn3OfFtjTUJInDHvn6/E0=";
+  cargoLock = {
+    lockFile = ./Cargo.lock;
+    outputHashes = {
+      "reflexo-0.5.0-rc7" = "sha256-XjzHo9HprI1FVPDwNQ0Gw9iTXspo6PUsxz3BOd6qkL0=";
+    };
+  };

  nativeBuildInputs = [
    pkg-config
--- a/pkgs/development/libraries/libguestfs/default.nix
+++ b/pkgs/development/libraries/libguestfs/default.nix
@ -1,168 +0,0 @@
-{ lib
-, stdenv
-, fetchurl
-, pkg-config
-, autoreconfHook
-, makeWrapper
-, libxcrypt
-, ncurses
-, cpio
-, gperf
-, cdrkit
-, flex
-, bison
-, qemu
-, pcre2
-, augeas
-, libxml2
-, acl
-, libcap
-, libcap_ng
-, libconfig
-, systemd
-, fuse
-, yajl
-, libvirt
-, hivex
-, db
-, gmp
-, readline
-, file
-, numactl
-, libapparmor
-, jansson
-, getopt
-, perlPackages
-, ocamlPackages
-, libtirpc
-, appliance ? null
-, javaSupport ? false
-, jdk
-, zstd
-}:
-
-assert appliance == null || lib.isDerivation appliance;
-
-stdenv.mkDerivation rec {
-  pname = "libguestfs";
-  version = "1.50.1";
-
-  src = fetchurl {
-    url = "https://libguestfs.org/download/${lib.versions.majorMinor version}-stable/${pname}-${version}.tar.gz";
-    sha256 = "sha256-Xmhx6I+C5SHjHUQt5qELZJcCN8t5VumdEXsSO1hWWm8=";
-  };
-
-  strictDeps = true;
-  nativeBuildInputs = [
-    autoreconfHook
-    bison
-    cdrkit
-    cpio
-    flex
-    getopt
-    gperf
-    makeWrapper
-    pkg-config
-    qemu
-    zstd
-  ] ++ (with perlPackages; [ perl libintl-perl GetoptLong ModuleBuild ])
-  ++ (with ocamlPackages; [ ocaml findlib ]);
-  buildInputs = [
-    libxcrypt
-    ncurses
-    jansson
-    pcre2
-    augeas
-    libxml2
-    acl
-    libcap
-    libcap_ng
-    libconfig
-    systemd
-    fuse
-    yajl
-    libvirt
-    gmp
-    readline
-    file
-    hivex
-    db
-    numactl
-    libapparmor
-    perlPackages.ModuleBuild
-    libtirpc
-  ] ++ (with ocamlPackages; [ ocamlbuild ocaml_libvirt gettext-stub ounit ])
-  ++ lib.optional javaSupport jdk;
-
-  prePatch = ''
-    # build-time scripts
-    substituteInPlace run.in        --replace '#!/bin/bash' '#!${stdenv.shell}'
-    substituteInPlace ocaml-link.sh.in --replace '#!/bin/bash' '#!${stdenv.shell}'
-
-    # $(OCAMLLIB) is read-only "${ocamlPackages.ocaml}/lib/ocaml"
-    substituteInPlace ocaml/Makefile.am            --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml'
-    substituteInPlace ocaml/Makefile.in            --replace '$(DESTDIR)$(OCAMLLIB)' '$(out)/lib/ocaml'
-
-    # some scripts hardcore /usr/bin/env which is not available in the build env
-    patchShebangs .
-  '';
-  configureFlags = [
-    "--disable-appliance"
-    "--disable-daemon"
-    "--with-distro=NixOS"
-    "--with-guestfs-path=${placeholder "out"}/lib/guestfs"
-  ] ++ lib.optionals (!javaSupport) [ "--without-java" ];
-  patches = [
-    ./libguestfs-syms.patch
-  ];
-
-  createFindlibDestdir = true;
-
-  installFlags = [ "REALLY_INSTALL=yes" ];
-  enableParallelBuilding = true;
-
-  postInstall = ''
-    mv "$out/lib/ocaml/guestfs" "$OCAMLFIND_DESTDIR/guestfs"
-    for bin in $out/bin/*; do
-      wrapProgram "$bin" \
-        --prefix PATH     : "$out/bin:${hivex}/bin:${qemu}/bin" \
-        --prefix PERL5LIB : "$out/${perlPackages.perl.libPrefix}"
-    done
-  '';
-
-  postFixup = lib.optionalString (appliance != null) ''
-    mkdir -p $out/{lib,lib64}
-    ln -s ${appliance} $out/lib64/guestfs
-    ln -s ${appliance} $out/lib/guestfs
-  '';
-
-  doInstallCheck = appliance != null;
-  installCheckPhase = ''
-    runHook preInstallCheck
-
-    export HOME=$(mktemp -d) # avoid access to /homeless-shelter/.guestfish
-
-    ${qemu}/bin/qemu-img create -f qcow2 disk1.img 10G
-
-    $out/bin/guestfish <<'EOF'
-    add-drive disk1.img
-    run
-    list-filesystems
-    part-disk /dev/sda mbr
-    mkfs ext2 /dev/sda1
-    list-filesystems
-    EOF
-
-    runHook postInstallCheck
-  '';
-
-  meta = with lib; {
-    description = "Tools for accessing and modifying virtual machine disk images";
-    license = with licenses; [ gpl2Plus lgpl21Plus ];
-    homepage = "https://libguestfs.org/";
-    maintainers = with maintainers; [ offline ];
-    platforms = platforms.linux;
-    # this is to avoid "output size exceeded"
-    hydraPlatforms = if appliance != null then appliance.meta.hydraPlatforms else platforms.linux;
-  };
-}
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@ -151,4 +151,9 @@ in {
      })
    ];
  };
+
+  libressl_4_0 = generic {
+    version = "4.0.0";
+    hash = "sha256-TYQZVfCsw9/HHQ49018oOvRhIiNQ4mhD/qlzHAJGoeQ=";
+  };
 }
--- a/pkgs/development/python-modules/afdko/default.nix
+++ b/pkgs/development/python-modules/afdko/default.nix
@ -1,52 +1,47 @@
 {
  lib,
  stdenv,
-  buildPythonPackage,
-  fetchFromGitHub,
-  pythonOlder,
-  fonttools,
-  defcon,
-  lxml,
-  fs,
-  unicodedata2,
-  zopfli,
-  brotlipy,
-  fontpens,
-  brotli,
-  fontmath,
-  mutatormath,
-  booleanoperations,
-  ufoprocessor,
-  ufonormalizer,
-  tqdm,
-  setuptools-scm,
-  scikit-build,
-  cmake,
-  ninja,
-  antlr4_9,
-  libxml2,
-  pytestCheckHook,
  # Enables some expensive tests, useful for verifying an update
-  runAllTests ? false,
  afdko,
+  antlr4_9,
+  booleanoperations,
+  buildPythonPackage,
+  cmake,
+  defcon,
+  fetchFromGitHub,
+  fontmath,
+  fontpens,
+  fonttools,
+  libxml2,
+  mutatormath,
+  ninja,
+  pytestCheckHook,
+  pythonOlder,
+  runAllTests ? false,
+  scikit-build,
+  setuptools-scm,
+  tqdm,
+  ufonormalizer,
+  ufoprocessor,
 }:

 buildPythonPackage rec {
  pname = "afdko";
  version = "4.0.1";
-  format = "pyproject";
+  pyproject = true;

-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";

  src = fetchFromGitHub {
    owner = "adobe-type-tools";
-    repo = pname;
+    repo = "afdko";
    rev = "refs/tags/${version}";
    hash = "sha256-I5GKPkbyQX8QNSZgNB3wPKdWwpx8Xkklesu1M7nhgp8=";
  };

+  build-system = [ setuptools-scm ];
+
  nativeBuildInputs = [
-    setuptools-scm
    scikit-build
    cmake
    ninja
@ -78,23 +73,23 @@ buildPythonPackage rec {
  # setup.py will always (re-)execute cmake in buildPhase
  dontConfigure = true;

-  propagatedBuildInputs = [
-    booleanoperations
-    fonttools
-    lxml # fonttools[lxml], defcon[lxml] extra
-    fs # fonttools[ufo] extra
-    unicodedata2 # fonttools[unicode] extra
-    brotlipy # fonttools[woff] extra
-    zopfli # fonttools[woff] extra
-    fontpens
-    brotli
-    defcon
-    fontmath
-    mutatormath
-    ufoprocessor
-    ufonormalizer
-    tqdm
-  ];
+  dependencies =
+    [
+      booleanoperations
+      defcon
+      fontmath
+      fontpens
+      fonttools
+      mutatormath
+      tqdm
+      ufonormalizer
+      ufoprocessor
+    ]
+    ++ defcon.optional-dependencies.lxml
+    ++ fonttools.optional-dependencies.lxml
+    ++ fonttools.optional-dependencies.ufo
+    ++ fonttools.optional-dependencies.unicode
+    ++ fonttools.optional-dependencies.woff;

  # Use system libxml2
  FORCE_SYSTEM_LIBXML2 = true;
@ -116,7 +111,7 @@ buildPythonPackage rec {
      "test_waterfallplot"
    ]
    ++ lib.optionals (stdenv.cc.isGNU) [
-      # broke in the gcc 13 → 14 update
+      # broke in the gcc 13 -> 14 update
      "test_dump"
      "test_input_formats"
      "test_other_input_formats"
@ -146,10 +141,10 @@ buildPythonPackage rec {
  };

  meta = with lib; {
-    changelog = "https://github.com/adobe-type-tools/afdko/blob/${version}/NEWS.md";
    description = "Adobe Font Development Kit for OpenType";
+    changelog = "https://github.com/adobe-type-tools/afdko/blob/${version}/NEWS.md";
    homepage = "https://adobe-type-tools.github.io/afdko";
    license = licenses.asl20;
-    maintainers = [ maintainers.sternenseemann ];
+    maintainers = with maintainers; [ sternenseemann ];
  };
 }
--- a/pkgs/development/python-modules/axisregistry/default.nix
+++ b/pkgs/development/python-modules/axisregistry/default.nix
@ -5,8 +5,8 @@
  fonttools,
  protobuf,
  pytestCheckHook,
-  setuptools-scm,
  pythonOlder,
+  setuptools-scm,
 }:

 buildPythonPackage rec {
@ -27,6 +27,8 @@ buildPythonPackage rec {
  # in the closure of fontbakery. It seems to be compatible enough.
  pythonRelaxDeps = [ "protobuf" ];

+  env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
+
  build-system = [ setuptools-scm ];

  dependencies = [
--- a/pkgs/development/python-modules/brotlipy/default.nix
+++ b/pkgs/development/python-modules/brotlipy/default.nix
@ -1,47 +1,51 @@
 {
  lib,
  buildPythonPackage,
-  fetchPypi,
  cffi,
-  enum34,
  construct,
-  pytest,
+  fetchPypi,
  hypothesis,
+  pytest,
+  pytestCheckHook,
+  pythonOlder,
+  setuptools,
 }:

 buildPythonPackage rec {
  pname = "brotlipy";
  version = "0.7.0";
-  format = "setuptools";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "36def0b859beaf21910157b4c33eb3b06d8ce459c942102f16988cca6ea164df";
+    hash = "sha256-Nt7wuFm+ryGRAVe0wz6zsG2M5FnJQhAvFpiMym6hZN8=";
  };

-  propagatedBuildInputs = [
-    cffi
-    enum34
-    construct
-  ];
+  build-system = [ setuptools ];

  propagatedNativeBuildInputs = [ cffi ];

-  nativeCheckInputs = [
-    pytest
-    hypothesis
+  dependencies = [
+    cffi
+    construct
  ];

-  checkPhase = ''
-    py.test
-  '';
+  nativeCheckInputs = [
+    hypothesis
+    pytestCheckHook
+  ];

  # Missing test files
  doCheck = false;

+  pythonImportsCheck = [ "brotli" ];
+
  meta = {
    description = "Python bindings for the reference Brotli encoder/decoder";
    homepage = "https://github.com/python-hyper/brotlipy/";
    license = lib.licenses.mit;
+    maintainers = [ ];
  };
 }
--- a/pkgs/development/python-modules/clikit/default.nix
+++ b/pkgs/development/python-modules/clikit/default.nix
@ -1,57 +1,39 @@
 {
  lib,
  buildPythonPackage,
-  fetchFromGitHub,
-  isPy27,
-  pythonAtLeast,
-  poetry-core,
-
-  # propagates
-  pylev,
-  pastel,
-
-  # python36+
  crashtest,
-
-  # python2
-  typing,
-  enum34,
-
-  # tests
+  fetchFromGitHub,
+  pastel,
+  poetry-core,
+  pylev,
  pytest-mock,
  pytestCheckHook,
+  pythonOlder,
 }:

 buildPythonPackage rec {
  pname = "clikit";
  version = "0.6.2";
-  format = "pyproject";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
    owner = "sdispater";
-    repo = pname;
+    repo = "clikit";
    rev = "refs/tags/${version}";
    hash = "sha256-xAsUNhVQBjtSFHyjjnicAKRC3+Tdn3AdGDUYhmOOIdA=";
  };

-  postPatch = ''
-    substituteInPlace pyproject.toml --replace \
-      'crashtest = { version = "^0.3.0", python = "^3.6" }' \
-      'crashtest = { version = "*", python = "^3.6" }'
-  '';
+  pythonRelaxDeps = [ "crashtest" ];

-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];

-  propagatedBuildInputs =
-    [
-      pylev
-      pastel
-    ]
-    ++ lib.optionals (pythonAtLeast "3.6") [ crashtest ]
-    ++ lib.optionals isPy27 [
-      typing
-      enum34
-    ];
+  dependencies = [
+    crashtest
+    pastel
+    pylev
+  ];

  nativeCheckInputs = [
    pytest-mock
@ -61,8 +43,9 @@ buildPythonPackage rec {
  pythonImportsCheck = [ "clikit" ];

  meta = with lib; {
-    homepage = "https://github.com/sdispater/clikit";
    description = "Group of utilities to build beautiful and testable command line interfaces";
+    homepage = "https://github.com/sdispater/clikit";
+    changelog = "https://github.com/sdispater/clikit/blob/${version}/CHANGELOG.md";
    license = licenses.mit;
    maintainers = with maintainers; [ jakewaksbaum ];
  };
--- a/pkgs/development/python-modules/diffenator2/default.nix
+++ b/pkgs/development/python-modules/diffenator2/default.nix
@ -37,9 +37,12 @@ buildPythonPackage rec {
    hash = "sha256-FVdQW2iupAxHFmx6sC88yO2Vx3VvBhPJl55gA0fmvgo=";
  };

-  nativeBuildInputs = [ pythonRelaxDepsHook ];
+  env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";

-  pythonRelaxDeps = [ "protobuf" ];
+  pythonRelaxDeps = [
+    "protobuf"
+    "python-bidi"
+  ];

  build-system = [
    poetry-core
--- a/pkgs/development/python-modules/dragonfly/default.nix
+++ b/pkgs/development/python-modules/dragonfly/default.nix
@ -1,69 +1,76 @@
 {
  lib,
  buildPythonPackage,
-  fetchFromGitHub,
  decorator,
-  packaging,
-  pynput,
-  regex,
-  lark,
-  enum34,
-  pyperclip,
-  six,
-  requests,
-  psutil,
+  fetchFromGitHub,
  json-rpc,
-  werkzeug,
  kaldi-active-grammar,
+  lark,
+  packaging,
+  psutil,
+  pynput,
+  pyperclip,
+  pythonOlder,
+  regex,
+  requests,
+  setuptools,
+  six,
  sounddevice,
  webrtcvad,
-  setuptools,
-  xdotool,
+  werkzeug,
  wmctrl,
+  xdotool,
  xorg,
 }:

 buildPythonPackage rec {
  pname = "dragonfly";
  version = "0.35.0";
-  format = "setuptools";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
    owner = "dictation-toolbox";
-    repo = pname;
-    rev = version;
+    repo = "dragonfly";
+    rev = "refs/tags/${version}";
    hash = "sha256-sqEEEr5/KG3cn4rmOGJt9zMNAjeLO6h3NJgg0EyewrM=";
  };

  postPatch = ''
-    substituteInPlace setup.py --replace 'lark-parser == 0.8.*' 'lark'
    substituteInPlace dragonfly/actions/keyboard/_x11_xdotool.py \
-      --replace 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"'
+      --replace-fail 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"'
    substituteInPlace dragonfly/windows/x11_window.py \
-      --replace 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"' \
-      --replace 'xprop = "xprop"'${" "}'xprop = "${xorg.xprop}/bin/xprop"' \
-      --replace 'wmctrl = "wmctrl"'${" "}'wmctrl = "${wmctrl}/bin/wmctrl"'
+      --replace-fail 'xdotool = "xdotool"'${" "}'xdotool = "${xdotool}/bin/xdotool"' \
+      --replace-fail 'xprop = "xprop"'${" "}'xprop = "${xorg.xprop}/bin/xprop"' \
+      --replace-fail 'wmctrl = "wmctrl"'${" "}'wmctrl = "${wmctrl}/bin/wmctrl"'
  '';

+  pythonRemoveDeps = [ "lark-parser" ];
+
  propagatedBuildInputs = [
    decorator
-    packaging
-    pynput
-    regex
-    lark
-    enum34
-    pyperclip
-    six
-    requests
-    psutil
    json-rpc
-    werkzeug
-    kaldi-active-grammar # for the Kaldi engine
-    sounddevice
-    webrtcvad
+    lark
+    packaging
+    psutil
+    pynput
+    pyperclip
+    regex
+    requests
    setuptools # needs pkg_resources at runtime
+    six
+    werkzeug
  ];

+  optional-dependencies = {
+    kaldi = [
+      kaldi-active-grammar
+      sounddevice
+      webrtcvad
+    ];
+  };
+
  # Too many tests fail because of the unusual environment or
  # because of the missing dependencies for some of the engines.
  doCheck = false;
@ -73,6 +80,7 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Speech recognition framework allowing powerful Python-based scripting";
    homepage = "https://github.com/dictation-toolbox/dragonfly";
+    changelog = "https://github.com/dictation-toolbox/dragonfly/blob/${version}/CHANGELOG.rst";
    license = licenses.lgpl3Plus;
    maintainers = [ ];
  };
--- a/pkgs/development/python-modules/fontbakery/default.nix
+++ b/pkgs/development/python-modules/fontbakery/default.nix
@ -57,6 +57,8 @@ buildPythonPackage rec {
    hash = "sha256-+9O7cAE6CUATvybG22qULNNHi94zSGqU9UjhvrF9R8k=";
  };

+  env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
+
  pythonRelaxDeps = [
    "collidoscope"
    "protobuf"
@ -127,7 +129,7 @@ buildPythonPackage rec {
  '';

  disabledTests = [
-    # These require network access:
+    # These require network access
    "test_check_description_broken_links"
    "test_check_description_family_update"
    "test_check_metadata_designer_profiles"
@ -138,6 +140,8 @@ buildPythonPackage rec {
    "test_check_cjk_vertical_metrics"
    "test_check_cjk_vertical_metrics_regressions"
    "test_check_fontbakery_version_live_apis"
+    # AssertionError
+    "test_check_shape_languages"
  ];

  postInstall = ''
--- a/pkgs/development/python-modules/gflanguages/default.nix
+++ b/pkgs/development/python-modules/gflanguages/default.nix
@ -14,29 +14,33 @@

 buildPythonPackage rec {
  pname = "gflanguages";
-  version = "0.6.4";
+  version = "0.6.5";
+  pyproject = true;

  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-a+BSR2dMC/EVvpQa9AG+c+9IpMeXYTOKBr8r8nBZrGY=";
+    hash = "sha256-wMhRVWdjKiEfzswnAWqKfzHrpJj0U4q8tzDBGshNryo=";
  };

-  pyproject = true;
-
  # Relax the dependency on protobuf 3. Other packages in the Google Fonts
  # ecosystem have begun upgrading from protobuf 3 to protobuf 4,
  # so we need to use protobuf 4 here as well to avoid a conflict
  # in the closure of fontbakery. It seems to be compatible enough.
  pythonRelaxDeps = [ "protobuf" ];

+  env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
+
  build-system = [
    setuptools
    setuptools-scm
  ];

-  dependencies = [ protobuf ];
+  dependencies = [
+    protobuf
+    regex
+  ];

  nativeCheckInputs = [
    pytestCheckHook
@ -45,6 +49,14 @@ buildPythonPackage rec {
    youseedee
  ];

+  pythonImportsCheck = [ "gflanguages" ];
+
+  disabledTests = [
+    # AssertionError
+    "test_exemplars_are_in_script"
+    "test_sample_texts_are_in_script"
+  ];
+
  meta = with lib; {
    description = "Python library for Google Fonts language metadata";
    homepage = "https://github.com/googlefonts/lang";
--- a/pkgs/development/python-modules/gftools/default.nix
+++ b/pkgs/development/python-modules/gftools/default.nix
@ -114,6 +114,8 @@ buildPythonPackage rec {
      --replace-fail "'gftools" "'${placeholder "out"}t/bin/gftools"
  '';

+  env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
+
  pythonRelaxDeps = [
    "protobuf"
    "pygit2"
--- a/pkgs/development/python-modules/gin-config/default.nix
+++ b/pkgs/development/python-modules/gin-config/default.nix
@ -2,31 +2,39 @@
  lib,
  buildPythonPackage,
  fetchPypi,
-  six,
-  enum34,
+  pythonOlder,
+  setuptools,
+  tensorflow,
+  torch,
 }:

 buildPythonPackage rec {
  pname = "gin-config";
  version = "0.5.0";
-  format = "setuptools";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";

  src = fetchPypi {
    inherit pname version;
-    sha256 = "0c6ea5026ded927c8c93c990b01c695257c1df446e45e549a158cfbc79e19ed6";
+    hash = "sha256-DG6lAm3tknyMk8mQsBxpUlfB30RuReVJoVjPvHnhntY=";
  };

-  propagatedBuildInputs = [
-    six
-    enum34
-  ];
+  build-system = [ setuptools ];
+
+  optional-dependencies = {
+    tensorflow = [ tensorflow ];
+    torch = [ torch ];
+  };

  # PyPI archive does not ship with tests
  doCheck = false;

+  pythonImportsCheck = [ "gin" ];
+
  meta = with lib; {
-    homepage = "https://github.com/google/gin-config";
    description = "Gin provides a lightweight configuration framework for Python, based on dependency injection";
+    homepage = "https://github.com/google/gin-config";
    license = licenses.asl20;
    maintainers = with maintainers; [ jethro ];
  };
--- a/pkgs/development/python-modules/glyphsets/default.nix
+++ b/pkgs/development/python-modules/glyphsets/default.nix
@ -1,16 +1,17 @@
 {
  lib,
  buildPythonPackage,
-  fetchPypi,
  defcon,
+  fetchPypi,
  fonttools,
  gflanguages,
  glyphslib,
  pytestCheckHook,
+  pythonOlder,
  pyyaml,
  requests,
-  setuptools,
  setuptools-scm,
+  setuptools,
  unicodedata2,
 }:

@ -19,11 +20,15 @@ buildPythonPackage rec {
  version = "1.0.0";
  pyproject = true;

+  disabled = pythonOlder "3.8";
+
  src = fetchPypi {
    inherit pname version;
    hash = "sha256-fa+W1IGIZcn1P1xNKm1Yb/TOuf4QdDVnIvlDkOLOcLY=";
  };

+  env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
+
  postPatch = ''
    substituteInPlace setup.py \
      --replace-fail "setuptools_scm>=8.0.4,<8.1" "setuptools_scm"
@ -53,13 +58,16 @@ buildPythonPackage rec {
  disabledTests = [
    # This "test" just tries to connect to PyPI and look for newer releases. Not needed.
    "test_dependencies"
+    # AssertionError
+    "test_definitions"
  ];

  meta = with lib; {
    description = "Google Fonts glyph set metadata";
-    mainProgram = "glyphsets";
    homepage = "https://github.com/googlefonts/glyphsets";
+    changelog = "https://github.com/googlefonts/glyphsets/blob/v${version}/CHANGELOG.md";
    license = licenses.asl20;
    maintainers = with maintainers; [ danc86 ];
+    mainProgram = "glyphsets";
  };
 }
--- a/pkgs/development/python-modules/libsoundtouch/default.nix
+++ b/pkgs/development/python-modules/libsoundtouch/default.nix
@ -2,28 +2,37 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
-  enum-compat,
  requests,
  websocket-client,
  zeroconf,
  pytestCheckHook,
+  setuptools,
+  pythonOlder,
 }:

 buildPythonPackage rec {
  pname = "libsoundtouch";
  version = "0.8.0";
-  format = "setuptools";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
    owner = "CharlesBlonde";
    repo = "libsoundtouch";
-    rev = version;
-    sha256 = "1wl2w5xfdkrv0qzsz084z2k6sycfyq62mqqgciycha3dywf2fvva";
+    rev = "refs/tags/${version}";
+    hash = "sha256-am8nHPdtKMh8ZA/jKgz2jnltpvgEga8/BjvP5nrhgvI=";
  };

-  propagatedBuildInputs = [
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail "'enum-compat>=0.0.2'," ""
+  '';
+
+  build-system = [ setuptools ];
+
+  dependencies = [
    requests
-    enum-compat
    websocket-client
    zeroconf
  ];
@ -36,9 +45,12 @@ buildPythonPackage rec {
    "test_snapshot_restore"
  ];

+  pythonImportsCheck = [ "libsoundtouch" ];
+
  meta = with lib; {
    description = "Bose Soundtouch Python library";
    homepage = "https://github.com/CharlesBlonde/libsoundtouch";
    license = licenses.asl20;
+    maintainers = [ ];
  };
 }
--- a/pkgs/development/python-modules/pure-protobuf/default.nix
+++ b/pkgs/development/python-modules/pure-protobuf/default.nix
@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "pure-protobuf";
-  version = "3.1.2";
+  version = "3.1.3";

  format = "pyproject";
  # < 3.10 requires get-annotations which isn't packaged yet
@ -24,7 +24,7 @@ buildPythonPackage rec {
    owner = "eigenein";
    repo = "protobuf";
    rev = "refs/tags/${version}";
-    hash = "sha256-up/01Q2IdaW41Ple+nCRpWjYnl/IAlOppdGcg4djRZY=";
+    hash = "sha256-AsiJDi3SF3nlWKFvZujUsoHY8AJ21JKzEuTdR9FtFQI=";
  };

  build-system = [
--- a/pkgs/development/python-modules/pyopencl/default.nix
+++ b/pkgs/development/python-modules/pyopencl/default.nix
@ -31,7 +31,7 @@ let
 in
 buildPythonPackage rec {
  pname = "pyopencl";
-  version = "2024.2.7";
+  version = "2024.3";
  pyproject = true;

  src = fetchFromGitHub {
@ -39,7 +39,7 @@ buildPythonPackage rec {
    repo = "pyopencl";
    rev = "refs/tags/v${version}";
    fetchSubmodules = true;
-    hash = "sha256-VeaEDYnGfMYf9/WqMIZ9g4KounD48eWF3Romt79RMEQ=";
+    hash = "sha256-HE7dARgKnZxqjAXX4iI1ml0N2BalyTo+ZAzjC2ThEN8=";
  };

  build-system = [
--- a/pkgs/development/python-modules/ring-doorbell/default.nix
+++ b/pkgs/development/python-modules/ring-doorbell/default.nix
@ -23,7 +23,7 @@

 buildPythonPackage rec {
  pname = "ring-doorbell";
-  version = "0.9.6";
+  version = "0.9.8";
  pyproject = true;

  disabled = pythonOlder "3.9";
@ -31,7 +31,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "ring_doorbell";
    inherit version;
-    hash = "sha256-pSHsQ2bJ0zNk6eJfDERVFqZM/IWorL8HFFjnwnhaHhY=";
+    hash = "sha256-3OSD+L6+mZkkm0OU09hAFyEAxJZ3YA1+lRm2DjQ7Dl0=";
  };

  pythonRelaxDeps = [ "requests-oauthlib" ];
--- a/pkgs/development/python-modules/shaperglot/default.nix
+++ b/pkgs/development/python-modules/shaperglot/default.nix
@ -6,9 +6,10 @@
  num2words,
  protobuf,
  pytestCheckHook,
+  pythonOlder,
  pyyaml,
-  setuptools,
  setuptools-scm,
+  setuptools,
  strictyaml,
  termcolor,
  ufo2ft,
@ -18,17 +19,29 @@

 buildPythonPackage rec {
  pname = "shaperglot";
-  version = "0.6.3";
+  version = "0.6.4";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";

-  # PyPI source tarballs omit tests, fetch from Github instead
  src = fetchFromGitHub {
    owner = "googlefonts";
    repo = "shaperglot";
    rev = "refs/tags/v${version}";
-    hash = "sha256-XoWlTE7PXtVh7VT7p3jY2ppU2tLwzYBQQBTP5Ocg4Qc=";
+    hash = "sha256-O6z7TJpC54QkqX5/G1HKSvaDYty7B9BnCQ4FpsLsEMs=";
  };

-  pyproject = true;
+  env.PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION = "python";
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools>=75.0.0" "setuptools"
+  '';
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];

  dependencies = [
    gflanguages
@ -41,19 +54,17 @@ buildPythonPackage rec {
    vharfbuzz
    youseedee
  ];
-  build-system = [
-    setuptools
-    setuptools-scm
-  ];

-  doCheck = true;
  nativeCheckInputs = [ pytestCheckHook ];

+  pythonImportsCheck = [ "shaperglot" ];
+
  meta = with lib; {
    description = "Tool to test OpenType fonts for language support";
-    mainProgram = "shaperglot";
    homepage = "https://github.com/googlefonts/shaperglot";
+    changelog = "https://github.com/googlefonts/shaperglot/releases/tag/v${version}";
    license = licenses.asl20;
    maintainers = with maintainers; [ danc86 ];
+    mainProgram = "shaperglot";
  };
 }
--- a/pkgs/development/tools/open-policy-agent/default.nix
+++ b/pkgs/development/tools/open-policy-agent/default.nix
@ -2,7 +2,6 @@
 , stdenv
 , buildGoModule
 , fetchFromGitHub
-, fetchpatch
 , installShellFiles

 , enableWasmEval ? false
@ -12,24 +11,15 @@ assert enableWasmEval && stdenv.hostPlatform.isDarwin -> builtins.throw "buildin

 buildGoModule rec {
  pname = "open-policy-agent";
-  version = "0.66.0";
+  version = "0.69.0";

  src = fetchFromGitHub {
    owner = "open-policy-agent";
    repo = "opa";
    rev = "v${version}";
-    hash = "sha256-fx7k6KvL0uy2NXLDLpCnN1ux9MGEO1CbX6TdLweVzag=";
+    hash = "sha256-AEh6HBDLQYptBw68SQurPuWADxL5x5OirtJGQ+UKXdU=";
  };

-  patches = [
-    # fix tests in 1.22.5
-    # https://github.com/open-policy-agent/opa/pull/6845
-    (fetchpatch {
-      url = "https://github.com/open-policy-agent/opa/commit/956358516c23b1f33f6667961e20aca65b91355b.patch";
-      hash = "sha256-1nfMwJwbYfdLg9j4ppP1IWdDeFq6vhXcDKr6uprP53U=";
-    })
-  ];
-
  vendorHash = null;

  nativeBuildInputs = [ installShellFiles ];
--- a/pkgs/games/corsix-th/default.nix
+++ b/pkgs/games/corsix-th/default.nix
@ -2,6 +2,7 @@
 , lib
 , fetchFromGitHub
 , cmake
+, curl
 , doxygen
 , ffmpeg
 , freetype
@ -14,19 +15,21 @@
 , libiconv
 , Cocoa
 , CoreVideo
+, CoreMedia
+, VideoToolbox
 # Update
 , nix-update-script
 }:

 stdenv.mkDerivation(finalAttrs: {
  pname = "corsix-th";
-  version = "0.67";
+  version = "0.68.0";

  src = fetchFromGitHub {
    owner = "CorsixTH";
    repo = "CorsixTH";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-WA/VJqHXzBfVUBNtxCVsGBRzSRQ0pvDvAy03ntc0KZE=";
+    hash = "sha256-D8ks+fiFJxwClqW1aNtGGa5UxAFvuH2f2guwPxOEQwI=";
  };

  patches = [
@ -38,6 +41,7 @@ stdenv.mkDerivation(finalAttrs: {
  buildInputs = let
    luaEnv = lua.withPackages(p: with p; [ luafilesystem lpeg luasec luasocket ]);
  in [
+    curl
    ffmpeg
    freetype
    lua
@ -49,6 +53,8 @@ stdenv.mkDerivation(finalAttrs: {
    libiconv
    Cocoa
    CoreVideo
+    CoreMedia
+    VideoToolbox
  ];

  cmakeFlags = [ "-Wno-dev" ];
--- a/pkgs/os-specific/linux/libtraceevent/default.nix
+++ b/pkgs/os-specific/linux/libtraceevent/default.nix
@ -2,12 +2,12 @@

 stdenv.mkDerivation rec {
  pname = "libtraceevent";
-  version = "1.8.3";
+  version = "1.8.4";

  src = fetchgit {
    url = "https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git";
    rev = "libtraceevent-${version}";
-    hash = "sha256-yftCaZ3mEPOreENd9Q/te/WqM7etokO+D8RZbB1epSA=";
+    hash = "sha256-T4NxYVJKl+2YZ6JZ7PvtM4RdTg9DIE+su4KxJwvw7iI=";
  };

  postPatch = ''
--- a/pkgs/os-specific/linux/paxctl/default.nix
+++ b/pkgs/os-specific/linux/paxctl/default.nix
@ -22,8 +22,6 @@ stdenv.mkDerivation rec {
    "MANDIR=share/man/man1"
  ];

-  setupHook = ./setup-hook.sh;
-
  meta = with lib; {
    description = "Tool for controlling PaX flags on a per binary basis";
    mainProgram = "paxctl";
--- a/pkgs/os-specific/linux/paxctl/setup-hook.sh
+++ b/pkgs/os-specific/linux/paxctl/setup-hook.sh
@ -1,8 +0,0 @@
-# PaX-mark binaries.
-paxmark() {
-    local flags="$1"
-    shift
-
-    paxctl -c "$@"
-    paxctl -zex -${flags} "$@"
-}
--- a/pkgs/servers/teleport/14/Cargo.lock
+++ b/pkgs/servers/teleport/14/Cargo.lock
--- a/pkgs/servers/teleport/14/default.nix
+++ b/pkgs/servers/teleport/14/default.nix
@ -1,13 +0,0 @@
-args:
-import ../generic.nix (args // {
-  version = "14.3.20";
-  hash = "sha256-oGN3t0xt7z3+U7wlhnJu4B8cSSMwONdiHZkv8UY7lkA=";
-  vendorHash = "sha256-RMTHWrbwKCGlxi9SP+8ccGk8YYqwhC8yWLPDf2Ha5bE=";
-  yarnHash = "sha256-c5ItZpq9Wp+kE9gw2WQdm5gTvBKA9I+nHAX/pT4Hqhs=";
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "rdp-rs-0.1.0" = "sha256-U52FVuqo2DH/7f0cQ1qcb1GbFZ97yxExVFMX5cs0zw4=";
-    };
-  };
-})
--- a/pkgs/servers/teleport/default.nix
+++ b/pkgs/servers/teleport/default.nix
@ -1,7 +1,6 @@
 { callPackages, lib, ... }@args:
 let
  f = args: rec {
-    teleport_14 = import ./14 args;
    teleport_15 = import ./15 args;
    teleport_16 = import ./16 args;
    teleport = teleport_16;
--- a/pkgs/tools/admin/mycli/default.nix
+++ b/pkgs/tools/admin/mycli/default.nix
@ -38,6 +38,9 @@ buildPythonApplication rec {
    export LC_ALL="en_US.UTF-8"
  '';

+  # fails at checkphase due to the below test paths
+  # disabling it specifically does not work, so we disable checking altogether
+  doCheck = false;
  disabledTestPaths = [
    "mycli/packages/paramiko_stub/__init__.py"
  ];
--- a/pkgs/tools/misc/ncdu/default.nix
+++ b/pkgs/tools/misc/ncdu/default.nix
@ -2,7 +2,9 @@
 , stdenv
 , fetchurl
 , ncurses
+, pkg-config
 , zig
+, zstd
 , installShellFiles
 , testers
 , pie ? stdenv.hostPlatform.isDarwin
@ -10,20 +12,22 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "ncdu";
-  version = "2.5";
+  version = "2.6";

  src = fetchurl {
    url = "https://dev.yorhel.nl/download/ncdu-${finalAttrs.version}.tar.gz";
-    hash = "sha256-f0neJQJKurGvH/IrO4VCwNFY4Bj+DpYHT9lLDh5tMaU=";
+    hash = "sha256-P0cevTi1bmDauAwn468dgmZmlX8C2ehBmxSdqvet5QU=";
  };

  nativeBuildInputs = [
    zig.hook
    installShellFiles
+    pkg-config
  ];

  buildInputs = [
    ncurses
+    zstd
  ];

  zigBuildFlags = lib.optional pie "-Dpie=true";
--- a/pkgs/tools/package-management/lix/default.nix
+++ b/pkgs/tools/package-management/lix/default.nix
@ -63,26 +63,9 @@ lib.makeExtensible (self: {

  lix_2_91 = (
    common {
-      version = "2.91.0";
-      hash = "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=";
-      docCargoHash = "sha256-KOn1fXF7k7c/0e5ZCNZwt3YZmjL1oi5A2mhwxQWKaUo=";
-
-      patches = [
-        # Fix meson to not use target_machine, fixing cross. This commit is in release-2.91: remove when updating to 2.91.1 (if any).
-        # https://gerrit.lix.systems/c/lix/+/1781
-        # https://git.lix.systems/lix-project/lix/commit/ca2b514e20de12b75088b06b8e0e316482516401
-        (fetchpatch {
-          url = "https://git.lix.systems/lix-project/lix/commit/ca2b514e20de12b75088b06b8e0e316482516401.patch";
-          hash = "sha256-TZauU4RIsn07xv9vZ33amrDvCLMbrtcHs1ozOTLgu98=";
-        })
-        # Fix musl builds. This commit is in release-2.91: remove when updating to 2.91.1 (if any).
-        # https://gerrit.lix.systems/c/lix/+/1823
-        # https://git.lix.systems/lix-project/lix/commit/ed51a172c69996fc6f3b7dfaa86015bff50c8ba8
-        (fetchpatch {
-          url = "https://git.lix.systems/lix-project/lix/commit/ed51a172c69996fc6f3b7dfaa86015bff50c8ba8.patch";
-          hash = "sha256-X59N+tOQ2GN17p9sXvo9OiuEexzB23ieuOvtq2sre5c=";
-        })
-      ];
+      version = "2.91.1";
+      hash = "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=";
+      docCargoHash = "sha256-F6Ld0HfRvW9r5zn8eMTP6djnV/jvwjYQet4Ghp2T90k=";
    }
  );

--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@ -813,6 +813,7 @@ mapAliases {
  kibana = kibana7;
  kicad-with-packages3d = throw "'kicad-with-packages3d' has been renamed to/replaced by 'kicad'"; # Converted to throw 2023-09-10
  kio-admin = libsForQt5.kdeGear.kio-admin; # Added 2023-03-18
+  kiwitalk = throw "KiwiTalk has been removed because the upstream has been deprecated at the request of Kakao and it's now obsolete."; # Added 2024-10-10
  kodiGBM = kodi-gbm;
  kodiPlain = kodi;
  kodiPlainWayland = kodi-wayland;
@ -1598,6 +1599,7 @@ mapAliases {
  teleport_11 = throw "teleport 11 has been removed as it is EOL. Please upgrade to Teleport 12 or later"; # Added 2023-11-27
  teleport_12 = throw "teleport 12 has been removed as it is EOL. Please upgrade to Teleport 13 or later"; # Added 2024-02-04
  teleport_13 = throw "teleport 13 has been removed as it is EOL. Please upgrade to Teleport 14 or later"; # Added 2024-05-26
+  teleport_14 = throw "teleport 14 has been removed as it is EOL. Please upgrade to Teleport 15 or later"; # Added 2024-10-18
  teleprompter = throw "teleprompter has been removed. reason: upstream dead and does not work with recent electron versions"; # Added 2024-03-14
  temurin-bin-20 = throw "Temurin 20 has been removed as it has reached its end of life"; # Added 2024-08-01
  temurin-jre-bin-20 = throw "Temurin 20 has been removed as it has reached its end of life"; # Added 2024-08-01
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -1759,9 +1759,7 @@ with pkgs;

  grizzly = callPackage ../tools/misc/grizzly { };

-  guestfs-tools = callPackage ../tools/virtualization/guestfs-tools {
-    ocamlPackages = ocaml-ng.ocamlPackages_4_14;
-  };
+  guestfs-tools = callPackage ../tools/virtualization/guestfs-tools { };

  fabs = callPackage ../tools/backup/fabs { };

@ -12733,7 +12731,7 @@ with pkgs;

  inherit (callPackages ../servers/teleport {
    inherit (darwin.apple_sdk.frameworks) CoreFoundation Security AppKit;
-  }) teleport_14 teleport_15 teleport_16 teleport;
+  }) teleport_15 teleport_16 teleport;

  telepresence = callPackage ../tools/networking/telepresence {
    pythonPackages = python3Packages;
@ -21010,17 +21008,6 @@ with pkgs;

  libgudev = callPackage ../development/libraries/libgudev { };

-  libguestfs-appliance = callPackage ../development/libraries/libguestfs/appliance.nix { };
-  libguestfs = callPackage ../development/libraries/libguestfs {
-    autoreconfHook = buildPackages.autoreconfHook264;
-    ocamlPackages = ocaml-ng.ocamlPackages_4_14;
-  };
-  libguestfs-with-appliance = libguestfs.override {
-    appliance = libguestfs-appliance;
-    autoreconfHook = buildPackages.autoreconfHook264;
-  };
-
-
  libhangul = callPackage ../development/libraries/libhangul { };

  libharu = callPackage ../development/libraries/libharu { };
@ -22420,9 +22407,10 @@ with pkgs;
    libressl_3_6
    libressl_3_7
    libressl_3_8
-    libressl_3_9;
+    libressl_3_9
+    libressl_4_0;

-  libressl = libressl_3_9;
+  libressl = libressl_4_0;

  boringssl = callPackage ../development/libraries/boringssl { };

@ -29029,7 +29017,7 @@ with pkgs;

  icesl = callPackage ../applications/misc/icesl { };

-  input-leap = libsForQt5.callPackage ../applications/misc/input-leap {
+  input-leap = qt6Packages.callPackage ../applications/misc/input-leap {
    avahi = avahi.override { withLibdnssdCompat = true; };
  };

@ -30414,8 +30402,6 @@ with pkgs;

  kitsas = libsForQt5.callPackage ../applications/office/kitsas { };

-  kiwitalk = callPackage ../by-name/ki/kiwitalk/package.nix { pnpm = pnpm_8; };
-
  kiwix = libsForQt5.callPackage ../applications/misc/kiwix { };

  kiwix-tools = callPackage ../applications/misc/kiwix/tools.nix { };
@ -31527,9 +31513,7 @@ with pkgs;

  netcoredbg = callPackage ../development/tools/misc/netcoredbg { };

-  ncdu = callPackage ../tools/misc/ncdu {
-    zig = buildPackages.zig_0_12;
-  };
+  ncdu = callPackage ../tools/misc/ncdu { };

  ncdu_1 = callPackage ../tools/misc/ncdu/1.nix { };

@ -34245,7 +34229,7 @@ with pkgs;
  colobot = callPackage ../games/colobot { };

  corsix-th = callPackage ../games/corsix-th {
-    inherit (darwin.apple_sdk.frameworks) Cocoa CoreVideo;
+    inherit (darwin.apple_sdk.frameworks) Cocoa CoreVideo CoreMedia VideoToolbox;
  };

  enigma = callPackage ../games/enigma { };