Merge master into staging-next

2024-10-21 12:06:04 +00:00 · 2024-10-21 12:06:04 +00:00 · 557897f89c
commit 557897f89c
parent 5dcdb3ba24 968e5b2ab2
55 changed files with 1275 additions and 518 deletions
--- a/nixos/tests/xmpp/ejabberd.nix
+++ b/nixos/tests/xmpp/ejabberd.nix
@ -1,3 +1,10 @@
+let
+  cert = pkgs: pkgs.runCommand "selfSignedCerts" { buildInputs = [ pkgs.openssl ]; } ''
+    openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -nodes -subj '/CN=example.com/CN=muc.example.com' -days 36500
+    mkdir -p $out
+    cp key.pem cert.pem $out
+  '';
+in
 import ../make-test-python.nix ({ pkgs, ... }: {
  name = "ejabberd";
  meta = with pkgs.lib.maintainers; {
@ -5,6 +12,7 @@ import ../make-test-python.nix ({ pkgs, ... }: {
  };
  nodes = {
    client = { nodes, pkgs, ... }: {
+      security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ];
      networking.extraHosts = ''
        ${nodes.server.config.networking.primaryIPAddress} example.com
      '';
@ -14,6 +22,7 @@ import ../make-test-python.nix ({ pkgs, ... }: {
      ];
    };
    server = { config, pkgs, ... }: {
+      security.pki.certificateFiles = [ "${cert pkgs}/cert.pem" ];
      networking.extraHosts = ''
        ${config.networking.primaryIPAddress} example.com
      '';
@ -23,6 +32,7 @@ import ../make-test-python.nix ({ pkgs, ... }: {
        configFile = "/etc/ejabberd.yml";
      };

+      systemd.services.ejabberd.serviceConfig.TimeoutStartSec = "15min";
      environment.etc."ejabberd.yml" = {
        user = "ejabberd";
        mode = "0600";
@ -40,6 +50,7 @@ import ../make-test-python.nix ({ pkgs, ... }: {
              max_stanza_size: 65536
              shaper: c2s_shaper
              access: c2s
+              starttls: true
            -
              port: 5269
              ip: "::"
@ -56,6 +67,10 @@ import ../make-test-python.nix ({ pkgs, ... }: {
              request_handlers:
                "/upload": mod_http_upload

+          certfiles:
+            - ${cert pkgs}/key.pem
+            - ${cert pkgs}/cert.pem
+
          ## Disabling digest-md5 SASL authentication. digest-md5 requires plain-text
          ## password storage (see auth_password_format option).
          disable_sasl_mechanisms: "digest-md5"
--- a/pkgs/README.md
+++ b/pkgs/README.md
@ -132,6 +132,8 @@ Now that this is out of the way. To add a package to Nixpkgs:

    https://www.mozilla.org/en-US/firefox/55.0/releasenotes/

+(using "→" instead of "->" is also accepted)
+
 ## Category Hierarchy
 [categories]: #category-hierarchy

--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@ -653,6 +653,18 @@ final: prev:
    meta.homepage = "https://github.com/vim-scripts/align/";
  };

+  align-nvim = buildVimPlugin {
+    pname = "align.nvim";
+    version = "2024-10-20";
+    src = fetchFromGitHub {
+      owner = "Vonr";
+      repo = "align.nvim";
+      rev = "12ed24b34df81d57e777fea5a535611bab10a620";
+      sha256 = "sha256-z8+lEs8bQS4Gz3cgQQ5Cb3oW58Et7it/tAxUtE3cLc4=";
+    };
+    meta.homepage = "https://github.com/Vonr/align.nvim/";
+  };
+
  alpha-nvim = buildVimPlugin {
    pname = "alpha-nvim";
    version = "2024-09-30";
@ -4067,6 +4079,18 @@ final: prev:
    meta.homepage = "https://github.com/nvim-flutter/flutter-tools.nvim/";
  };

+  focus-nvim = buildVimPlugin {
+    pname = "focus.nvim";
+    version = "2024-10-20";
+    src = fetchFromGitHub {
+      owner = "nvim-focus";
+      repo = "focus.nvim";
+      rev = "3841a38df972534567e85840d7ead20d3a26faa6";
+      sha256 = "sha256-mgHk4u0ab2uSUNE+7DU22IO/xS5uop9iATfFRk6l6hs=";
+    };
+    meta.homepage = "https://github.com/nvim-focus/focus.nvim/";
+  };
+
  fold-preview-nvim = buildVimPlugin {
    pname = "fold-preview.nvim";
    version = "2023-01-27";
@ -8718,6 +8742,18 @@ final: prev:
    meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/";
  };

+  nvim-gomove = buildVimPlugin {
+    pname = "nvim-gomove";
+    version = "2024-10-20";
+    src = fetchFromGitHub {
+      owner = "booperlv";
+      repo = "nvim-gomove";
+      rev = "2b44ae7ac0804f4e3959228122f7c85bef1964e3";
+      sha256 = "sha256-9YLJm/L13gTktb6VIkz2W/60cothFtF7feiKd26R5lo=";
+    };
+    meta.homepage = "https://github.com/booperlv/nvim-gomove/";
+  };
+
  nvim-gps = buildVimPlugin {
    pname = "nvim-gps";
    version = "2022-07-05";
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@ -53,6 +53,7 @@ https://github.com/joshuavial/aider.nvim/,HEAD,
 https://github.com/slashmili/alchemist.vim/,,
 https://github.com/dense-analysis/ale/,,
 https://github.com/vim-scripts/align/,,
+https://github.com/Vonr/align.nvim/,HEAD,
 https://github.com/goolord/alpha-nvim/,HEAD,
 https://github.com/anuvyklack/animation.nvim/,HEAD,
 https://github.com/Olical/aniseed/,,
@ -338,6 +339,7 @@ https://github.com/liangxianzhe/floating-input.nvim/,HEAD,
 https://github.com/fhill2/floating.nvim/,,
 https://github.com/floobits/floobits-neovim/,,
 https://github.com/akinsho/flutter-tools.nvim/,HEAD,
+https://github.com/nvim-focus/focus.nvim/,HEAD,
 https://github.com/anuvyklack/fold-preview.nvim/,HEAD,
 https://github.com/mhartington/formatter.nvim/,,
 https://github.com/megaannum/forms/,,
@ -732,6 +734,7 @@ https://github.com/vijaymarupudi/nvim-fzf/,,
 https://github.com/vijaymarupudi/nvim-fzf-commands/,,
 https://github.com/sakhnik/nvim-gdb/,,
 https://github.com/chrisgrieser/nvim-genghis/,HEAD,
+https://github.com/booperlv/nvim-gomove/,HEAD,
 https://github.com/smiteshp/nvim-gps/,,
 https://github.com/brenoprata10/nvim-highlight-colors/,HEAD,
 https://github.com/Iron-E/nvim-highlite/,,
--- a/pkgs/applications/graphics/viewnior/default.nix
+++ b/pkgs/applications/graphics/viewnior/default.nix
@ -1,30 +1,20 @@
-{ lib, stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkg-config, desktop-file-utils, gtk2, libpng, exiv2, lcms
-, intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl}:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, meson, ninja, pkg-config, desktop-file-utils, gtk3, libpng, exiv2, lcms
+, intltool, gettext, shared-mime-info, glib, gdk-pixbuf, perl, wrapGAppsHook3, webp-pixbuf-loader, gnome, librsvg}:

 stdenv.mkDerivation rec {
-  pname = "viewnior";
-  version = "1.8";
+  pname = "viewnior-gtk3";
+  version = "1.8-unstable-2023-11-23";

  src = fetchFromGitHub {
-    owner = "hellosiyan";
+    #owner = "hellosiyan";
+    #repo = "Viewnior";
+    owner = "Artturin";
    repo = "Viewnior";
-    rev = "${pname}-${version}";
-    hash = "sha256-LTahMmcAqgqviUxR624kTozJGTniAAGWKo1ZqXjoG5M=";
+    # https://github.com/hellosiyan/Viewnior/pull/142
+    rev = "23ce6e5630b24509d8009f17a833ad9e59b85fab";
+    hash = "sha256-+/f0+og1Dd7eJK7P83+q4lf4SjzW2g6qNk8ZTxNAuDA=";
  };

-  patches = [
-    (fetchpatch {
-      name = "viewnior-1.8-change-exiv2-AutoPtr-to-unique_ptr.patch";
-      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/viewnior/files/viewnior-1.8-change-exiv2-AutoPtr-to-unique_ptr.patch?id=002882203ad6a2b08ce035a18b95844a9f4b85d0";
-      hash = "sha256-O3/d7qMiOsYJmz7ekoLM6oaHcuYjEbAfPFuDUWSybfE=";
-    })
-    (fetchpatch {
-      name = "viewnior-1.8-add-support-for-exiv-0.28.0-errors.patch";
-      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/viewnior/files/viewnior-1.8-add-support-for-exiv-0.28.0-errors.patch?id=002882203ad6a2b08ce035a18b95844a9f4b85d0";
-      hash = "sha256-Zjc4CIlelAkbyvX2F1yo/qJjUajtAgF4+FoHWFEIPWY=";
-    })
-  ];
-
  nativeBuildInputs = [
    meson
    ninja
@ -32,10 +22,11 @@ stdenv.mkDerivation rec {
    desktop-file-utils
    intltool
    gettext
+    wrapGAppsHook3
  ];

  buildInputs = [
-    gtk2
+    gtk3
    libpng
    exiv2
    lcms
@ -45,6 +36,23 @@ stdenv.mkDerivation rec {
    perl
  ];

+  postInstall = ''
+    export GDK_PIXBUF_MODULE_FILE="${
+      gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
+        extraLoaders = [
+          webp-pixbuf-loader
+          librsvg
+        ];
+      }
+    }"
+
+    # gtk3 viewnior can be launched in wayland mode and does so by default
+    # but moving around in a zoomed in image doesn't work
+    gappsWrapperArgs+=(
+      --set-default GDK_BACKEND x11
+    )
+  '';
+
  meta = with lib; {
    description = "Fast and simple image viewer";
    longDescription =
--- a/pkgs/applications/misc/gmrun/default.nix
+++ b/pkgs/applications/misc/gmrun/default.nix
@ -1,43 +0,0 @@
-{ lib, stdenv, fetchurl, glib, gtk2, pkg-config, popt }:
-
-let
-  version = "0.9.2";
-in
-
-stdenv.mkDerivation rec {
-  pname = "gmrun";
-  inherit version;
-
-  src = fetchurl {
-    url = "mirror://sourceforge/gmrun/${pname}-${version}.tar.gz";
-    sha256 = "180z6hbax1qypy5cyy2z6nn7fzxla4ib47ck8mqwr714ag77na8p";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ glib gtk2 popt ];
-
-  doCheck = true;
-
-  enableParallelBuilding = true;
-
-  patches = [
-      ./gcc43.patch
-      ./find-config-file-in-system-etc-dir.patch
-      ./gmrun-0.9.2-xdg.patch
-    ];
-
-  meta = with lib; {
-    description = "Gnome Completion-Run Utility";
-    longDescription = ''
-      A simple program which provides a "run program" window, featuring a bash-like TAB completion.
-      It uses GTK interface.
-      Also, supports CTRL-R / CTRL-S / "!" for searching through history.
-      Running commands in a terminal with CTRL-Enter. URL handlers.
-    '';
-    homepage = "https://sourceforge.net/projects/gmrun/";
-    license = licenses.gpl2;
-    maintainers = [ ];
-    platforms = platforms.all;
-    mainProgram = "gmrun";
-  };
-}
--- a/pkgs/applications/misc/gmrun/find-config-file-in-system-etc-dir.patch
+++ b/pkgs/applications/misc/gmrun/find-config-file-in-system-etc-dir.patch
@ -1,18 +0,0 @@
-diff -ur gmrun-0.9.2-orig/src/prefs.cc gmrun-0.9.2/src/prefs.cc
--- gmrun-0.9.2-orig/src/prefs.cc	2019-05-02 12:56:39.025088361 +0200
-+++ gmrun-0.9.2/src/prefs.cc	2019-05-02 13:21:51.179778620 +0200
-@@ -31,9 +31,11 @@
- 
- Prefs::Prefs()
- {
-  string file_name = PACKAGE_DATA_DIR"/";
-  file_name += GMRUNRC;
-  init(file_name);
-+  string file_name = "/etc/" GMRUNRC;
-+  if (!init(file_name)) {
-+    file_name = PACKAGE_DATA_DIR "/" GMRUNRC;;
-+    init(file_name);
-+  }
- 
-   file_name = getenv("HOME");
-   if (!file_name.empty()) {
--- a/pkgs/applications/misc/gmrun/gcc43.patch
+++ b/pkgs/applications/misc/gmrun/gcc43.patch
@ -1,51 +0,0 @@
--- a/src/gtkcompletionline.cc.orig	2003-11-16 11:55:07.000000000 +0100
-+++ a/src/gtkcompletionline.cc	2008-05-08 08:51:22.000000000 +0200
-@@ -29,6 +29,7 @@
- #include <set>
- #include <sstream>
- #include <string>
-+#include <cstring>
- #include <vector>
- using namespace std;
- 
--- a/src/ci_string.h.orig	2001-05-16 16:39:31.000000000 +0200
-+++ a/src/ci_string.h	2008-05-08 08:51:33.000000000 +0200
-@@ -7,6 +7,7 @@
- #define __CI_STRING_H__
- 
- #include <string>
-+#include <cstring>
- #include <ctype.h>
- 
- struct ci_char_traits : public std::char_traits<char>
--- a/src/prefs.cc.orig	2002-08-16 12:48:22.000000000 +0200
-+++ a/src/prefs.cc	2008-05-08 08:51:54.000000000 +0200
-@@ -13,6 +13,7 @@
- #include <fstream>
- #include <iostream>
- #include <stdio.h>
-+#include <stdlib.h>
- 
- #include <list>
- 
--- a/src/main.cc.orig	2003-11-16 11:55:07.000000000 +0100
-+++ a/src/main.cc	2008-05-08 09:03:11.000000000 +0200
-@@ -14,6 +14,7 @@
- #include <gdk/gdkkeysyms.h>
- 
- #include <string>
-+#include <cstring>
- #include <iostream>
- #include <sstream>
- #include <vector>
-
--- a/src/gtkcompletionline.cc.orig	2009-06-19 22:38:14.000000000 +0400
-+++ a/src/gtkcompletionline.cc	2009-06-19 22:37:14.000000000 +0400
-@@ -376,7 +377,7 @@
-   return 0;
- }
- 
-int my_alphasort(const void* va, const void* vb) {
-+int my_alphasort(const dirent** va, const dirent** vb) {
-   const struct dirent** a = (const struct dirent**)va;
-   const struct dirent** b = (const struct dirent**)vb;
--- a/pkgs/applications/misc/gmrun/gmrun-0.9.2-xdg.patch
+++ b/pkgs/applications/misc/gmrun/gmrun-0.9.2-xdg.patch
@ -1,58 +0,0 @@
-diff -ur a/src/history.cc src/history.cc
--- a/src/history.cc	2002-08-17 15:19:31.000000000 +0200
-+++ a/src/history.cc	2012-06-04 23:42:35.314653414 +0200
-@@ -24,8 +24,15 @@
- HistoryFile::HistoryFile()
- {
-   m_file_entries = 0;
-  m_filename = g_get_home_dir();
-  m_filename += "/.gmrun_history";
-+  const char* filename = getenv("XDG_CACHE_HOME");
-+  if (filename != 0 && *filename != '\0') {
-+    m_filename = filename;
-+    m_filename += "/gmrun_history";
-+  }
-+  else {
-+    m_filename = g_get_home_dir();
-+    m_filename += "/.gmrun_history";
-+  }
-   m_current = 0;
-   m_default_set = false;
-   read_the_file();
-diff -ur a/src/prefs.cc src/prefs.cc
--- a/src/prefs.cc	2012-06-04 22:35:00.671949439 +0200
-+++ a/src/prefs.cc	2012-06-04 23:24:24.184445962 +0200
-@@ -35,12 +35,29 @@
-   file_name += GMRUNRC;
-   init(file_name);
- 
-  file_name = getenv("HOME");
-  if (!file_name.empty()) {
-+  file_name.clear();
-+  const char* filename = getenv("XDG_CONFIG_HOME");
-+  if (filename != 0 && *filename != '\0') {
-+    file_name = filename;
-     string::iterator i = file_name.end() - 1;
-    if (*i == '/') file_name.erase(i);
-    file_name += "/.";
-+    if (*i != '/') {
-+      file_name += '/';
-+    }
-     file_name += GMRUNRC;
-+  }
-+  else {
-+    filename = getenv("HOME");
-+    if (filename != 0 && *filename != '\0') {
-+      file_name = filename;
-+      string::iterator i = file_name.end() - 1;
-+      if (*i != '/') {
-+        file_name += '/';
-+      }
-+      file_name += '.';
-+      file_name += GMRUNRC;
-+    }
-+  }
-+  if (!file_name.empty()) {
-     init(file_name);
-   }
- }
--- a/pkgs/applications/misc/visidata/default.nix
+++ b/pkgs/applications/misc/visidata/default.nix
@ -2,7 +2,6 @@
 , lib
 , buildPythonApplication
 , fetchFromGitHub
-, fetchpatch
  # python requirements
 , beautifulsoup4
 , boto3
@ -23,6 +22,8 @@
 , pyarrow
 , pyshp
 , pypng
+, msgpack
+, brotli
 , python-dateutil
 , pyyaml
 , requests
@ -46,29 +47,15 @@
 }:
 buildPythonApplication rec {
  pname = "visidata";
-  version = "3.0.2";
+  version = "3.1.1";

  src = fetchFromGitHub {
    owner = "saulpw";
    repo = "visidata";
    rev = "v${version}";
-    hash = "sha256-gplrkrFTIP6TLvk1YazD5roDzsPvDtOXLlTOmTio52s=";
+    hash = "sha256-ICEYC9QjYrB+oTzakfjgyg4DigzDOtYnqHRTaqF7Gw0=";
  };

-  patches = [
-    # Drop when next release is out
-    (fetchpatch {
-      name = "drop-support-for-python-37.patch";
-      url = "https://github.com/saulpw/visidata/commit/738bb8b43814c14b1b8a1f1f60397c1520c5ef4a.patch";
-      hash = "sha256-5jDAzKMuW3s7BCGpWyLcS4Lw8GUbjNxVhF5mUKbR1YY=";
-    })
-    (fetchpatch {
-      name = "update-tests-for-python-312.patch";
-      url = "https://github.com/saulpw/visidata/commit/627f6f126cdd49bcdda0bbc16fab42eb5bd42103.patch";
-      hash = "sha256-3FHgjLrzMHObEheJoRY8VlnDUtDZ68FqCqAyhP7333E=";
-    })
-  ];
-
  propagatedBuildInputs = [
    # from visidata/requirements.txt
    # packages not (yet) present in nixpkgs are commented
@ -86,6 +73,9 @@ buildPythonApplication rec {
    #mapbox-vector-tile
    pypng
    #pyconll
+    msgpack
+    brotli
+    #fecfile
    fonttools
    #sas7bdat
    #xport
@ -139,6 +129,7 @@ buildPythonApplication rec {
    # tests to disable because we don't have a package to load such files
    rm -f tests/load-conllu.vdj         # no 'pyconll'
    rm -f tests/load-sav.vd             # no 'savReaderWriter'
+    rm -f tests/load-fec.vdj            # no 'fecfile'

    # tests use git to compare outputs to references
    git init -b "test-reference"
--- a/pkgs/applications/version-management/git-branchless/default.nix
+++ b/pkgs/applications/version-management/git-branchless/default.nix
@ -15,16 +15,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "git-branchless";
-  version = "0.9.0";
+  version = "0.10.0";

  src = fetchFromGitHub {
    owner = "arxanas";
    repo = "git-branchless";
    rev = "v${version}";
-    hash = "sha256-4RRSffkAe0/8k4SNnlB1iiaW4gWFTuYXplVBj2aRIdU=";
+    hash = "sha256-8uv+sZRr06K42hmxgjrKk6FDEngUhN/9epixRYKwE3U=";
  };

-  cargoHash = "sha256-Jg4d7tJXr2O1sEDdB/zk+7TPBZvgHlmW8mNiXozLKV8=";
+  cargoHash = "sha256-AEEAHMKGVYcijA+Oget+maDZwsk/RGPhHQfiv+AT4v8=";

  nativeBuildInputs = [ pkg-config ];

@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec {
      libiconv
    ];

-  postInstall = ''
+  postInstall = lib.optionalString (with stdenv; buildPlatform.canExecute hostPlatform) ''
    $out/bin/git-branchless install-man-pages $out/share/man
  '';

@ -48,8 +48,15 @@ rustPlatform.buildRustPackage rec {
    export TEST_GIT=${git}/bin/git
    export TEST_GIT_EXEC_PATH=$(${git}/bin/git --exec-path)
  '';
-  # FIXME: these tests deadlock when run in the Nix sandbox
+
+  # Note that upstream has disabled CI tests for git>=2.46
+  # See: https://github.com/arxanas/git-branchless/issues/1416
+  #      https://github.com/arxanas/git-branchless/pull/1417
+  # To be re-enabled once arxanas/git-branchless#1416 is resolved
+  doCheck = false;
+
  checkFlags = [
+    # FIXME: these tests deadlock when run in the Nix sandbox
    "--skip=test_switch_pty"
    "--skip=test_next_ambiguous_interactive"
    "--skip=test_switch_auto_switch_interactive"
@ -63,6 +70,7 @@ rustPlatform.buildRustPackage rec {
    maintainers = with maintainers; [
      nh2
      hmenke
+      bryango
    ];
  };
 }
--- a/pkgs/by-name/at/atlas/package.nix
+++ b/pkgs/by-name/at/atlas/package.nix
@ -1,14 +1,21 @@
-{ lib, buildGoModule, fetchFromGitHub, installShellFiles, testers, atlas }:
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
+  testers,
+  atlas,
+}:

 buildGoModule rec {
  pname = "atlas";
-  version = "0.28.0";
+  version = "0.28.1";

  src = fetchFromGitHub {
    owner = "ariga";
    repo = "atlas";
    rev = "v${version}";
-    hash = "sha256-D6dHHTxD2eObmXwYntIOtcPsU1vP+K289n+XVoaGUVc=";
+    hash = "sha256-OPGPYCp878nYYujR1jiMpOg1cdLSwa3OZEIxL6JltD4=";
  };

  modRoot = "cmd/atlas";
@ -18,7 +25,11 @@ buildGoModule rec {

  nativeBuildInputs = [ installShellFiles ];

-  ldflags = [ "-s" "-w" "-X ariga.io/atlas/cmd/atlas/internal/cmdapi.version=v${version}" ];
+  ldflags = [
+    "-s"
+    "-w"
+    "-X ariga.io/atlas/cmd/atlas/internal/cmdapi.version=v${version}"
+  ];

  subPackages = [ "." ];

--- a/pkgs/by-name/eq/equibop/disable_update_checking.patch
+++ b/pkgs/by-name/eq/equibop/disable_update_checking.patch
@ -0,0 +1,16 @@
+diff --git i/src/main/index.ts w/src/main/index.ts
+index 23ea0d6..1ef465f 100644
+--- i/src/main/index.ts
+++ w/src/main/index.ts
+@@ -32,7 +32,9 @@ if (process.platform === "linux") {
+ if (IS_DEV) {
+     require("source-map-support").install();
+ } else {
+-    autoUpdater.checkForUpdatesAndNotify();
+    console.log("Update checking is disabled. Skipping...");
+    // autoUpdater.checkForUpdatesAndNotify();
+
+ }
+ 
+ // Make the Vencord files use our DATA_DIR
+
--- a/pkgs/by-name/eq/equibop/package.nix
+++ b/pkgs/by-name/eq/equibop/package.nix
@ -0,0 +1,153 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  substituteAll,
+  makeWrapper,
+  makeDesktopItem,
+  copyDesktopItems,
+  equicord,
+  electron,
+  libicns,
+  pipewire,
+  libpulseaudio,
+  autoPatchelfHook,
+  pnpm_9,
+  nodejs,
+  nix-update-script,
+  withTTS ? true,
+  withMiddleClickScroll ? false,
+  # Enables the use of Equicord from nixpkgs instead of
+  # letting Equibop manage it's own version
+  withSystemEquicord ? false,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "equibop";
+  version = "2.0.9";
+
+  src = fetchFromGitHub {
+    owner = "Equicord";
+    repo = "Equibop";
+    rev = "refs/tags/v${finalAttrs.version}";
+    hash = "sha256-mK/zoW8Km6xlppxJnVbuas4yE1rpAOd9QnjETlxxnsE=";
+  };
+
+  pnpmDeps = pnpm_9.fetchDeps {
+    inherit (finalAttrs)
+      pname
+      version
+      src
+      patches
+      ;
+    hash = "sha256-TSdkHSZTbFf3Nq0QHDNTeUHmd6N+L1N1kSiKt0uNF6s=";
+  };
+
+  nativeBuildInputs = [
+    nodejs
+    pnpm_9.configHook
+    # XXX: Equibop *does not* ship venmic as a prebuilt node module. The package
+    # seems to build with or without this hook, but I (NotAShelf) don't have the
+    # time to test the consequences of removing this hook. Please open a pull
+    # request if this bothers you in some way.
+    autoPatchelfHook
+    copyDesktopItems
+    # we use a script wrapper here for environment variable expansion at runtime
+    # https://github.com/NixOS/nixpkgs/issues/172583
+    makeWrapper
+  ];
+
+  buildInputs = [
+    libpulseaudio
+    pipewire
+    stdenv.cc.cc.lib
+  ];
+
+  patches =
+    [ ./disable_update_checking.patch ]
+    ++ lib.optional withSystemEquicord (substituteAll {
+      inherit equicord;
+      src = ./use_system_equicord.patch;
+    });
+
+  env = {
+    ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
+  };
+
+  buildPhase = ''
+    runHook preBuild
+
+    pnpm build
+    pnpm exec electron-builder \
+      --dir \
+      -c.asarUnpack="**/*.node" \
+      -c.electronDist=${electron.dist} \
+      -c.electronVersion=${electron.version}
+
+    runHook postBuild
+  '';
+
+  postBuild = ''
+    pushd build
+    ${libicns}/bin/icns2png -x icon.icns
+    popd
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/opt/Equibop
+    cp -r dist/*unpacked/resources $out/opt/Equibop/
+
+    for file in build/icon_*x32.png; do
+      file_suffix=''${file//build\/icon_}
+      install -Dm0644 $file $out/share/icons/hicolor/''${file_suffix//x32.png}/apps/equibop.png
+    done
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    makeWrapper ${electron}/bin/electron $out/bin/equibop \
+      --add-flags $out/opt/Equibop/resources/app.asar \
+      ${lib.optionalString withTTS "--add-flags \"--enable-speech-dispatcher\""} \
+      ${lib.optionalString withMiddleClickScroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime}}"
+  '';
+
+  desktopItems = makeDesktopItem {
+    name = "equibop";
+    desktopName = "Equibop";
+    exec = "equibop %U";
+    icon = "equibop";
+    startupWMClass = "Equibop";
+    genericName = "Internet Messenger";
+    keywords = [
+      "discord"
+      "equibop"
+      "electron"
+      "chat"
+    ];
+    categories = [
+      "Network"
+      "InstantMessaging"
+      "Chat"
+    ];
+  };
+
+  passthru = {
+    inherit (finalAttrs) pnpmDeps;
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Custom Discord App aiming to give you better performance and improve linux support";
+    homepage = "https://github.com/Equicord/Equibop";
+    changelog = "https://github.com/Equicord/Equibop/releases/tag/${finalAttrs.src.rev}";
+    license = lib.licenses.gpl3Only;
+    maintainers = [
+      lib.maintainers.NotAShelf
+    ];
+    mainProgram = "equibop";
+    # I am not confident in my ability to support Darwin, please PR if this is important to you
+    platforms = lib.platforms.linux;
+  };
+})
--- a/pkgs/by-name/eq/equibop/use_system_equicord.patch
+++ b/pkgs/by-name/eq/equibop/use_system_equicord.patch
@ -0,0 +1,17 @@
+diff --git i/src/main/constants.ts w/src/main/constants.ts
+index afb171f..c6a014e 100644
+--- i/src/main/constants.ts
+++ w/src/main/constants.ts
+@@ -47,10 +47,7 @@ export const VENCORD_THEMES_DIR = join(DATA_DIR, "themes");
+ 
+ // needs to be inline require because of circular dependency
+ // as otherwise "DATA_DIR" (which is used by ./settings) will be uninitialised
+-export const VENCORD_DIR = (() => {
+-    const { State } = require("./settings") as typeof import("./settings");
+-    return State.store.vencordDir ? join(State.store.vencordDir, "equibop") : join(SESSION_DATA_DIR, "equicord.asar");
+-})();
+export const VENCORD_DIR = "@equicord@";
+ 
+ export const USER_AGENT = `Equibop/${app.getVersion()} (https://github.com/Equicord/Equibop)`;
+ 
+
--- a/pkgs/by-name/eq/equicord/package.nix
+++ b/pkgs/by-name/eq/equicord/package.nix
@ -0,0 +1,63 @@
+{
+  fetchFromGitHub,
+  git,
+  lib,
+  nodejs,
+  pnpm_9,
+  stdenv,
+  buildWebExtension ? false,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "equicord";
+  version = "1.10.4"; # from package.json
+
+  src = fetchFromGitHub {
+    owner = "Equicord";
+    repo = "Equicord";
+    rev = "440b68ea82b6fd44bf5ec70b759a0207ee9f4ca7";
+    hash = "sha256-9GIw8g2HZ6/5Lb4gtDyuBqZWi5YK5Uz0lo+u+LrIZwI=";
+  };
+
+  pnpmDeps = pnpm_9.fetchDeps {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-kGLF6uIr0xxlB5LaSqKiBKESbmWN7PzDErrCmiT6vXA=";
+  };
+
+  nativeBuildInputs = [
+    git
+    nodejs
+    pnpm_9.configHook
+  ];
+
+  env = {
+    EQUICORD_REMOTE = "${finalAttrs.src.owner}/${finalAttrs.src.repo}";
+    EQUICORD_HASH = "${finalAttrs.src.rev}";
+  };
+
+  buildPhase = ''
+    runHook preBuild
+
+    pnpm run ${if buildWebExtension then "buildWeb" else "build"} \
+      -- --standalone --disable-updater
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    cp -r dist/${lib.optionalString buildWebExtension "chromium-unpacked/"} $out
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "The other cutest Discord client mod";
+    homepage = "https://github.com/Equicord/Equicord";
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.linux;
+    maintainers = [
+      lib.maintainers.NotAShelf
+    ];
+  };
+})
--- a/pkgs/by-name/gm/gmrun/package.nix
+++ b/pkgs/by-name/gm/gmrun/package.nix
@ -0,0 +1,48 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  pkg-config,
+  wrapGAppsHook3,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "gmrun";
+  version = "1.4w";
+
+  src = fetchFromGitHub {
+    owner = "wdlkmpx";
+    repo = "gmrun";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-sp+Atod9ZKVF8sxNWIMrlewqZAGnoLo2mZUNkCtSkec=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    wrapGAppsHook3
+  ];
+
+  doCheck = true;
+
+  enableParallelBuilding = true;
+
+  # Problem with component size on wayland
+  preFixup = ''
+    gappsWrapperArgs+=(--set-default GDK_BACKEND x11)
+  '';
+
+  meta = {
+    description = "Gnome Completion-Run Utility";
+    longDescription = ''
+      A simple program which provides a "run program" window, featuring a bash-like TAB completion.
+      It uses GTK interface.
+      Also, supports CTRL-R / CTRL-S / "!" for searching through history.
+      Running commands in a terminal with CTRL-Enter. URL handlers.
+    '';
+    homepage = "https://github.com/wdlkmpx/gmrun";
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ aleksana ];
+    platforms = lib.platforms.linux;
+    mainProgram = "gmrun";
+  };
+})
--- a/pkgs/by-name/gw/gweled/package.nix
+++ b/pkgs/by-name/gw/gweled/package.nix
@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchgit,
+  meson,
+  ninja,
+  pkg-config,
+  wrapGAppsHook3,
+  desktop-file-utils,
+  clutter,
+  clutter-gtk,
+  gsound,
+  libgnome-games-support,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "gweled";
+  version = "1.0-beta1";
+
+  src = fetchgit {
+    url = "https://git.launchpad.net/gweled";
+    rev = "refs/tags/${finalAttrs.version}";
+    hash = "sha256-cm1z6l2tfYBFVFcvsnQ6cI3pQDnJMzn6SUC20gnBF5w=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook3
+    desktop-file-utils
+  ];
+
+  buildInputs = [
+    clutter
+    clutter-gtk
+    gsound
+    libgnome-games-support
+  ];
+
+  configureFlags = [ "--disable-setgid" ];
+
+  meta = {
+    description = "Puzzle game similar to Bejeweled or Diamond Mine";
+    mainProgram = "gweled";
+    homepage = "https://gweled.org";
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ aleksana ];
+  };
+})
--- a/pkgs/by-name/ka/kara/package.nix
+++ b/pkgs/by-name/ka/kara/package.nix
@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
  pname = "kara";
-  version = "0.7.1";
+  version = "0.7.3";

  src = fetchFromGitHub {
    owner = "dhruv8sh";
    repo = "kara";
    rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-G+sLHcHnNuzIRE+6bvEeXaWYVdoqqxcp5kGF8ZhD/34=";
+    hash = "sha256-an0tA1YQU/wpaY4y6lQfOFiUYm6aLmVTC1M5sukARVA=";
  };

  installPhase = ''
--- a/pkgs/by-name/li/live-chart/package.nix
+++ b/pkgs/by-name/li/live-chart/package.nix
@ -0,0 +1,50 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  pkg-config,
+  vala,
+  gtk4,
+  libgee,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "live-chart";
+  version = "1.10.0";
+
+  src = fetchFromGitHub {
+    owner = "lcallarec";
+    repo = "live-chart";
+    rev = finalAttrs.version;
+    hash = "sha256-SOZJ9sVrmsZybs5BVXWmqBJ/P7SZI/X8TGWHXGvXAU8=";
+  };
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    vala
+  ];
+
+  buildInputs = [
+    gtk4
+    libgee
+  ];
+
+  strictDeps = true;
+
+  meta = {
+    description = "Real-time charting library for Vala and GTK4 based on Cairo";
+    homepage = "https://github.com/lcallarec/live-chart";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ aleksana ];
+    platforms = lib.platforms.unix;
+  };
+})
--- a/pkgs/by-name/mo/mozcdic-ut-alt-cannadic/package.nix
+++ b/pkgs/by-name/mo/mozcdic-ut-alt-cannadic/package.nix
@ -7,13 +7,13 @@

 stdenvNoCC.mkDerivation {
  pname = "mozcdic-ut-alt-cannadic";
-  version = "0-unstable-2024-07-28";
+  version = "0-unstable-2024-10-13";

  src = fetchFromGitHub {
    owner = "utuhiro78";
    repo = "mozcdic-ut-alt-cannadic";
-    rev = "50fee0397b87fe508f9edd45bac56f5290d8ce66";
-    hash = "sha256-KKUj3d9yR2kTTTFbroZQs+OZR4KUyAUYE/X3z9/vQvM=";
+    rev = "7f70e48a63735c781b6453977628e594bdd50d89";
+    hash = "sha256-R7qU2YNdeojuu4VTxH+M5Bvf8XAEvK6N8jPNz9MQqvU=";
  };

  installPhase = ''
--- a/pkgs/by-name/mo/mozcdic-ut-personal-names/package.nix
+++ b/pkgs/by-name/mo/mozcdic-ut-personal-names/package.nix
@ -7,13 +7,13 @@

 stdenvNoCC.mkDerivation {
  pname = "mozcdic-ut-personal-names";
-  version = "0-unstable-2024-09-21";
+  version = "0-unstable-2024-10-14";

  src = fetchFromGitHub {
    owner = "utuhiro78";
    repo = "mozcdic-ut-personal-names";
-    rev = "b61a5af7992d6fcdc82fa08b67b1c9771bbc4449";
-    hash = "sha256-xcfhfO5GIiOVxLfqX3izLHYuSFZCgOlbQE3N3U+HTW4=";
+    rev = "24d783e5b1fe57af571e000861cfc70da173aedb";
+    hash = "sha256-ezx4Am1xuP9SNNBsNC3KwpWghypRU97MCw10/P2LlnY=";
  };

  installPhase = ''
--- a/pkgs/by-name/mo/mozcdic-ut-place-names/package.nix
+++ b/pkgs/by-name/mo/mozcdic-ut-place-names/package.nix
@ -7,13 +7,13 @@

 stdenvNoCC.mkDerivation {
  pname = "mozcdic-ut-place-names";
-  version = "0-unstable-2024-09-03";
+  version = "0-unstable-2024-10-12";

  src = fetchFromGitHub {
    owner = "utuhiro78";
    repo = "mozcdic-ut-place-names";
-    rev = "4525819546a26fc994d7ca4a2e883fde14bf908c";
-    hash = "sha256-oiSBR2QhOYyurftdEn2w6hNK1ucddlvLqGTiZk9G/4k=";
+    rev = "888a977a3f30451e8f286ef8eaf2f9be169234cb";
+    hash = "sha256-UL3ik/CxmRM7m0AXS+UNQEipCDS8pH+AheIMx6xqAaU=";
  };

  installPhase = ''
--- a/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix
+++ b/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix
@ -7,13 +7,13 @@

 stdenvNoCC.mkDerivation {
  pname = "mozcdic-ut-sudachidict";
-  version = "0-unstable-2024-07-28";
+  version = "0-unstable-2024-10-12";

  src = fetchFromGitHub {
    owner = "utuhiro78";
    repo = "mozcdic-ut-sudachidict";
-    rev = "a754f1fff5fded62cc066aa6be0ab0169059a144";
-    hash = "sha256-WzhWNpqtiG9TtFHEOSbHG1mbb4ak0zCkO13g9ZWqyBE=";
+    rev = "a807010ef3fdc9573a83f41594e9d79b969c3f80";
+    hash = "sha256-AGs/MleR/UMtVUDfxpE9clyD1uaI3SvTGFZInOo8ms0=";
  };

  installPhase = ''
--- a/pkgs/by-name/os/oscavmgr/Cargo.lock
+++ b/pkgs/by-name/os/oscavmgr/Cargo.lock
@ -4,18 +4,18 @@ version = 3

 [[package]]
 name = "addr2line"
-version = "0.22.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375"
 dependencies = [
 "gimli",
 ]

 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"

 [[package]]
 name = "aho-corasick"
@ -28,8 +28,8 @@ dependencies = [

 [[package]]
 name = "alvr_common"
-version = "20.10.0"
-source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#7ab6db99b52038c09a9668ac6fcffbeea772d7f2"
+version = "20.11.1"
+source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#fc03219b1c5cfcd7d41c5334efcea5a9b1639d30"
 dependencies = [
 "anyhow",
 "backtrace",
@ -45,8 +45,8 @@ dependencies = [

 [[package]]
 name = "alvr_events"
-version = "20.10.0"
-source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#7ab6db99b52038c09a9668ac6fcffbeea772d7f2"
+version = "20.11.1"
+source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#fc03219b1c5cfcd7d41c5334efcea5a9b1639d30"
 dependencies = [
 "alvr_common",
 "alvr_packets",
@ -57,8 +57,8 @@ dependencies = [

 [[package]]
 name = "alvr_filesystem"
-version = "20.10.0"
-source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#7ab6db99b52038c09a9668ac6fcffbeea772d7f2"
+version = "20.11.1"
+source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#fc03219b1c5cfcd7d41c5334efcea5a9b1639d30"
 dependencies = [
 "dirs",
 "once_cell",
@ -66,8 +66,8 @@ dependencies = [

 [[package]]
 name = "alvr_packets"
-version = "20.10.0"
-source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#7ab6db99b52038c09a9668ac6fcffbeea772d7f2"
+version = "20.11.1"
+source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#fc03219b1c5cfcd7d41c5334efcea5a9b1639d30"
 dependencies = [
 "alvr_common",
 "alvr_session",
@ -77,8 +77,8 @@ dependencies = [

 [[package]]
 name = "alvr_session"
-version = "20.10.0"
-source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#7ab6db99b52038c09a9668ac6fcffbeea772d7f2"
+version = "20.11.1"
+source = "git+https://github.com/alvr-org/ALVR.git?branch=v20#fc03219b1c5cfcd7d41c5334efcea5a9b1639d30"
 dependencies = [
 "alvr_common",
 "alvr_filesystem",
@ -140,9 +140,9 @@ dependencies = [

 [[package]]
 name = "anyhow"
-version = "1.0.86"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
 dependencies = [
 "backtrace",
 ]
@ -155,17 +155,17 @@ checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"

 [[package]]
 name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
 "addr2line",
- "cc",
 "cfg-if",
 "libc",
 "miniz_oxide",
 "object",
 "rustc-demangle",
+ "windows-targets 0.52.6",
 ]

 [[package]]
@ -200,9 +200,9 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"

 [[package]]
 name = "bytemuck"
-version = "1.17.1"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "773d90827bc3feecfb67fab12e24de0749aad83c74b9504ecde46237b5cd24e2"
+checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
 dependencies = [
 "bytemuck_derive",
 ]
@ -226,15 +226,15 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"

 [[package]]
 name = "bytes"
-version = "1.7.1"
+version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
+checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"

 [[package]]
 name = "cc"
-version = "1.1.16"
+version = "1.1.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b"
+checksum = "07b1695e2c7e8fc85310cde85aeaab7e3097f593c91d209d3f9df76c928100f0"
 dependencies = [
 "shlex",
 ]
@ -247,9 +247,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
 name = "clap"
-version = "4.5.17"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac"
+checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3"
 dependencies = [
 "clap_builder",
 "clap_derive",
@ -257,9 +257,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.5.17"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73"
+checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b"
 dependencies = [
 "anstream",
 "anstyle",
@ -269,9 +269,9 @@ dependencies = [

 [[package]]
 name = "clap_derive"
-version = "4.5.13"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
 dependencies = [
 "heck",
 "proc-macro2",
@ -623,15 +623,15 @@ dependencies = [

 [[package]]
 name = "gimli"
-version = "0.29.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"

 [[package]]
 name = "glam"
-version = "0.28.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "779ae4bf7e8421cf91c0b3b64e7e8b40b862fba4d393f59150042de7c4965a94"
+checksum = "c28091a37a5d09b555cb6628fd954da299b536433834f5b8e59eba78e0cbbf8a"
 dependencies = [
 "mint",
 "serde",
@ -722,9 +722,9 @@ dependencies = [

 [[package]]
 name = "hyper-util"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba"
 dependencies = [
 "bytes",
 "futures-channel",
@ -800,9 +800,9 @@ dependencies = [

 [[package]]
 name = "ipnet"
-version = "2.9.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4"

 [[package]]
 name = "is_terminal_polyfill"
@ -871,9 +871,9 @@ checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"

 [[package]]
 name = "mdns-sd"
-version = "0.11.3"
+version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66b18c39a781e986434d14398b94993f3d7659ea4b255a79b00ed40a31f4a97d"
+checksum = "35d1967e64b4ca7bba8af2458d0b9dd50471d541959ca2120cb9cc965946ef61"
 dependencies = [
 "flume",
 "if-addrs",
@ -902,11 +902,11 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"

 [[package]]
 name = "miniz_oxide"
-version = "0.7.4"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
 dependencies = [
- "adler",
+ "adler2",
 ]

 [[package]]
@ -1061,7 +1061,7 @@ checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"

 [[package]]
 name = "oscavmgr"
-version = "0.4.1"
+version = "0.4.2"
 dependencies = [
 "alvr_common",
 "alvr_events",
@ -1180,9 +1180,9 @@ dependencies = [

 [[package]]
 name = "portable-atomic"
-version = "1.7.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
+checksum = "d30538d42559de6b034bc76fd6dd4c38961b1ee5c6c56e3808c50128fdbc22ce"

 [[package]]
 name = "ppv-lite86"
@ -1263,9 +1263,9 @@ dependencies = [

 [[package]]
 name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853"
 dependencies = [
 "bitflags 2.6.0",
 ]
@ -1365,9 +1365,9 @@ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"

 [[package]]
 name = "rustix"
-version = "0.38.36"
+version = "0.38.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
 dependencies = [
 "bitflags 2.6.0",
 "errno",
@ -1390,11 +1390,11 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"

 [[package]]
 name = "schannel"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@ -1418,9 +1418,9 @@ dependencies = [

 [[package]]
 name = "security-framework-sys"
-version = "2.11.1"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
+checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"
 dependencies = [
 "core-foundation-sys",
 "libc",
@ -1437,18 +1437,18 @@ dependencies = [

 [[package]]
 name = "serde"
-version = "1.0.209"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.209"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
 "proc-macro2",
 "quote",
@ -1786,24 +1786,24 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"

 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"

 [[package]]
 name = "unicode-normalization"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
 dependencies = [
 "tinyvec",
 ]

 [[package]]
 name = "unicode-width"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"

 [[package]]
 name = "url"
--- a/pkgs/by-name/os/oscavmgr/package.nix
+++ b/pkgs/by-name/os/oscavmgr/package.nix
@ -11,19 +11,19 @@

 rustPlatform.buildRustPackage rec {
  pname = "oscavmgr";
-  version = "0.4.1";
+  version = "0.4.2";

  src = fetchFromGitHub {
    owner = "galister";
    repo = "oscavmgr";
    rev = "refs/tags/v${version}";
-    hash = "sha256-1cpisSevAU2zGNrpVEGvulBcWB5rWkWAIYI/0vjzRQE=";
+    hash = "sha256-mOa9eUI/p0ErePza6wXy1jUcHg5Q9tvC7/lThQabU94=";
  };

  cargoLock = {
    lockFile = ./Cargo.lock;
    outputHashes = {
-      "alvr_common-20.10.0" = "sha256-2d5+9rxCpqgLMab7i1pLKaY1qSKRxzPI7pgh54rQBdg=";
+      "alvr_common-20.11.1" = "sha256-d4KldPii8W1HcfnMSD8Fn+IGO/a3r8747APPjRCnbe8=";
      "openxr-0.19.0" = "sha256-kbEYoN4UvUEaZA9LJWEKx1X1r+l91GjTWs1hNXhr7cw=";
      "settings-schema-0.2.0" = "sha256-luEdAKDTq76dMeo5kA+QDTHpRMFUg3n0qvyQ7DkId0k=";
    };
--- a/pkgs/by-name/re/reco/package.nix
+++ b/pkgs/by-name/re/reco/package.nix
@ -0,0 +1,57 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  pkg-config,
+  vala,
+  wrapGAppsHook4,
+  libgee,
+  live-chart,
+  ryokucha,
+  pantheon,
+  gst_all_1,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "reco";
+  version = "5.0.2";
+
+  src = fetchFromGitHub {
+    owner = "ryonakano";
+    repo = "reco";
+    rev = finalAttrs.version;
+    hash = "sha256-uZAcZJLQH0MTI4NSJnZvzYPBFVXGBqAhsjVLAVP/ZwI=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    vala
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    libgee
+    live-chart
+    ryokucha
+    pantheon.granite7
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-base
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-libav
+  ];
+
+  mesonFlags = [ (lib.mesonBool "use_submodule" false) ];
+
+  meta = {
+    description = "Audio recorder focused on being concise and simple to use";
+    homepage = "https://github.com/ryonakano/reco";
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "com.github.ryonakano.reco";
+    maintainers = with lib.maintainers; [ aleksana ];
+    platforms = lib.platforms.unix;
+  };
+})
--- a/pkgs/by-name/ry/ryokucha/package.nix
+++ b/pkgs/by-name/ry/ryokucha/package.nix
@ -0,0 +1,46 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  meson,
+  ninja,
+  pkg-config,
+  vala,
+  gtk4,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ryokucha";
+  version = "0.3.1";
+
+  src = fetchFromGitHub {
+    owner = "ryonakano";
+    repo = "ryokucha";
+    rev = finalAttrs.version;
+    hash = "sha256-bmN8ZiFjUXtWMrZz7BJtO/9TMjcc4d3x8EpFvhvsewY=";
+  };
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    vala
+  ];
+
+  buildInputs = [ gtk4 ];
+
+  strictDeps = true;
+
+  meta = {
+    description = "GTK4 library that includes customized widgets";
+    homepage = "https://github.com/ryonakano/ryokucha";
+    license = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ aleksana ];
+    platforms = lib.platforms.unix;
+  };
+})
--- a/pkgs/development/compilers/halide/default.nix
+++ b/pkgs/development/compilers/halide/default.nix
@ -1,59 +1,64 @@
-{ stdenv
-, llvmPackages
-, lib
-, fetchFromGitHub
-, cmake
-, libffi
-, libpng
-, libjpeg
-, mesa
-, libGL
-, eigen
-, openblas
-, blas
-, lapack
+{
+  stdenv,
+  llvmPackages,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  flatbuffers,
+  libffi,
+  libpng,
+  libjpeg,
+  mesa,
+  libGL,
+  eigen,
+  openblas,
+  blas,
+  lapack,
+  pythonSupport ? false,
+  python3Packages ? null,
 }:

 assert blas.implementation == "openblas" && lapack.implementation == "openblas";

 stdenv.mkDerivation rec {
  pname = "halide";
-  version = "16.0.0";
+  version = "18.0.0";

  src = fetchFromGitHub {
    owner = "halide";
    repo = "Halide";
    rev = "v${version}";
-    sha256 = "sha256-lJQrXkJgBmGb/QMSxwuPkkHOSgEDowLWzIolp1km2Y8=";
+    hash = "sha256-BPalUh9EgdCqVaWC1HoreyyRcPQc4QMIYnLrRoNDDCI=";
  };

-  postPatch = ''
-    # See https://github.com/halide/Halide/issues/7785
-    substituteInPlace 'src/runtime/HalideRuntime.h' \
-      --replace '#if defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__)
-    #define HALIDE_CPP_COMPILER_HAS_FLOAT16' \
-                '#if defined(__x86_64__) || defined(__i386__)
-    #define HALIDE_CPP_COMPILER_HAS_FLOAT16'
-  ''
-  # Note: on x86_64-darwin, clang fails to find AvailabilityVersions.h, so we remove it.
-  # Halide uses AvailabilityVersions.h and TargetConditionals.h to determine whether
-  # ::aligned_alloc is available. For us, it isn't.
-  + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
-    substituteInPlace 'src/runtime/HalideBuffer.h' \
-      --replace '#ifdef __APPLE__
-    #include <AvailabilityVersions.h>
-    #include <TargetConditionals.h>
-    #endif' \
-                ' ' \
-      --replace 'TARGET_OS_OSX && (__MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_15)' \
-                '1' \
-      --replace 'TARGET_OS_IPHONE && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_14_0)' \
-                '0'
-  '';
+  postPatch =
+    ''
+      # See https://github.com/halide/Halide/issues/7785
+      substituteInPlace 'src/runtime/HalideRuntime.h' \
+        --replace '#if defined(__x86_64__) || defined(__i386__) || defined(__arm__) || defined(__aarch64__)
+      #define HALIDE_CPP_COMPILER_HAS_FLOAT16' \
+                  '#if defined(__x86_64__) || defined(__i386__)
+      #define HALIDE_CPP_COMPILER_HAS_FLOAT16'
+    ''
+    # Note: on x86_64-darwin, clang fails to find AvailabilityVersions.h, so we remove it.
+    # Halide uses AvailabilityVersions.h and TargetConditionals.h to determine whether
+    # ::aligned_alloc is available. For us, it isn't.
+    + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
+      substituteInPlace 'src/runtime/HalideBuffer.h' \
+        --replace '#ifdef __APPLE__
+      #include <AvailabilityVersions.h>
+      #include <TargetConditionals.h>
+      #endif' \
+                  ' ' \
+        --replace 'TARGET_OS_OSX && (__MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_15)' \
+                  '1' \
+        --replace 'TARGET_OS_IPHONE && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_14_0)' \
+                  '0'
+    '';

  cmakeFlags = [
    "-DWARNINGS_AS_ERRORS=OFF"
-    "-DWITH_PYTHON_BINDINGS=OFF"
+    "-DWITH_PYTHON_BINDINGS=${if pythonSupport then "ON" else "OFF"}"
    "-DTARGET_WEBASSEMBLY=OFF"
    # Disable performance tests since they may fail on busy machines
    "-DWITH_TEST_PERFORMANCE=OFF"
@ -61,41 +66,79 @@ stdenv.mkDerivation rec {
    # v16 release (See https://github.com/halide/Halide/commit/09c5d1d19ec8e6280ccbc01a8a12decfb27226ba)
    # These tests also fail to compile on Darwin because of some missing command line options...
    "-DWITH_TEST_FUZZ=OFF"
+    # Disable FetchContent for flatbuffers and use the version from nixpkgs instead
+    "-DFLATBUFFERS_USE_FETCHCONTENT=OFF"
+    "-DPYBIND11_USE_FETCHCONTENT=OFF"
  ];

  doCheck = true;

-  # Note: disable mullapudi2016_fibonacci because it requires too much
-  # parallelism for remote builders
-  preCheck = ''
-    checkFlagsArray+=("ARGS=-E 'mullapudi2016_fibonacci'")
+  preCheck =
+    let
+      disabledTests = lib.strings.concatStringsSep "|" [
+        # Requires too much parallelism for remote builders.
+        "mullapudi2016_fibonacci"
+        # Take too long---we don't want to run these in CI.
+        "adams2019_test_apps_autoscheduler"
+        "anderson2021_test_apps_autoscheduler"
+        "correctness_cross_compilation"
+        "correctness_simd_op_check_hvx"
+      ];
+    in
+    ''
+      checkFlagsArray+=("ARGS=-E '${disabledTests}'")
+    '';
+
+  postInstall = lib.optionalString pythonSupport ''
+    mkdir -p $out/${builtins.dirOf python3Packages.python.sitePackages}
+    mv -v $out/lib/python3/site-packages $out/${python3Packages.python.sitePackages}
+    rmdir $out/lib/python3/
  '';

  # Note: only openblas and not atlas part of this Nix expression
  # see pkgs/development/libraries/science/math/liblapack/3.5.0.nix
  # to get a hint howto setup atlas instead of openblas
-  buildInputs = [
-    llvmPackages.llvm
-    llvmPackages.lld
-    llvmPackages.openmp
-    llvmPackages.libclang
-    libffi
-    libpng
-    libjpeg
-    eigen
-    openblas
-  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-    mesa
-    libGL
-  ];
+  buildInputs =
+    [
+      llvmPackages.llvm
+      llvmPackages.lld
+      llvmPackages.openmp
+      llvmPackages.libclang
+      libffi
+      libpng
+      libjpeg
+      eigen
+      openblas
+    ]
+    ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+      mesa
+      libGL
+    ];

-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs =
+    [
+      cmake
+      flatbuffers
+    ]
+    ++ lib.optionals pythonSupport [
+      python3Packages.python
+      python3Packages.pybind11
+    ];
+
+  propagatedBuildInputs = lib.optionals pythonSupport [
+    python3Packages.numpy
+    python3Packages.imageio
+  ];

  meta = with lib; {
    description = "C++ based language for image processing and computational photography";
    homepage = "https://halide-lang.org";
    license = licenses.mit;
    platforms = platforms.all;
-    maintainers = with maintainers; [ ck3d atila twesterhout ];
+    maintainers = with maintainers; [
+      ck3d
+      atila
+      twesterhout
+    ];
  };
 }
--- a/pkgs/development/compilers/zig/generic.nix
+++ b/pkgs/development/compilers/zig/generic.nix
@ -46,7 +46,9 @@ stdenv.mkDerivation (finalAttrs: {
    "/System/Library/CoreServices/SystemVersion.plist"
  ];

-  env.ZIG_GLOBAL_CACHE_DIR = "$TMPDIR/zig-cache";
+  preBuild = ''
+    export ZIG_GLOBAL_CACHE_DIR="$TMPDIR/zig-cache";
+  '';

  # Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't
  # work in Nix's sandbox. Use env from our coreutils instead.
@ -55,14 +57,14 @@ stdenv.mkDerivation (finalAttrs: {
      --replace "/usr/bin/env" "${coreutils}/bin/env"
  '' else ''
    substituteInPlace lib/std/zig/system/NativeTargetInfo.zig \
-      --replace "/usr/bin/env" "${coreutils}/bin/env"
+      --replace-fail "/usr/bin/env" "${coreutils}/bin/env"
  '';

  doInstallCheck = true;
  installCheckPhase = ''
    runHook preInstallCheck

-    $out/bin/zig test --cache-dir "$TMPDIR/zig-test-cache" -I $src/test $src/test/behavior.zig
+    $out/bin/zig test -I $src/test $src/test/behavior.zig

    runHook postInstallCheck
  '';
--- a/pkgs/development/interpreters/erlang/25.nix
+++ b/pkgs/development/interpreters/erlang/25.nix
@ -1,6 +1,6 @@
 { mkDerivation }:

 mkDerivation {
-  version = "25.3.2.13";
-  sha256 = "sha256-ZBk6oOT0vFY66ttyn4G2zy7Ur5bDKkxPzlTsZPaiosc=";
+  version = "25.3.2.15";
+  sha256 = "sha256-y1QZZ+W5jkAygTRtXVu6FyG4I98SGXXourDfPPlEfg8=";
 }
--- a/pkgs/development/interpreters/erlang/26.nix
+++ b/pkgs/development/interpreters/erlang/26.nix
@ -1,6 +1,6 @@
 { mkDerivation }:

 mkDerivation {
-  version = "26.2.5.1";
-  sha256 = "sha256-oxOynBFW++igiJtIv1ZjoMgtmumgnsWgwyVx4buhxCo=";
+  version = "26.2.5.4";
+  sha256 = "sha256-fvpSvsr7wWgFKa8vODVz4RUn8JKe8NuT9sjvau38B+Y=";
 }
--- a/pkgs/development/interpreters/erlang/27.nix
+++ b/pkgs/development/interpreters/erlang/27.nix
@ -1,6 +1,6 @@
 { mkDerivation }:

 mkDerivation {
-  version = "27.0.1";
-  sha256 = "sha256-Lp6J9eq6RXDi0RRjeVO/CIa4h/m7/fwOp/y0u0sTdFQ=";
+  version = "27.1.2";
+  sha256 = "sha256-urHJMPo9XG+sIBuCaWvEhAcykGxlVSdKKem7vCiMjcg=";
 }
--- a/pkgs/development/interpreters/erlang/generic-builder.nix
+++ b/pkgs/development/interpreters/erlang/generic-builder.nix
@ -98,6 +98,8 @@ stdenv.mkDerivation ({

  inherit src version;

+  LANG = "C.UTF-8";
+
  nativeBuildInputs = [ autoconf makeWrapper perl gnum4 libxslt libxml2 ];

  buildInputs = [ ncurses opensslPackage ]
--- a/pkgs/development/tools/fnlfmt/default.nix
+++ b/pkgs/development/tools/fnlfmt/default.nix
@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "fnlfmt";
-  version = "0.3.1";
+  version = "0.3.2";

  src = fetchFromSourcehut {
    owner = "~technomancy";
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-rhbYG0TpqAZnbLaZOG739/pDA61Dwb4Y1HhBxWLtOus=";
+    repo = "fnlfmt";
+    rev = "refs/tags/${version}";
+    hash = "sha256-LYHhKC8iA4N8DdCH8GfSOkN/e+W3YjkFhVSDQraKoFk=";
  };

  nativeBuildInputs = [ luaPackages.fennel ];
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
    runHook preBuild

    echo "#!${lua}/bin/lua" > fnlfmt
-    ${luaPackages.fennel}/bin/fennel --require-as-include --compile cli.fnl >> fnlfmt
+    ${luaPackages.fennel}/bin/fennel --require-as-include --compile tags/${version}/cli.fnl >> fnlfmt
    chmod +x fnlfmt

    runHook postBuild
--- a/pkgs/games/gweled/default.nix
+++ b/pkgs/games/gweled/default.nix
@ -1,35 +0,0 @@
-{ lib, stdenv, fetchbzr, gettext
-, gtk2, wrapGAppsHook3, autoreconfHook, pkg-config
-, libmikmod, librsvg, libcanberra-gtk2, hicolor-icon-theme }:
-
-stdenv.mkDerivation rec {
-  pname = "gweled";
-  version = "unstable-2021-02-11";
-
-  src = fetchbzr {
-    url = "lp:gweled";
-    rev = "108";
-    hash = "sha256-rM4dgbYfSrVqZwi+xzKuEtmtjK3HVvqeutmni1vleLo=";
-  };
-
-  doCheck = false;
-
-  postPatch = ''
-    substituteInPlace configure.ac --replace "AM_GNU_GETTEXT_VERSION([0.19.8])" "AM_GNU_GETTEXT_VERSION([${gettext.version}])"
-  '';
-
-  nativeBuildInputs = [ wrapGAppsHook3 gettext autoreconfHook pkg-config ];
-
-  buildInputs = [ gtk2 libmikmod librsvg hicolor-icon-theme libcanberra-gtk2 ];
-
-  configureFlags = [ "--disable-setgid" ];
-
-  meta = with lib; {
-    description = "Bejeweled clone game";
-    mainProgram = "gweled";
-    homepage = "https://gweled.org";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ ];
-  };
-}
--- a/pkgs/misc/tmux-plugins/default.nix
+++ b/pkgs/misc/tmux-plugins/default.nix
@ -378,14 +378,14 @@ in rec {
    };
  };

-  nord = mkTmuxPlugin rec {
+  nord = mkTmuxPlugin {
    pluginName = "nord";
-    version = "0.3.0";
+    version = "0.3.0-unstable-2023-03-03";
    src = pkgs.fetchFromGitHub {
      owner = "nordtheme";
      repo = "tmux";
-      rev = "v${version}";
-      hash = "sha256-s/rimJRGXzwY9zkOp9+2bAF1XCT9FcyZJ1zuHxOBsJM=";
+      rev = "f7b6da07ab55fe32ee5f7d62da56d8e5ac691a92";
+      hash = "sha256-mcmVYNWOUoQLiu4eM/EUudRg67Gcou13xuC6zv9aMKA=";
    };
    meta = {
      homepage = "https://www.nordtheme.com/ports/tmux";
@ -399,6 +399,7 @@ in rec {
          theme in order to work properly.
      '';
      license = lib.licenses.mit;
+      maintainers = [ lib.maintainers.sigmasquadron ];
    };
  };

--- a/pkgs/servers/pleroma/default.nix
+++ b/pkgs/servers/pleroma/default.nix
@ -1,5 +1,6 @@
 {
  lib,
+  stdenv,
  beamPackages,
  fetchFromGitHub,
  fetchFromGitLab,
@ -11,6 +12,7 @@
  vips,
  pkg-config,
  glib,
+  darwin,
  ...
 }:

@ -91,10 +93,16 @@ beamPackages.mixRelease rec {

      vix = prev.vix.override {
        nativeBuildInputs = [ pkg-config ];
-        buildInputs = [
-          vips
-          glib.dev
-        ];
+        buildInputs =
+          [
+            vips
+            glib.dev
+          ]
+          ++ lib.optionals stdenv.isDarwin [
+            darwin.apple_sdk.frameworks.Foundation
+            darwin.apple_sdk.frameworks.AppKit
+            darwin.apple_sdk.frameworks.Kerberos
+          ];
        VIX_COMPILATION_MODE = "PLATFORM_PROVIDED_LIBVIPS";
      };

--- a/pkgs/servers/xmpp/ejabberd/default.nix
+++ b/pkgs/servers/xmpp/ejabberd/default.nix
@ -1,13 +1,20 @@
-{ stdenv, writeScriptBin, makeWrapper, lib, fetchurl, git, cacert, libpng, libjpeg, libwebp
+{ stdenv, makeWrapper, lib, fetchurl, libpng, libjpeg, libwebp
 , erlang, openssl, expat, libyaml, bash, gnused, gnugrep, coreutils, util-linux, procps, gd
-, flock, autoreconfHook
+, autoreconfHook
 , gawk
+, rebar3WithPlugins
+, fetchFromGitHub
+, fetchgit
+, fetchHex
+, beamPackages
 , nixosTests
 , withMysql ? false
 , withPgsql ? false
 , withSqlite ? false, sqlite
 , withPam ? false, pam
 , withZlib ? true, zlib
+, withSip ? false
+, withLua ? false
 , withTools ? false
 , withRedis ? false
 , withImagemagick ? false, imagemagick
@ -15,83 +22,117 @@

 let
  ctlpath = lib.makeBinPath [ bash gnused gnugrep gawk coreutils util-linux procps ];
+
+  provider_asn1 = beamPackages.buildRebar3 {
+    name = "provider_asn1";
+    version = "0.3.0";
+    src = fetchHex {
+      pkg = "provider_asn1";
+      version = "0.3.0";
+      sha256 = "sha256-MuelWYZi01rBut8jM6a5alMZizPGZoBE/LveSRu/+wU=";
+    };
+    beamDeps = [ ];
+  };
+  rebar3_hex = beamPackages.buildRebar3 {
+    name = "rebar3_hex";
+    version = "7.0.7";
+    src = fetchHex {
+      pkg = "rebar3_hex";
+      version = "7.0.7";
+      sha256 = "sha256-1S2igSwiInATUgULZ1E6e2dK6YI5gvRffHRfF1Gg5Ok=";
+    };
+    beamDeps = [ ];
+  };
+
+  allBeamDeps = import ./rebar-deps.nix {  # TODO(@chuangzhu) add updateScript
+    inherit fetchHex fetchgit fetchFromGitHub;
+    builder = lib.makeOverridable beamPackages.buildRebar3;
+
+    overrides = final: prev: {
+      jiffy = prev.jiffy.override { buildPlugins = [ beamPackages.pc ]; };
+      cache_tab = prev.cache_tab.override { buildPlugins = [ beamPackages.pc ]; };
+      mqtree = prev.mqtree.override { buildPlugins = [ beamPackages.pc ]; };
+      stringprep = prev.stringprep.override { buildPlugins = [ beamPackages.pc ]; };
+      p1_acme = prev.p1_acme.override { buildPlugins = [ beamPackages.pc ]; };
+      eimp = prev.eimp.override {
+        buildInputs = [ gd libwebp libpng libjpeg ];
+        buildPlugins = [ beamPackages.pc ];
+      };
+      fast_tls = prev.fast_tls.override {
+        buildInputs = [ openssl ];
+        buildPlugins = [ beamPackages.pc ];
+      };
+      fast_xml = prev.fast_xml.override {
+        buildInputs = [ expat ];
+        buildPlugins = [ beamPackages.pc ];
+      };
+      fast_yaml = prev.fast_yaml.override {
+        buildInputs = [ libyaml ];
+        buildPlugins = [ beamPackages.pc ];
+      };
+      xmpp = prev.xmpp.override {
+        buildPlugins = [ beamPackages.pc provider_asn1 ];
+      };
+      # Optional deps
+      sqlite3 = prev.sqlite3.override {
+        buildInputs = [ sqlite ];
+        buildPlugins = [ beamPackages.pc ];
+      };
+      p1_mysql = prev.p1_acme.override { buildPlugins = [ beamPackages.pc ]; };
+      epam = prev.epam.override {
+        buildInputs = [ pam ];
+        buildPlugins = [ beamPackages.pc ];
+      };
+      esip = prev.esip.override { buildPlugins = [ beamPackages.pc ]; };
+      ezlib = prev.ezlib.override {
+        buildInputs = [ zlib ];
+        buildPlugins = [ beamPackages.pc ];
+      };
+    };
+  };
+
+  beamDeps = builtins.removeAttrs allBeamDeps [ "sqlite3" "p1_pgsql" "p1_mysql" "luerl" "esip" "eredis" "epam" "ezlib" ];
+
 in stdenv.mkDerivation rec {
  pname = "ejabberd";
-  version = "23.10";
+  version = "24.07";

-  nativeBuildInputs = [ makeWrapper autoreconfHook ];
+  nativeBuildInputs = [
+    makeWrapper
+    autoreconfHook
+    (rebar3WithPlugins { plugins = [ provider_asn1 rebar3_hex ]; })
+  ];

-  buildInputs = [ erlang openssl expat libyaml gd ]
-    ++ lib.optional withSqlite sqlite
-    ++ lib.optional withPam pam
-    ++ lib.optional withZlib zlib
+  buildInputs = [ erlang ]
+    ++ builtins.attrValues beamDeps
+    ++ lib.optional withMysql allBeamDeps.p1_mysql
+    ++ lib.optional withPgsql allBeamDeps.p1_pgsql
+    ++ lib.optional withSqlite allBeamDeps.sqlite3
+    ++ lib.optional withPam allBeamDeps.epam
+    ++ lib.optional withZlib allBeamDeps.ezlib
+    ++ lib.optional withSip allBeamDeps.esip
+    ++ lib.optional withLua allBeamDeps.luerl
+    ++ lib.optional withRedis allBeamDeps.eredis
  ;

  src = fetchurl {
    url = "https://www.process-one.net/downloads/downloads-action.php?file=/${version}/ejabberd-${version}.tar.gz";
-    hash = "sha256-DW5/DYLZHNqJ4lddmag1B0E9ov/eObIVGASUeioPolg=";
-    # remember to update the deps FOD hash & its pinned ejabberd-po commit
+    hash = "sha256-wPt0asuoGl20Hel8A5aMH2gaE7G2waiVtxguM4IMGNk=";
+    # remember to update rebar-deps.nix
  };

  passthru.tests = {
    inherit (nixosTests) ejabberd;
  };

-  deps = stdenv.mkDerivation {
-    pname = "ejabberd-deps";
-
-    inherit src version;
-
-    # pin ejabberd-po dep
-    # update: curl -L api.github.com/repos/processone/ejabberd-po/branches/main | jq .commit.sha -r
-    postPatch = ''
-      substituteInPlace rebar.config \
-        --replace \
-          '{git, "https://github.com/processone/ejabberd-po", {branch, "main"}}' \
-          '{git, "https://github.com/processone/ejabberd-po", {tag, "26d6463386588d39f07027dabff3cb8dd938bf6b"}}'
-    '';
-
-    configureFlags = [ "--enable-all" "--with-sqlite3=${sqlite.dev}" ];
-
-    nativeBuildInputs = [
-      git erlang openssl expat libyaml sqlite pam zlib autoreconfHook
-    ];
-
-    GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-
-    makeFlags = [ "deps" ];
-
-    installPhase = ''
-      for i in deps/*; do
-        ( cd $i
-          git reset --hard
-          git clean -ffdx
-          git describe --always --tags > .rev
-          rm -rf .git .github
-        )
-      done
-      # not a typo; comes from `make deps`
-      rm deps/.got
-
-      cp -r deps $out
-    '';
-
-    dontPatchELF = true;
-    dontStrip = true;
-    # avoid /nix/store references in the source
-    dontPatchShebangs = true;
-
-    outputHashAlgo = "sha256";
-    outputHashMode = "recursive";
-    outputHash = "sha256-HrLu3wTF+cUxpGX0yK3nbB57SRM2ND3Crlxs5/8FIwI=";
-  };
-
  configureFlags = [
    (lib.enableFeature withMysql "mysql")
    (lib.enableFeature withPgsql "pgsql")
    (lib.enableFeature withSqlite "sqlite")
    (lib.enableFeature withPam "pam")
    (lib.enableFeature withZlib "zlib")
+    (lib.enableFeature withSip "sip")
+    (lib.enableFeature withLua "lua")
    (lib.enableFeature withTools "tools")
    (lib.enableFeature withRedis "redis")
  ] ++ lib.optional withSqlite "--with-sqlite3=${sqlite.dev}";
@ -99,21 +140,20 @@ in stdenv.mkDerivation rec {
  enableParallelBuilding = true;

  postPatch = ''
-    cp -r $deps deps
-    chmod -R +w deps
    patchShebangs .
+    mkdir -p _build/default/lib
+    touch _build/default/lib/.got
+    touch _build/default/lib/.built
  '';

+  REBAR_IGNORE_DEPS = 1;
+
  postInstall = ''
    sed -i \
      -e '2iexport PATH=${ctlpath}:$PATH' \
-      -e 's,\(^ *FLOCK=\).*,\1${flock}/bin/flock,' \
-      -e 's,\(^ *JOT=\).*,\1,' \
-      -e 's,\(^ *CONNLOCKDIR=\).*,\1/var/lock/ejabberdctl,' \
+      -e "s,\(^ *ERL_LIBS=.*\),\1:$ERL_LIBS," \
      $out/sbin/ejabberdctl
-    wrapProgram $out/lib/eimp-*/priv/bin/eimp --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libpng libjpeg libwebp ]}"
    ${lib.optionalString withImagemagick ''wrapProgram $out/lib/ejabberd-*/priv/bin/captcha.sh --prefix PATH : "${lib.makeBinPath [ imagemagick ]}"''}
-    rm $out/bin/{mix,iex,elixir}
  '';

  meta = with lib; {
@ -122,6 +162,6 @@ in stdenv.mkDerivation rec {
    license = licenses.gpl2Plus;
    homepage = "https://www.ejabberd.im";
    platforms = platforms.linux;
-    maintainers = with maintainers; [ sander abbradar ];
+    maintainers = with maintainers; [ sander abbradar chuangzhu ];
  };
 }
--- a/pkgs/servers/xmpp/ejabberd/rebar-deps.nix
+++ b/pkgs/servers/xmpp/ejabberd/rebar-deps.nix
@ -0,0 +1,278 @@
+# Generated by rebar3_nix
+let fetchOnly = { src, ... }: src;
+in { builder ? fetchOnly, fetchHex, fetchgit, fetchFromGitHub, overrides ? (x: y: { }) }:
+let
+  self = packages // (overrides self packages);
+  packages = with self; {
+    unicode_util_compat = builder {
+      name = "unicode_util_compat";
+      version = "0.7.0";
+      src = fetchHex {
+        pkg = "unicode_util_compat";
+        version = "0.7.0";
+        sha256 = "sha256-Je7m1n32GWDPanlCOVZlmbCeF+Zo03ACR7xJhjgVJSE=";
+      };
+      beamDeps = [ ];
+    };
+    jiffy = builder {
+      name = "jiffy";
+      version = "1.1.2";
+      src = fetchHex {
+        pkg = "jiffy";
+        version = "1.1.2";
+        sha256 = "sha256-u2G8Qqcgu9M8sJpBDki7eaYQEsdMuLPnXybZiEhc84E=";
+      };
+      beamDeps = [ ];
+    };
+    base64url = builder {
+      name = "base64url";
+      version = "1.0.1";
+      src = fetchHex {
+        pkg = "base64url";
+        version = "1.0.1";
+        sha256 = "sha256-+bOt1HMaAqmwQQOYtHWzPnVmppU2Ujemve4btEdxn1w=";
+      };
+      beamDeps = [ ];
+    };
+    yconf = builder {
+      name = "yconf";
+      version = "1.0.16";
+      src = fetchHex {
+        pkg = "yconf";
+        version = "1.0.16";
+        sha256 = "sha256-6UeBMnPzhxHHsuWo5KzJpRx7voVPdEo0X2AwCzhYbIk=";
+      };
+      beamDeps = [ fast_yaml ];
+    };
+    xmpp = builder {
+      name = "xmpp";
+      version = "1.8.3";
+      src = fetchHex {
+        pkg = "xmpp";
+        version = "1.8.3";
+        sha256 = "sha256-7XAGX5qJqBjc/0O3TAgMnn9PFBThBRvt23KA24Ca9xE=";
+      };
+      beamDeps = [ ezlib fast_tls fast_xml idna p1_utils stringprep ];
+    };
+    stun = builder {
+      name = "stun";
+      version = "1.2.14";
+      src = fetchHex {
+        pkg = "stun";
+        version = "1.2.14";
+        sha256 = "sha256-4TSAext6jf/ZTmTu/uAOZce0BC89FOFvj0NWbSA3FYM=";
+      };
+      beamDeps = [ fast_tls p1_utils ];
+    };
+    stringprep = builder {
+      name = "stringprep";
+      version = "1.0.30";
+      src = fetchHex {
+        pkg = "stringprep";
+        version = "1.0.30";
+        sha256 = "sha256-9vybM4SgOHeDD4my84WAyvP0onRIpKMz1qjDl1wiC5o=";
+      };
+      beamDeps = [ p1_utils ];
+    };
+    sqlite3 = builder {
+      name = "sqlite3";
+      version = "1.1.15";
+      src = fetchHex {
+        pkg = "sqlite3";
+        version = "1.1.15";
+        sha256 = "sha256-PAuk4TMiwq1J3k4t3SgxE2at3lS+ro26nZ44iPadKFc=";
+      };
+      beamDeps = [ ];
+    };
+    pkix = builder {
+      name = "pkix";
+      version = "1.0.10";
+      src = fetchHex {
+        pkg = "pkix";
+        version = "1.0.10";
+        sha256 = "sha256-4CFk+DCUyxJMQbGrKJiKYV1Uua3DhXXwDxmll6OsXQ4=";
+      };
+      beamDeps = [ ];
+    };
+    p1_utils = builder {
+      name = "p1_utils";
+      version = "1.0.26";
+      src = fetchHex {
+        pkg = "p1_utils";
+        version = "1.0.26";
+        sha256 = "sha256-0DeejBFWuYvWT4Epwd4CL8yk8v23SGznO/DtLDN2sEw=";
+      };
+      beamDeps = [ ];
+    };
+    p1_pgsql = builder {
+      name = "p1_pgsql";
+      version = "1.1.27";
+      src = fetchHex {
+        pkg = "p1_pgsql";
+        version = "1.1.27";
+        sha256 = "sha256-jk0adgLLaHgOVdidxamy4arKP08e49GiXy+MPSNk/7k=";
+      };
+      beamDeps = [ xmpp ];
+    };
+    p1_oauth2 = builder {
+      name = "p1_oauth2";
+      version = "0.6.14";
+      src = fetchHex {
+        pkg = "p1_oauth2";
+        version = "0.6.14";
+        sha256 = "sha256-H9OsR05Dci2dWofG34029pjth697uBy7tmNhRR2Zro8=";
+      };
+      beamDeps = [ ];
+    };
+    p1_mysql = builder {
+      name = "p1_mysql";
+      version = "1.0.24";
+      src = fetchHex {
+        pkg = "p1_mysql";
+        version = "1.0.24";
+        sha256 = "sha256-8FiGX2Qlf1B6LGpa/zabE3XbyzCz1CWNrU8bPq/7ZV8=";
+      };
+      beamDeps = [ ];
+    };
+    p1_acme = builder {
+      name = "p1_acme";
+      version = "1.0.23";
+      src = fetchHex {
+        pkg = "p1_acme";
+        version = "1.0.23";
+        sha256 = "sha256-jOGW8m49IuoQt4CRIpUEZYeMEn+Adn4yUgeu1+jQ3Vk=";
+      };
+      beamDeps = [ base64url idna jiffy jose yconf ];
+    };
+    mqtree = builder {
+      name = "mqtree";
+      version = "1.0.17";
+      src = fetchHex {
+        pkg = "mqtree";
+        version = "1.0.17";
+        sha256 = "sha256-X+i3z4+8R4PQ/OuUZUrCu/MkKljNA5fSSd7YrgIb4qM=";
+      };
+      beamDeps = [ p1_utils ];
+    };
+    luerl = builder {
+      name = "luerl";
+      version = "1.2.0";
+      src = fetchHex {
+        pkg = "luerl";
+        version = "1.2.0";
+        sha256 = "sha256-nK/U9glP8PWp0nj9gdYNPgJsggvftsrNSxvZCfIbUl0=";
+      };
+      beamDeps = [ ];
+    };
+    jose = builder {
+      name = "jose";
+      version = "1.11.10";
+      src = fetchHex {
+        pkg = "jose";
+        version = "1.11.10";
+        sha256 = "sha256-DWzTb/i6F02ykUj8EStYQhhraKkM6fwrPsOv52WT5hQ=";
+      };
+      beamDeps = [ ];
+    };
+    idna = builder {
+      name = "idna";
+      version = "6.1.1";
+      src = fetchHex {
+        pkg = "idna";
+        version = "6.1.1";
+        sha256 = "sha256-kjdut4lEEu0ZrEdeSob3tBPBufu1vRbczVeTQVeUTOo=";
+      };
+      beamDeps = [ unicode_util_compat ];
+    };
+    fast_yaml = builder {
+      name = "fast_yaml";
+      version = "1.0.37";
+      src = fetchHex {
+        pkg = "fast_yaml";
+        version = "1.0.37";
+        sha256 = "sha256-jehochv34hckFPfTFI7eDzySK0lkVc1iXdXEQpUVp2k=";
+      };
+      beamDeps = [ p1_utils ];
+    };
+    fast_xml = builder {
+      name = "fast_xml";
+      version = "1.1.52";
+      src = fetchHex {
+        pkg = "fast_xml";
+        version = "1.1.52";
+        sha256 = "sha256-eVGSOQ4G0rZQFqaZC7+lcn9KJtKRSAixw8mjLu3NG/0=";
+      };
+      beamDeps = [ p1_utils ];
+    };
+    fast_tls = builder {
+      name = "fast_tls";
+      version = "1.1.21";
+      src = fetchHex {
+        pkg = "fast_tls";
+        version = "1.1.21";
+        sha256 = "sha256-ExVCkTk3Al5IzYCqgfADWWhtVQG3ViHnICaoe1IpUFs=";
+      };
+      beamDeps = [ p1_utils ];
+    };
+    ezlib = builder {
+      name = "ezlib";
+      version = "1.0.13";
+      src = fetchHex {
+        pkg = "ezlib";
+        version = "1.0.13";
+        sha256 = "sha256-nuYqs/jtVaD9EalWn8uORYaD+VV1QXJyGSsGnwkqv7s=";
+      };
+      beamDeps = [ p1_utils ];
+    };
+    esip = builder {
+      name = "esip";
+      version = "1.0.54";
+      src = fetchHex {
+        pkg = "esip";
+        version = "1.0.54";
+        sha256 = "sha256-gYevgZ1yWc2t2vaXJsI572BMmwsCmKXy0+aHv14iN+4=";
+      };
+      beamDeps = [ fast_tls p1_utils stun ];
+    };
+    eredis = builder {
+      name = "eredis";
+      version = "1.2.0";
+      src = fetchHex {
+        pkg = "eredis";
+        version = "1.2.0";
+        sha256 = "sha256-2bWr7ywsirqPMqoBggPgs9yLEVd3OyVKsdTCACMX8eE=";
+      };
+      beamDeps = [ ];
+    };
+    epam = builder {
+      name = "epam";
+      version = "1.0.14";
+      src = fetchHex {
+        pkg = "epam";
+        version = "1.0.14";
+        sha256 = "sha256-LzRJ5yiFpypsKoQ/VhrdD8L3DXoh9hRWkwpUdHPU2Yk=";
+      };
+      beamDeps = [ ];
+    };
+    eimp = builder {
+      name = "eimp";
+      version = "1.0.23";
+      src = fetchHex {
+        pkg = "eimp";
+        version = "1.0.23";
+        sha256 = "sha256-kHx4ACPLKJPk/Evb5qTwLDVZE4Yqxn8OzCZgXoFrYoo=";
+      };
+      beamDeps = [ p1_utils ];
+    };
+    cache_tab = builder {
+      name = "cache_tab";
+      version = "1.0.31";
+      src = fetchHex {
+        pkg = "cache_tab";
+        version = "1.0.31";
+        sha256 = "sha256-hYK2CkoJskfvhjVbqeB/zp4R7cA0WndckXH5cccrY1E=";
+      };
+      beamDeps = [ p1_utils ];
+    };
+  };
+in self
--- a/pkgs/shells/nushell/default.nix
+++ b/pkgs/shells/nushell/default.nix
@ -21,7 +21,7 @@
 }:

 let
-  version = "0.99.0";
+  version = "0.99.1";
 in

 rustPlatform.buildRustPackage {
@ -31,11 +31,11 @@ rustPlatform.buildRustPackage {
  src = fetchFromGitHub {
    owner = "nushell";
    repo = "nushell";
-    rev = version;
-    hash = "sha256-X/+i4CSGAkNQ7oW1kbDUj/g6Hbrf17IXwpNPVmkE4tU=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-amPQJW8ofSMh2cQQrqPNOp/p33KwPNX7fpZ4SiJGQHU=";
  };

-  cargoHash = "sha256-6cGzEZdk0zgrRRTHlnlEqZg8AcoUi2GR3wZ3iq4WGKA=";
+  cargoHash = "sha256-AblXOeSJGqrZY5aRzdst9F+ZB++/3Adu7Kri5lDsDH8=";

  nativeBuildInputs = [ pkg-config ]
    ++ lib.optionals (withDefaultFeatures && stdenv.hostPlatform.isLinux) [ python3 ]
--- a/pkgs/shells/nushell/plugins/default.nix
+++ b/pkgs/shells/nushell/plugins/default.nix
@ -7,7 +7,7 @@ lib.makeScope newScope (self: with self; {
  query = callPackage ./query.nix { inherit IOKit CoreFoundation; };
  regex = throw "`nu_plugin_regex` is no longer compatible with the current Nushell release.";
  net = callPackage ./net.nix { inherit IOKit CoreFoundation; };
-  units = callPackage ./units.nix { };
-  highlight = callPackage ./highlight.nix { };
+  units = callPackage ./units.nix  { inherit IOKit Foundation; };
+  highlight = callPackage ./highlight.nix { inherit IOKit Foundation; };
  dbus = callPackage ./dbus.nix { inherit dbus; nushell_plugin_dbus = self.dbus; };
 })
--- a/pkgs/shells/nushell/plugins/formats.nix
+++ b/pkgs/shells/nushell/plugins/formats.nix
@ -12,7 +12,7 @@
 rustPlatform.buildRustPackage rec {
  pname = "nushell_plugin_formats";
  inherit (nushell) version src;
-  cargoHash = "sha256-dfJ1EgbTygLky2sE6nW5fYiZDAfsrTb4Qw18u1nFNYY=";
+  cargoHash = "sha256-9wKJkZnbM8Zt90LlSTd9hb40Xuy2cOBThwUWyS2NuaI=";

  nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
--- a/pkgs/shells/nushell/plugins/gstat.nix
+++ b/pkgs/shells/nushell/plugins/gstat.nix
@ -12,7 +12,7 @@
 rustPlatform.buildRustPackage rec {
  pname = "nushell_plugin_gstat";
  inherit (nushell) version src;
-  cargoHash = "sha256-1Ct3VjqFuYFVOwb9tNrbEmz0PbIXdQhZqG9hUnYIk2s=";
+  cargoHash = "sha256-Z2A6DaARkffU7FABuLSTNeDLClRr4V21bD76ns8ueAM=";

  nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
  buildInputs = [ openssl ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ Security ];
--- a/pkgs/shells/nushell/plugins/highlight.nix
+++ b/pkgs/shells/nushell/plugins/highlight.nix
@ -5,22 +5,27 @@
  pkg-config,
  nix-update-script,
  fetchFromGitHub,
+  IOKit,
+  Foundation,
 }:

 rustPlatform.buildRustPackage rec {
  pname = "nushell_plugin_highlight";
-  version = "1.3.1+0.98.0";
+  version = "1.3.2+0.99.0";

  src = fetchFromGitHub {
    repo = "nu-plugin-highlight";
    owner = "cptpiepmatz";
-    rev = "v${version}";
-    hash = "sha256-G669d13JBLdy/1RUXtgZkiQhjgn3SqV34VlLbQoVOzc=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-rYS5Nqk+No1BhmEPzl+MX+aCH8fzHqdp8U8PKYSWVcc=";
  };
-  cargoHash = "sha256-ZZyxRiAaazLIwWtl9f30yp94HiKao3ZlYJ6B/vK14jc=";
+  cargoHash = "sha256-VHx+DLS+v4p++KI+ZLzJpFk4A5Omwy6E0vJ/lgP3pC0=";

  nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
-  buildInputs = [ ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+    IOKit
+    Foundation
+  ];
  cargoBuildFlags = [ "--package nu_plugin_highlight" ];

  checkPhase = ''
--- a/pkgs/shells/nushell/plugins/net.nix
+++ b/pkgs/shells/nushell/plugins/net.nix
@ -9,7 +9,7 @@
 }:

 rustPlatform.buildRustPackage rec {
-  pname = "nu-plugin-net";
+  pname = "nushell_plugin_net";
  version = "1.8.0";

  src = fetchFromGitHub {
--- a/pkgs/shells/nushell/plugins/polars.nix
+++ b/pkgs/shells/nushell/plugins/polars.nix
@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
  pname = "nushell_plugin_polars";
  inherit (nushell) version src;

-  cargoHash = "sha256-Lwmz3OXezzUzNG4PLCI1W/yvg4hfJAdNgA/2RI3nRUs=";
+  cargoHash = "sha256-bpZphNYHx9LkEu9JlGrIkks2M99JRjc+skY8MqPHMJA=";

  nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
  buildInputs =
--- a/pkgs/shells/nushell/plugins/query.nix
+++ b/pkgs/shells/nushell/plugins/query.nix
@ -14,7 +14,7 @@
 rustPlatform.buildRustPackage rec {
  pname = "nushell_plugin_query";
  inherit (nushell) version src;
-  cargoHash = "sha256-M55nMYsTlmJZWXaNPZJ3M7w34cxpZx49Ap+u1Pr/Htw=";
+  cargoHash = "sha256-4oSmt92nMIaSV7hLEBv5GIDYVmtT96O4qktO8ovdcBQ=";

  nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
  buildInputs =
--- a/pkgs/shells/nushell/plugins/units.nix
+++ b/pkgs/shells/nushell/plugins/units.nix
@ -5,6 +5,8 @@
  pkg-config,
  nix-update-script,
  fetchFromGitHub,
+  IOKit,
+  Foundation,
 }:

 rustPlatform.buildRustPackage rec {
@ -20,7 +22,10 @@ rustPlatform.buildRustPackage rec {
  cargoHash = "sha256-pxA+6E5luFHq/N0K/8Xk2LapwDnPqDUEpTYqP/jcc3s=";

  nativeBuildInputs = [ pkg-config ] ++ lib.optionals stdenv.cc.isClang [ rustPlatform.bindgenHook ];
-  buildInputs = [ ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+    IOKit
+    Foundation
+  ];
  cargoBuildFlags = [ "--package nu_plugin_units" ];

  passthru.updateScript = nix-update-script { };
--- a/pkgs/tools/misc/archi/default.nix
+++ b/pkgs/tools/misc/archi/default.nix
@ -4,6 +4,7 @@
 , makeWrapper
 , jdk
 , libsecret
+, glib
 , webkitgtk_4_0
 , wrapGAppsHook3
 , _7zz
@ -54,7 +55,7 @@ stdenv.mkDerivation rec {

        install -D -m755 Archi $out/libexec/Archi
        makeWrapper $out/libexec/Archi $out/bin/Archi \
-          --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ webkitgtk_4_0 ])} \
+          --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([ glib webkitgtk_4_0 ])} \
          --set WEBKIT_DISABLE_DMABUF_RENDERER 1 \
          --prefix PATH : ${jdk}/bin
      ''
--- a/pkgs/tools/misc/rshim-user-space/default.nix
+++ b/pkgs/tools/misc/rshim-user-space/default.nix
@ -15,13 +15,13 @@

 stdenv.mkDerivation rec {
  pname = "rshim-user-space";
-  version = "2.0.32";
+  version = "2.1.5";

  src = fetchFromGitHub {
    owner = "Mellanox";
    repo = pname;
    rev = "rshim-${version}";
-    hash = "sha256-GF7cKIf72EYRBRb6d3IWONE7YJwohTLKF1RGdDMTG6c=";
+    hash = "sha256-moU6XxBVSAZiiR/usFfxse2CHk6+003Jb9t62szk1fk=";
  };

  nativeBuildInputs = [
--- a/pkgs/tools/text/nltk-data/default.nix
+++ b/pkgs/tools/text/nltk-data/default.nix
@ -63,4 +63,9 @@ lib.makeScope newScope (self: {
    location = "corpora";
    hash = "sha256-8lMjW5YI8h6dHJ/83HVY2OYGDyKPpgkUAKPISiAKqqk=";
  };
+  wordnet = makeNltkDataPackage {
+    pname = "wordnet";
+    location = "corpora";
+    hash = "sha256-8lMjW5YI8h6dHJ/83HVY2OYGDyKPpgkUAKPISiAKqqk=";
+  };
 })
--- a/pkgs/tools/text/shfmt/default.nix
+++ b/pkgs/tools/text/shfmt/default.nix
@ -2,16 +2,16 @@

 buildGoModule rec {
  pname = "shfmt";
-  version = "3.9.0";
+  version = "3.10.0";

  src = fetchFromGitHub {
    owner = "mvdan";
    repo = "sh";
    rev = "v${version}";
-    hash = "sha256-sYfMMKBqaYf3dfFcxE9awUMW+Hk7ps0/zpVFHul7GWM=";
+    hash = "sha256-UI/f5EC5OOvwrxP1wfnNgEpY1DCwmekQohTILRvM2Gc=";
  };

-  vendorHash = "sha256-xm5qKSg7OU++mVtTeRwefL3J1Uf+a0nFdtlD7eulI8s=";
+  vendorHash = "sha256-p52IIzkAkcnqbxXBqQ92crYBrD84wQb/uVsTWX8EsPE=";

  subPackages = [ "cmd/shfmt" ];

--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -8351,7 +8351,7 @@ with pkgs;
  halibut = callPackage ../tools/typesetting/halibut { };

  halide = callPackage ../development/compilers/halide {
-    llvmPackages = llvmPackages_16;
+    llvmPackages = llvmPackages_18;
  };

  hareThirdParty = recurseIntoAttrs (callPackage ./hare-third-party.nix { });
@ -13319,8 +13319,7 @@ with pkgs;

  vimwiki-markdown = python3Packages.callPackage ../tools/misc/vimwiki-markdown { };

-  visidata = (newScope python3Packages) ../applications/misc/visidata {
-  };
+  visidata = python3Packages.callPackage ../applications/misc/visidata { };

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

@ -14369,8 +14368,8 @@ with pkgs;
  clang-tools = llvmPackages.clang-tools;

  clang-analyzer = callPackage ../development/tools/analysis/clang-analyzer {
-    llvmPackages = llvmPackages_14;
-    inherit (llvmPackages_14) clang;
+    llvmPackages = llvmPackages;
+    inherit (llvmPackages) clang;
  };

  clazy = callPackage ../development/tools/analysis/clazy {
@ -24247,7 +24246,7 @@ with pkgs;
  etcd_3_4 = callPackage ../servers/etcd/3.4.nix { };
  etcd_3_5 = callPackage ../servers/etcd/3.5 { };

-  ejabberd = callPackage ../servers/xmpp/ejabberd { erlang = erlang_24; };
+  ejabberd = callPackage ../servers/xmpp/ejabberd { };

  exhaustive = callPackage ../development/tools/exhaustive { };

@ -29548,8 +29547,6 @@ with pkgs;

  gitolite = callPackage ../applications/version-management/gitolite { };

-  gmrun = callPackage ../applications/misc/gmrun { };
-
  goffice = callPackage ../development/libraries/goffice { };

  gtkterm = callPackage ../tools/misc/gtkterm { };
@ -34712,8 +34709,6 @@ with pkgs;

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

-  gweled = callPackage ../games/gweled { };
-
  harmonist = callPackage ../games/harmonist { };

  hase = callPackage ../games/hase { };
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -5580,6 +5580,8 @@ self: super: with self; {

  hakuin = callPackage ../development/python-modules/hakuin { };

+  halide = toPythonModule (pkgs.halide.override { pythonSupport = true; python3Packages = self; });
+
  halo = callPackage ../development/python-modules/halo { };

  halohome = callPackage ../development/python-modules/halohome { };