Merge staging-next into staging

2026-08-25 17:55:21 +00:00 · 2023-11-26 06:01:19 +00:00
parent dc40324f59 b6eefb4ac4
commit 4069806fb6
99 changed files with 6800 additions and 8570 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10077,6 +10077,13 @@
    githubId = 2472678;
    name = "Lucas Desgouilles";
  };
+  ldprg = {
+    email = "lukas_4dr@gmx.at";
+    matrix = "@ldprg:matrix.org";
+    github = "LDprg";
+    githubId = 71488985;
+    name = "LDprg";
+  };
  league = {
    email = "league@contrapunctus.net";
    github = "league";
--- a/nixos/doc/manual/release-notes/rl-2311.section.md
+++ b/nixos/doc/manual/release-notes/rl-2311.section.md
@@ -150,6 +150,8 @@

 - [c2FmZQ](https://github.com/c2FmZQ/c2FmZQ/), an application that can securely encrypt, store, and share files, including but not limited to pictures and videos. Available as [services.c2fmzq-server](#opt-services.c2fmzq-server.enable).

+- [preload](http://sourceforge.net/projects/preload), a service that makes applications run faster by prefetching binaries and shared objects.  Available as [services.preload](#opt-services.preload.enable).
+
 ## Backward Incompatibilities {#sec-release-23.11-incompatibilities}

 - `services.postgresql.ensurePermissions` has been deprecated in favor of `services.postgresql.ensureUsers.*.ensureDBOwnership` which simplifies the setup of database owned by a certain system user
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -723,6 +723,7 @@
  ./services/misc/podgrab.nix
  ./services/misc/polaris.nix
  ./services/misc/portunus.nix
+  ./services/misc/preload.nix
  ./services/misc/prowlarr.nix
  ./services/misc/pufferpanel.nix
  ./services/misc/pykms.nix
@@ -1153,6 +1154,7 @@
  ./services/search/meilisearch.nix
  ./services/search/opensearch.nix
  ./services/search/qdrant.nix
+  ./services/search/sonic-server.nix
  ./services/search/typesense.nix
  ./services/security/aesmd.nix
  ./services/security/authelia.nix
--- a/nixos/modules/services/misc/preload.nix
+++ b/nixos/modules/services/misc/preload.nix
@@ -0,0 +1,31 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+  cfg = config.services.preload;
+in {
+  meta = { maintainers = pkgs.preload.meta.maintainers; };
+
+  options.services.preload = {
+    enable = mkEnableOption "preload";
+    package = mkPackageOption pkgs "preload" { };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.services.preload = {
+      description = "Loads data into ram during idle time of CPU.";
+      wantedBy = [ "multi-user.target" ];
+
+      serviceConfig = {
+        EnvironmentFile = "${cfg.package}/etc/conf.d/preload";
+        ExecStart = "${getExe cfg.package} --foreground $PRELOAD_OPTS";
+        Type = "simple";
+        # Only preload data during CPU idle time
+        IOSchedulingClass = 3;
+        DynamicUser = true;
+        StateDirectory = "preload";
+      };
+    };
+  };
+}
--- a/nixos/modules/services/search/sonic-server.nix
+++ b/nixos/modules/services/search/sonic-server.nix
@@ -0,0 +1,77 @@
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.services.sonic-server;
+
+  settingsFormat = pkgs.formats.toml { };
+  configFile = settingsFormat.generate "sonic-server-config.toml" cfg.settings;
+
+in {
+  meta.maintainers = [ lib.maintainers.anthonyroussel ];
+
+  options = {
+    services.sonic-server = {
+      enable = lib.mkEnableOption (lib.mdDoc "Sonic Search Index");
+
+      package = lib.mkPackageOptionMD pkgs "sonic-server" { };
+
+      settings = lib.mkOption {
+        type = lib.types.submodule { freeformType = settingsFormat.type; };
+        default = {
+          store.kv.path = "/var/lib/sonic/kv";
+          store.fst.path = "/var/lib/sonic/fst";
+        };
+        example = {
+          server.log_level = "debug";
+          channel.inet = "[::1]:1491";
+        };
+        description = lib.mdDoc ''
+          Sonic Server configuration options.
+
+          Refer to
+          <https://github.com/valeriansaliou/sonic/blob/master/CONFIGURATION.md>
+          for a full list of available options.
+        '';
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    services.sonic-server.settings = lib.mapAttrs (name: lib.mkDefault) {
+      server = {};
+      channel.search = {};
+      store = {
+        kv = {
+          path = "/var/lib/sonic/kv";
+          database = {};
+          pool = {};
+        };
+        fst = {
+          path = "/var/lib/sonic/fst";
+          graph = {};
+          pool = {};
+        };
+      };
+    };
+
+    systemd.services.sonic-server = {
+      description = "Sonic Search Index";
+
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+
+      serviceConfig = {
+        Type = "simple";
+
+        ExecStart = "${lib.getExe cfg.package} -c ${configFile}";
+        DynamicUser = true;
+        Group = "sonic";
+        LimitNOFILE = "infinity";
+        Restart = "on-failure";
+        StateDirectory = "sonic";
+        StateDirectoryMode = "750";
+        User = "sonic";
+      };
+    };
+  };
+}
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -766,6 +766,7 @@ in {
  sogo = handleTest ./sogo.nix {};
  solanum = handleTest ./solanum.nix {};
  sonarr = handleTest ./sonarr.nix {};
+  sonic-server = handleTest ./sonic-server.nix {};
  sourcehut = handleTest ./sourcehut.nix {};
  spacecookie = handleTest ./spacecookie.nix {};
  spark = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./spark {};
--- a/nixos/tests/gvisor.nix
+++ b/nixos/tests/gvisor.nix
@@ -1,6 +1,6 @@
 # This test runs a container through gvisor and checks if simple container starts

-import ./make-test-python.nix ({ pkgs, ...} : {
+import ./make-test-python.nix ({ pkgs, ... }: {
  name = "gvisor";
  meta = with pkgs.lib.maintainers; {
    maintainers = [ andrew-d ];
@@ -9,21 +9,21 @@ import ./make-test-python.nix ({ pkgs, ...} : {
  nodes = {
    gvisor =
      { pkgs, ... }:
-        {
-          virtualisation.docker = {
-            enable = true;
-            extraOptions = "--add-runtime runsc=${pkgs.gvisor}/bin/runsc";
-          };
-
-          networking = {
-            dhcpcd.enable = false;
-            defaultGateway = "192.168.1.1";
-            interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
-              { address = "192.168.1.2"; prefixLength = 24; }
-            ];
-          };
+      {
+        virtualisation.docker = {
+          enable = true;
+          extraOptions = "--add-runtime runsc=${pkgs.gvisor}/bin/runsc";
        };
-    };
+
+        networking = {
+          dhcpcd.enable = false;
+          defaultGateway = "192.168.1.1";
+          interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [
+            { address = "192.168.1.2"; prefixLength = 24; }
+          ];
+        };
+      };
+  };

  testScript = ''
    start_all()
@@ -31,13 +31,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
    gvisor.wait_for_unit("network.target")
    gvisor.wait_for_unit("sockets.target")

-    # Start by verifying that gvisor itself works
-    output = gvisor.succeed(
-        "${pkgs.gvisor}/bin/runsc -alsologtostderr do ${pkgs.coreutils}/bin/echo hello world"
-    )
-    assert output.strip() == "hello world"
-
-    # Also test the Docker runtime
+    # Test the Docker runtime
    gvisor.succeed("tar cv --files-from /dev/null | docker import - scratchimg")
    gvisor.succeed(
        "docker run -d --name=sleeping --runtime=runsc -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin scratchimg /bin/sleep 10"
--- a/nixos/tests/sonic-server.nix
+++ b/nixos/tests/sonic-server.nix
@@ -0,0 +1,22 @@
+import ./make-test-python.nix ({ pkgs, lib, ... }: {
+  name = "sonic-server";
+
+  meta = {
+    maintainers = with lib.maintainers; [ anthonyroussel ];
+  };
+
+  nodes.machine = { pkgs, ... }: {
+    services.sonic-server.enable = true;
+  };
+
+  testScript = ''
+    machine.start()
+
+    machine.wait_for_unit("sonic-server.service")
+    machine.wait_for_open_port(1491)
+
+    with subtest("Check control mode"):
+      result = machine.succeed('(echo START control; sleep 1; echo PING; echo QUIT) | nc localhost 1491').splitlines()
+      assert result[2] == "PONG", f"expected 'PONG', got '{result[2]}'"
+  '';
+})
--- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-packages.nix
@@ -64,6 +64,10 @@ self: let
        '';
      });

+      pq = super.pq.overrideAttrs (old: {
+        buildInputs = (old.buildInputs or [ ]) ++ [ pkgs.postgresql ];
+      });
+
      xeft = super.xeft.overrideAttrs (old: let
        libExt = pkgs.stdenv.hostPlatform.extensions.sharedLibrary;
      in {
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/llvm-mode/default.nix
@@ -7,7 +7,7 @@ trivialBuild {
  inherit (llvmPackages.llvm) src version;

  postUnpack = ''
-    sourceRoot="$sourceRoot/utils/emacs"
+    sourceRoot="$sourceRoot/llvm/utils/emacs"
  '';

  meta = {
--- a/pkgs/applications/finance/irpf/default.nix
+++ b/pkgs/applications/finance/irpf/default.nix
@@ -11,7 +11,7 @@

 stdenvNoCC.mkDerivation rec {
  pname = "irpf";
-  version = "2023-1.3";
+  version = "2023-1.5";

  # https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf
  # Para outros sistemas operacionais -> Multi
@@ -19,13 +19,13 @@ stdenvNoCC.mkDerivation rec {
    year = lib.head (lib.splitVersion version);
  in fetchzip {
    url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${version}.zip";
-    sha256 = "sha256-W9n9YlOg9BYsESuU5NOn+Ff+I+7vlBpFuKzHsGVJwAA=";
+    hash = "sha256-L1X+xysQSJ43TO8NSdO+T4aalampd4REL+5Uv33kYUI=";
  };

  nativeBuildInputs = [ unzip makeWrapper copyDesktopItems ];

  desktopItems = [
-    (makeDesktopItem rec {
+    (makeDesktopItem {
      name = pname;
      exec = pname;
      icon = "rfb64";
@@ -41,10 +41,9 @@ stdenvNoCC.mkDerivation rec {
    BASEDIR="$out/share/${pname}"
    mkdir -p "$BASEDIR"

-    cp -r help lib lib-modulos "$BASEDIR"
+    cp --no-preserve=mode -r help lib lib-modulos "$BASEDIR"

-    install -Dm755 irpf.jar "$BASEDIR/${pname}.jar"
-    install -Dm644 Leia-me.htm offline.png online.png pgd-updater.jar "$BASEDIR"
+    install -Dm644 irpf.jar Leia-me.htm offline.png online.png pgd-updater.jar "$BASEDIR"

    # make xdg-open overrideable at runtime
    makeWrapper ${jdk11}/bin/java $out/bin/${pname} \
--- a/pkgs/applications/misc/udiskie/default.nix
+++ b/pkgs/applications/misc/udiskie/default.nix
@@ -14,15 +14,15 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "udiskie";
-  version = "2.5.0";
+  version = "2.5.1";

-  format = "setuptools";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "coldfix";
    repo = "udiskie";
    rev = "v${version}";
-    hash = "sha256-wIXh7dzygjzSXo51LBt1BW+sar6qUELWC6oTGPDGgcE=";
+    hash = "sha256-bmpofyW5IBRmVlzHP9YRlI/JNnnamKfF9jCG85G0wBc=";
  };

  patches = [
@@ -37,6 +37,7 @@ python3.pkgs.buildPythonApplication rec {
    asciidoc # Man page
    gobject-introspection
    installShellFiles
+    python3.pkgs.setuptools
    wrapGAppsHook
  ];

--- a/pkgs/applications/networking/cluster/tilt/assets.nix
+++ b/pkgs/applications/networking/cluster/tilt/assets.nix
@@ -2,7 +2,7 @@
 , stdenvNoCC
 , version, src
 , fetchYarnDeps
-, fixup_yarn_lock, yarn, nodejs
+, prefetch-yarn-deps, yarn, nodejs
 }:

 stdenvNoCC.mkDerivation rec {
@@ -10,7 +10,7 @@ stdenvNoCC.mkDerivation rec {

  inherit src version;

-  nativeBuildInputs = [ fixup_yarn_lock yarn nodejs ];
+  nativeBuildInputs = [ prefetch-yarn-deps yarn nodejs ];

  yarnOfflineCache = fetchYarnDeps {
    yarnLock = "${src}/web/yarn.lock";
@@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation rec {
    yarn config --offline set yarn-offline-mirror $yarnOfflineCache

    cd web
-    fixup_yarn_lock yarn.lock
+    fixup-yarn-lock yarn.lock
    yarn install --offline --frozen-lockfile --ignore-engines
    patchShebangs node_modules
    export PATH=$PWD/node_modules/.bin:$PATH
--- a/pkgs/applications/networking/cluster/vcluster/default.nix
+++ b/pkgs/applications/networking/cluster/vcluster/default.nix
@@ -2,13 +2,13 @@

 buildGoModule rec {
  pname = "vcluster";
-  version = "0.16.4";
+  version = "0.17.0";

  src = fetchFromGitHub {
    owner = "loft-sh";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-LL+fikMTg79d9goFEkmxwYvF9E0GrPNTLmFy2tfnQtg=";
+    hash = "sha256-xmSp3cNqNv48gBWpt0Pnvl3l5gIyV1oPNGrB58X+OVU=";
  };

  vendorHash = null;
--- a/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock
+++ b/pkgs/applications/networking/feedreaders/newsflash/Cargo.lock
--- a/pkgs/applications/networking/feedreaders/newsflash/default.nix
+++ b/pkgs/applications/networking/feedreaders/newsflash/default.nix
@@ -7,6 +7,7 @@
 , ninja
 , pkg-config
 , rustc
+, blueprint-compiler
 , wrapGAppsHook4
 , gdk-pixbuf
 , glib
@@ -24,22 +25,22 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "newsflash";
-  version = "2.3.1";
+  version = "3.0.2";

  src = fetchFromGitLab {
    owner = "news-flash";
    repo = "news_flash_gtk";
    rev = "refs/tags/v.${finalAttrs.version}";
-    sha256 = "sha256-JUAlDc2mp8M0vjiWcDoyBw/sKCmd4J8e9wEwZoiW0AE=";
+    sha256 = "sha256-tJKr2bGkdpEb+25eN0ZfHhEDl5Zdf8fdaC/rNMbH8Ws=";
  };

  cargoDeps = rustPlatform.importCargoLock {
    lockFile = ./Cargo.lock;
    outputHashes = {
-      "javascriptcore6-0.1.0" = "sha256-7w8CDY13dCRlFc77XxJ2/xZqlKSjqM0eiOvILOrJ4ic=";
-      "news-flash-2.3.0-alpha.0" = "sha256-phoZmTY1YVZIIktqLMnal9H5SMgNWwx7m+7AMtDcFJM=";
-      "newsblur_api-0.2.0" = "sha256-6vnFeJbdFeIau2rpUk9o72DD2ZCqicljmQjFVhY71NI=";
-      "article_scraper-2.0.0-alpha.0" = "sha256-HPEKZc7O7pbgcwR2l0kD/5442W1hzrfMadc0amrjxwI=";
+      "news-flash-2.3.0-alpha.0" = "sha256-H0osT7IrPbQ3RQYJZE7J+n7u4UCT86LAybUF3vvIXkA=";
+      "newsblur_api-0.2.0" = "sha256-eysCB19znQF8mRwQ64nSp6KuvJ1Trot4g4WCdQDedo8=";
+      "article_scraper-2.0.0" = "sha256-FnOmrZyYewOuU8Au7fhmSJHN7UPCx/CxBV8UtSHattU=";
+      "commafeed_api-0.1.0" = "sha256-69UAmyUm0WG3qPoWZw4PekXh1RjIP5l3dx3gjWfxJDQ=";
    };
  };

@@ -70,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
    rustPlatform.cargoSetupHook
    cargo
    rustc
+    blueprint-compiler
  ];

  buildInputs = [
@@ -103,6 +105,6 @@ stdenv.mkDerivation (finalAttrs: {
    license = licenses.gpl3Plus;
    maintainers = with maintainers; [ kira-bruneau stunkymonkey ];
    platforms = platforms.unix;
-    mainProgram = "com.gitlab.newsflash";
+    mainProgram = "io.gitlab.news_flash.NewsFlash";
  };
 })
--- a/pkgs/applications/networking/feedreaders/newsflash/no-post-install.patch
+++ b/pkgs/applications/networking/feedreaders/newsflash/no-post-install.patch
@@ -2,9 +2,13 @@ diff --git a/meson.build b/meson.build
 index 1d7089c..1952e7f 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -61,5 +61,3 @@ meson.add_dist_script(
-   meson.source_root(),
-   join_paths(meson.build_root(), 'meson-dist', meson.project_name() + '-' + newsflash_version)
+@@ -58,8 +58,8 @@ meson.add_dist_script(
+ subdir('src')
+
+ gnome.post_install(
+-  gtk_update_icon_cache: true,
+  gtk_update_icon_cache: false,
+   glib_compile_schemas: false,
+-  update_desktop_database: true,
+  update_desktop_database: false,
 )
-
-meson.add_install_script('build-aux/meson_post_install.py')
--- a/pkgs/applications/networking/instant-messengers/fractal-next/Cargo.lock
+++ b/pkgs/applications/networking/instant-messengers/fractal-next/Cargo.lock
--- a/pkgs/applications/networking/instant-messengers/fractal-next/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fractal-next/default.nix
@@ -1,86 +0,0 @@
-{ stdenv
-, lib
-, fetchFromGitLab
-, cargo
-, meson
-, ninja
-, rustPlatform
-, rustc
-, pkg-config
-, glib
-, gtk4
-, gtksourceview5
-, libadwaita
-, gstreamer
-, gst-plugins-base
-, gst-plugins-bad
-, desktop-file-utils
-, appstream-glib
-, openssl
-, pipewire
-, libshumate
-, wrapGAppsHook4
-, sqlite
-, xdg-desktop-portal
-}:
-
-stdenv.mkDerivation rec {
-  pname = "fractal-next";
-  version = "5.beta2";
-
-  src = fetchFromGitLab {
-    domain = "gitlab.gnome.org";
-    owner = "GNOME";
-    repo = "fractal";
-    rev = version;
-    hash = "sha256-/BO+TlhLhi7BGsHq8aOpYw8AqNrJT0IJZOc1diq2Rys=";
-  };
-
-  cargoDeps = rustPlatform.importCargoLock {
-    lockFile = ./Cargo.lock;
-    outputHashes = {
-      "matrix-sdk-0.6.2" = "sha256-A1oKNbEx2A6WwvYcNSW53Fd6QWwr0QFJtrsJXO2KInE=";
-      "ruma-0.8.2" = "sha256-kCGS7ACFGgmtTUElLJQMYfjwJ3glF7bRPZYJIFcuPtc=";
-      "curve25519-dalek-4.0.0" = "sha256-sxEFR6lsX7t4u/fhWd6wFMYETI2egPUbjMeBWkB289E=";
-      "vodozemac-0.4.0" = "sha256-TCbWJ9bj/FV3ILWUTcksazel8ESTNTiDGL7kGlEGvow=";
-    };
-  };
-
-  nativeBuildInputs = [
-    glib
-    gtk4
-    meson
-    ninja
-    pkg-config
-    rustPlatform.bindgenHook
-    rustPlatform.cargoSetupHook
-    cargo
-    rustc
-    desktop-file-utils
-    appstream-glib
-    wrapGAppsHook4
-  ];
-
-  buildInputs = [
-    glib
-    gstreamer
-    gst-plugins-base
-    gst-plugins-bad
-    gtk4
-    gtksourceview5
-    libadwaita
-    openssl
-    pipewire
-    libshumate
-    sqlite
-    xdg-desktop-portal
-  ];
-
-  meta = with lib; {
-    description = "Matrix group messaging app (development version)";
-    homepage = "https://gitlab.gnome.org/GNOME/fractal";
-    license = licenses.gpl3Plus;
-    maintainers = teams.gnome.members ++ (with maintainers; [ anselmschueler ]);
-    mainProgram = "fractal";
-  };
-}
--- a/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock
+++ b/pkgs/applications/networking/instant-messengers/fractal/Cargo.lock
--- a/pkgs/applications/networking/instant-messengers/fractal/default.nix
+++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix
@@ -5,88 +5,74 @@
 , cargo
 , meson
 , ninja
-, gettext
-, python3
 , rustPlatform
 , rustc
 , pkg-config
-, gtksourceview4
 , glib
-, libhandy_0
-, gtk3
-, dbus
-, openssl
-, sqlite
+, gtk4
+, gtksourceview5
+, libadwaita
 , gst_all_1
-, cairo
-, gdk-pixbuf
-, gspell
-, wrapGAppsHook
+, desktop-file-utils
+, appstream-glib
+, openssl
+, pipewire
+, libshumate
+, wrapGAppsHook4
+, sqlite
+, xdg-desktop-portal
 }:

 stdenv.mkDerivation rec {
  pname = "fractal";
-  version = "4.4.2";
+  version = "5";

  src = fetchFromGitLab {
    domain = "gitlab.gnome.org";
    owner = "GNOME";
    repo = "fractal";
    rev = version;
-    hash = "sha256-/vPadtyiYDX0PdneMxc0oSWb5OYnikevqajl3WgZiGA=";
+    hash = "sha256-XHb8HjQ5PDL2sen6qUivDllvYEhKnp1vQynD2Lksi30=";
  };

  cargoDeps = rustPlatform.importCargoLock {
    lockFile = ./Cargo.lock;
    outputHashes = {
-      "either-1.5.99" = "sha256-Lmv9OPZKEb7tmkN+7Mua2nx0xmZwm3d1W623UKUlPeg=";
-      "gettext-rs-0.4.2" = "sha256-wyZ1bf0oFcQo8gEi2GEalRUoKMoJYHysu79qcfjd4Ng=";
-      "sourceview4-0.2.0" = "sha256-RuCg05/qjkPri1QUd5acsGVqJtGvM5OO8/R+Nibxoa4=";
+      "matrix-sdk-0.6.2" = "sha256-X+4077rlaE8zjXHXPUfiYwa/+Bg0KTFrcsAg7yCz4ug=";
+      "mas-http-0.5.0-rc.2" = "sha256-XH+I5URcbkSY4NDwfOFhIjb+/swuGz6n9hKufziPgoY=";
    };
  };

  nativeBuildInputs = [
-    gettext
+    glib
+    gtk4
    meson
    ninja
    pkg-config
-    python3
-    cargo
+    rustPlatform.bindgenHook
    rustPlatform.cargoSetupHook
+    cargo
    rustc
-    wrapGAppsHook
-    glib
+    desktop-file-utils
+    appstream-glib
+    wrapGAppsHook4
  ];

  buildInputs = [
-    cairo
-    dbus
-    gdk-pixbuf
    glib
-    gspell
-    gst_all_1.gst-editing-services
-    gst_all_1.gst-plugins-bad
-    gst_all_1.gst-plugins-base
-    (gst_all_1.gst-plugins-good.override {
-      gtkSupport = true;
-    })
-    gst_all_1.gstreamer
-    gst_all_1.gst-devtools
-    gtk3
-    gtksourceview4
-    libhandy_0
+    gtk4
+    gtksourceview5
+    libadwaita
    openssl
+    pipewire
+    libshumate
    sqlite
-  ];
-
-  postPatch = ''
-    chmod +x scripts/test.sh
-    patchShebangs scripts/meson_post_install.py scripts/test.sh
-  '';
-
-  preConfigure = ''
-    export GETTEXT_DIR="${gettext}"
-  '';
+    xdg-desktop-portal
+  ] ++ (with gst_all_1; [
+    gstreamer
+    gst-plugins-base
+    gst-plugins-bad
+  ]);

  passthru = {
    updateScript = nix-update-script { };
@@ -95,8 +81,8 @@ stdenv.mkDerivation rec {
  meta = with lib; {
    description = "Matrix group messaging app";
    homepage = "https://gitlab.gnome.org/GNOME/fractal";
-    license = licenses.gpl3;
-    maintainers = teams.gnome.members ++ (with maintainers; [ dtzWill ]);
-    platforms = platforms.unix;
+    license = licenses.gpl3Plus;
+    maintainers = teams.gnome.members ++ (with maintainers; [ anselmschueler dtzWill ]);
+    mainProgram = "fractal";
  };
 }
--- a/pkgs/applications/networking/warp/default.nix
+++ b/pkgs/applications/networking/warp/default.nix
@@ -21,14 +21,14 @@

 stdenv.mkDerivation rec {
  pname = "warp";
-  version = "0.5.4";
+  version = "0.6.1";

  src = fetchFromGitLab {
    domain = "gitlab.gnome.org";
    owner = "World";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-twK0C2BvD3GLmJ9H05sas0bce/dIMIWeCoFRU/f+1eg=";
+    hash = "sha256-Uc9N2kRTpi9cCFskngkiclLpEcp4dtI2mhldG4s/GFY=";
  };

  postPatch = ''
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
  cargoDeps = rustPlatform.fetchCargoTarball {
    inherit src;
    name = "${pname}-${version}";
-    hash = "sha256-mxM+V4gWGfW8M56+kV/Ljtzde7oRPH0twJtEImkUIF4=";
+    hash = "sha256-GN9TjsGBU3D/mc6/XtRAk5pliKRPTQ9f3fMdS6weCaE=";
  };

  nativeBuildInputs = [
--- a/pkgs/applications/office/foliate/default.nix
+++ b/pkgs/applications/office/foliate/default.nix
@@ -1,41 +1,52 @@
-{ stdenv, lib, fetchFromGitHub, meson, gettext, glib, gjs, ninja, python3, gtk3
-, webkitgtk_4_1, gsettings-desktop-schemas, wrapGAppsHook, desktop-file-utils
-, gobject-introspection, glib-networking }:
+{ stdenv
+, lib
+, fetchFromGitHub
+, meson
+, gettext
+, glib
+, gjs
+, ninja
+, gtk4
+, webkitgtk_6_0
+, gsettings-desktop-schemas
+, wrapGAppsHook4
+, desktop-file-utils
+, gobject-introspection
+, glib-networking
+, pkg-config
+, libadwaita
+}:

 stdenv.mkDerivation rec {
  pname = "foliate";
-  version = "2.6.4";
+  version = "3.0.1";

  src = fetchFromGitHub {
    owner = "johnfactotum";
    repo = pname;
    rev = version;
-    sha256 = "sha256-Pr2YA2MHXD4W7lyCxGAVLKyoZarZ8t92RSkWle3LNuc=";
+    hash = "sha256-ksjd/H62c9dhoOXQtrKqexAjLMGd/adP/fL78fYRi/Y=";
+    fetchSubmodules = true;
  };

-  nativeBuildInputs = [ meson ninja python3 wrapGAppsHook gobject-introspection ];
-
-  postPatch = ''
-    patchShebangs build-aux/meson/postinstall.py
-
-    substituteInPlace src/main.js \
-      --replace "'WebKit2': '4.0'" "'WebKit2': '4.1'"
-  '';
-
-  postFixup = ''
-    sed -i "1 a imports.package._findEffectiveEntryPointName = () => 'com.github.johnfactotum.Foliate';" $out/bin/.com.github.johnfactotum.Foliate-wrapped
-    ln -s $out/bin/com.github.johnfactotum.Foliate $out/bin/foliate
-  '';
+  nativeBuildInputs = [
+    desktop-file-utils
+    gobject-introspection
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook4
+  ];

  buildInputs = [
    gettext
+    gjs
    glib
    glib-networking
-    gjs
-    gtk3
-    webkitgtk_4_1
-    desktop-file-utils
    gsettings-desktop-schemas
+    gtk4
+    libadwaita
+    webkitgtk_6_0
  ];

  meta = with lib; {
--- a/pkgs/applications/science/electronics/kicad/versions.nix
+++ b/pkgs/applications/science/electronics/kicad/versions.nix
@@ -3,23 +3,23 @@
 {
  "kicad" = {
    kicadVersion = {
-      version =			"7.0.7";
+      version =			"7.0.9";
      src = {
-        rev =			"dc7665e950aa0d42de36e928af48be3b060ba5d1";
-        sha256 =		"1xbzf29rhqh6kl0vggdn2dblgp927096fc1lr3y4yw63b8n0qq50";
+        rev =			"1c81053cc40579ecd5febef1aeb1164008039deb";
+        sha256 =		"1hq9rba1gcks14zwbr8nbicpsil4imslgfch6ll33fhizbks3fq4";
      };
    };
    libVersion = {
-      version =			"7.0.7";
+      version =			"7.0.9";
      libSources = {
-        symbols.rev =		"c7df225d1c79b3ea842c77d928ce1f9bc1a63c5b";
-        symbols.sha256 =	"1wr754m4ykidds3i14gqhvyrj3mbkchp2hkfnr0rjsdaqf4zmqdf";
-        templates.rev =		"1561dd81d116a661a17147c3b941a3e96335eecc";
-        templates.sha256 =	"1qi20mrsfn4fxmr1fyphmil2i9p2nzmwk5rlfchc5aq2194nj3lq";
-        footprints.rev =	"ecb85886616b7a6bb957699037f6fb680ce01d30";
-        footprints.sha256 =	"0xnnivlqgcyaz9qay73p43jnvmvshp2b3fbh3569j7rmgi5pn8x0";
-        packages3d.rev =	"4fb0672db1d405b661d0cde8edb5d54ac0a95fc7";
-        packages3d.sha256 =	"141r5wd8s1bgyf77kvb9q14cpsiwwv4zmfzwbgcd42rflsk2lcbc";
+        symbols.rev =		"1ed4ed6c0696e50165b8e3d7978136a05db2d7c3";
+        symbols.sha256 =	"0ynsnjq3z126cjkgm1fjbjvdvpc0walnr42ya9dv46l27kxy2j77";
+        templates.rev =		"856bacc6782ea8c9bcb5a49a2d438a4689e0579b";
+        templates.sha256 =	"11582ldnv7hkljmhaym83962kixq1hjbfmdrn5laq7l4jk3l19vh";
+        footprints.rev =	"fe7b9aec7635caabbaa85fa8a15b85038394099b";
+        footprints.sha256 =	"16a4c2xs4i8wbm01a901yxabxk0qdsjkzlccfawddv82bkh4b87h";
+        packages3d.rev =	"5bc66f3c0f6dabf09df6c5188b8d955968500eab";
+        packages3d.sha256 =	"1cly28vc07i54v487zbb8d1h70nrd3naxvq146b0xnbrjwnd2q28";
      };
    };
  };
--- a/pkgs/applications/science/electronics/magic-vlsi/default.nix
+++ b/pkgs/applications/science/electronics/magic-vlsi/default.nix
@@ -13,11 +13,11 @@

 stdenv.mkDerivation rec {
  pname = "magic-vlsi";
-  version = "8.3.447";
+  version = "8.3.449";

  src = fetchurl {
    url    = "http://opencircuitdesign.com/magic/archive/magic-${version}.tgz";
-    sha256 = "sha256-t/gJ43VIdBIiozLfqaTy7tJsXK674gWBbW1aPHKEj3U=";
+    sha256 = "sha256-y0+HS1LkIFwcgDbHEvs5SXJY2b340RDT7KVupp+ZX9Y=";
  };

  nativeBuildInputs = [ python3 ];
--- a/pkgs/applications/system/asusctl/Cargo.lock
+++ b/pkgs/applications/system/asusctl/Cargo.lock
@@ -115,9 +115,9 @@ dependencies = [

 [[package]]
 name = "aho-corasick"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6748e8def348ed4d14996fa801f4122cd763fff530258cdc03f64b25f89d3a5a"
+checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783"
 dependencies = [
 "memchr",
 ]
@@ -169,16 +169,15 @@ checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"

 [[package]]
 name = "arboard"
-version = "3.2.0"
+version = "3.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6041616acea41d67c4a984709ddab1587fd0b10efe5cc563fee954d2f011854"
+checksum = "ac57f2b058a76363e357c056e4f74f1945bf734d37b8b3ef49066c4787dde0fc"
 dependencies = [
 "clipboard-win",
 "log",
 "objc",
 "objc-foundation",
 "objc_id",
- "once_cell",
 "parking_lot",
 "thiserror",
 "winapi",
@@ -199,7 +198,7 @@ checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"

 [[package]]
 name = "asusctl"
-version = "4.7.1"
+version = "4.7.2"
 dependencies = [
 "asusd",
 "cargo-husky",
@@ -218,7 +217,7 @@ dependencies = [

 [[package]]
 name = "asusd"
-version = "4.7.1"
+version = "4.7.2"
 dependencies = [
 "async-trait",
 "cargo-husky",
@@ -242,7 +241,7 @@ dependencies = [

 [[package]]
 name = "asusd-user"
-version = "4.7.1"
+version = "4.7.2"
 dependencies = [
 "cargo-husky",
 "config-traits",
@@ -368,13 +367,13 @@ dependencies = [

 [[package]]
 name = "async-recursion"
-version = "1.0.4"
+version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e97ce7de6cf12de5d7226c73f5ba9811622f4db3a5b91b55c53e987e5f91cba"
+checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.31",
 ]

 [[package]]
@@ -391,7 +390,7 @@ checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.31",
 ]

 [[package]]
@@ -486,9 +485,9 @@ dependencies = [

 [[package]]
 name = "base64"
-version = "0.21.2"
+version = "0.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "604178f6c5c21f02dc555784810edfb88d34ac2c73b2eae109655649ee73ce3d"
+checksum = "414dcefbc63d77c526a76b3afcf6fbb9b5e2791c19c3aa2297733208750c6e53"

 [[package]]
 name = "bindgen"
@@ -582,22 +581,22 @@ checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"

 [[package]]
 name = "bytemuck"
-version = "1.13.1"
+version = "1.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17febce684fd15d89027105661fec94afb475cb995fbc59d2865198446ba2eea"
+checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
 dependencies = [
 "bytemuck_derive",
 ]

 [[package]]
 name = "bytemuck_derive"
-version = "1.4.1"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdde5c9cd29ebd706ce1b35600920a33550e402fc998a2e53ad3b42c3c47a192"
+checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.31",
 ]

 [[package]]
@@ -608,9 +607,9 @@ checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"

 [[package]]
 name = "bytes"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"

 [[package]]
 name = "cairo-rs"
@@ -715,16 +714,16 @@ dependencies = [

 [[package]]
 name = "chrono"
-version = "0.4.26"
+version = "0.4.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec837a71355b28f6556dbd569b37b3f363091c0bd4b2e735674521b4c5fd9bc5"
+checksum = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877"
 dependencies = [
 "android-tzdata",
 "iana-time-zone",
 "js-sys",
 "num-traits",
 "wasm-bindgen",
- "winapi",
+ "windows-targets 0.48.5",
 ]

 [[package]]
@@ -771,7 +770,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f76990911f2267d837d9d0ad060aa63aaad170af40904b29461734c339030d4d"
 dependencies = [
 "quote",
- "syn 2.0.29",
+ "syn 2.0.31",
 ]

 [[package]]
@@ -785,7 +784,7 @@ dependencies = [

 [[package]]
 name = "config-traits"
-version = "4.7.1"
+version = "4.7.2"
 dependencies = [
 "cargo-husky",
 "log",
@@ -1089,7 +1088,7 @@ checksum = "5e9a1f9f7d83e59740248a6e14ecf93929ade55027844dfcea78beafccc15745"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.31",
 ]

 [[package]]
@@ -1129,9 +1128,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"

 [[package]]
 name = "errno"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f"
+checksum = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd"
 dependencies = [
 "errno-dragonfly",
 "libc",
@@ -1296,7 +1295,7 @@ checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.31",
 ]

 [[package]]
@@ -1836,7 +1835,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
 dependencies = [
 "hermit-abi",
- "rustix 0.38.9",
+ "rustix 0.38.11",
 "windows-sys 0.48.0",
 ]

@@ -2047,9 +2046,9 @@ dependencies = [

 [[package]]
 name = "memchr"
-version = "2.5.0"
+version = "2.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"

 [[package]]
 name = "memmap2"
@@ -2187,16 +2186,15 @@ dependencies = [

 [[package]]
 name = "nix"
-version = "0.26.2"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
+checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b"
 dependencies = [
 "bitflags 1.3.2",
 "cfg-if",
 "libc",
 "memoffset 0.7.1",
 "pin-utils",
- "static_assertions",
 ]

 [[package]]
@@ -2284,7 +2282,7 @@ dependencies = [
 "proc-macro-crate",
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.31",
 ]

 [[package]]
@@ -2350,9 +2348,9 @@ dependencies = [

 [[package]]
 name = "object"
-version = "0.32.0"
+version = "0.32.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77ac5bbd07aea88c60a577a1ce218075ffd59208b2d7ca97adf9bfc5aeb21ebe"
+checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
 dependencies = [
 "memchr",
 ]
@@ -2478,9 +2476,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"

 [[package]]
 name = "pix"
-version = "0.13.2"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c2b6992b377680150280d4708bda8207ba9e71f70507b5504f2e28d8e8e48c1"
+checksum = "5de5067af0cd27add969cdb4ef2eecc955f59235f3b7a75a3c6ac9562cfb6b81"

 [[package]]
 name = "pkg-config"
@@ -2661,9 +2659,9 @@ dependencies = [

 [[package]]
 name = "regex"
-version = "1.9.3"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81bc1d4caf89fac26a70747fe603c130093b53c773888797a6329091246d651a"
+checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -2673,9 +2671,9 @@ dependencies = [

 [[package]]
 name = "regex-automata"
-version = "0.3.6"
+version = "0.3.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fed1ceff11a1dddaee50c9dc8e4938bd106e9d89ae372f192311e7da498e3b69"
+checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795"
 dependencies = [
 "aho-corasick",
 "memchr",
@@ -2684,13 +2682,13 @@ dependencies = [

 [[package]]
 name = "regex-syntax"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2"
+checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"

 [[package]]
 name = "rog-control-center"
-version = "4.7.1"
+version = "4.7.2"
 dependencies = [
 "asusd",
 "cargo-husky",
@@ -2702,7 +2700,7 @@ dependencies = [
 "gumdrop",
 "libappindicator",
 "log",
- "nix 0.26.2",
+ "nix 0.26.4",
 "notify-rust",
 "png_pong",
 "rog_anime",
@@ -2723,7 +2721,7 @@ dependencies = [

 [[package]]
 name = "rog_anime"
-version = "4.7.1"
+version = "4.7.2"
 dependencies = [
 "cargo-husky",
 "gif",
@@ -2740,7 +2738,7 @@ dependencies = [

 [[package]]
 name = "rog_aura"
-version = "4.7.1"
+version = "4.7.2"
 dependencies = [
 "cargo-husky",
 "log",
@@ -2754,7 +2752,7 @@ dependencies = [

 [[package]]
 name = "rog_dbus"
-version = "4.7.1"
+version = "4.7.2"
 dependencies = [
 "cargo-husky",
 "rog_anime",
@@ -2766,7 +2764,7 @@ dependencies = [

 [[package]]
 name = "rog_platform"
-version = "4.7.1"
+version = "4.7.2"
 dependencies = [
 "cargo-husky",
 "concat-idents",
@@ -2785,7 +2783,7 @@ dependencies = [

 [[package]]
 name = "rog_profiles"
-version = "4.7.1"
+version = "4.7.2"
 dependencies = [
 "cargo-husky",
 "log",
@@ -2798,7 +2796,7 @@ dependencies = [

 [[package]]
 name = "rog_simulators"
-version = "4.7.1"
+version = "4.7.2"
 dependencies = [
 "glam",
 "log",
@@ -2866,9 +2864,9 @@ dependencies = [

 [[package]]
 name = "rustix"
-version = "0.38.9"
+version = "0.38.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bfe0f2582b4931a45d1fa608f8a8722e8b3c7ac54dd6d5f3b3212791fedef49"
+checksum = "c0c3dde1fc030af041adc40e79c0e7fbcf431dd24870053d187d7c66e4b87453"
 dependencies = [
 "bitflags 2.4.0",
 "errno",
@@ -2963,7 +2961,7 @@ checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.31",
 ]

 [[package]]
@@ -2985,7 +2983,7 @@ checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.31",
 ]

 [[package]]
@@ -3010,9 +3008,9 @@ dependencies = [

 [[package]]
 name = "shlex"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43b2853a4d09f215c24cc5489c992ce46052d359b5109343cbafbf26bc62f8a3"
+checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380"

 [[package]]
 name = "signal-hook"
@@ -3150,7 +3148,7 @@ checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731"
 [[package]]
 name = "supergfxctl"
 version = "5.1.2"
-source = "git+https://gitlab.com/asus-linux/supergfxctl.git#c2a1bb3461c7abbcdabecdc463d668555120f953"
+source = "git+https://gitlab.com/asus-linux/supergfxctl.git#af23df7596712bb9433a3be917febadeb3f1f419"
 dependencies = [
 "log",
 "logind-zbus",
@@ -3175,9 +3173,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.29"
+version = "2.0.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c324c494eba9d92503e6f1ef2e6df781e78f6a7705a0202d9801b198807d518a"
+checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -3241,7 +3239,7 @@ dependencies = [
 "cfg-if",
 "fastrand 2.0.0",
 "redox_syscall 0.3.5",
- "rustix 0.38.9",
+ "rustix 0.38.11",
 "windows-sys 0.48.0",
 ]

@@ -3256,29 +3254,29 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "1.0.47"
+version = "1.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97a802ec30afc17eee47b2855fc72e0c4cd62be9b4efe6591edde0ec5bd68d8f"
+checksum = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.47"
+version = "1.0.48"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b"
+checksum = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.31",
 ]

 [[package]]
 name = "time"
-version = "0.3.27"
+version = "0.3.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0bb39ee79a6d8de55f48f2293a830e040392f1c5f16e336bdd1788cd0aadce07"
+checksum = "17f6bb557fd245c28e6411aa56b6403c689ad95061f50e4be16c274e70a17e48"
 dependencies = [
 "deranged",
 "serde",
@@ -3364,7 +3362,7 @@ checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.31",
 ]

 [[package]]
@@ -3430,7 +3428,7 @@ checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.29",
+ "syn 2.0.31",
 ]

 [[package]]
@@ -3540,9 +3538,9 @@ dependencies = [

 [[package]]
 name = "url"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50bff7831e19200a85b17131d085c25d7811bc4e186efdaf54bbd132994a88cb"
+checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
 dependencies = [
 "form_urlencoded",
 "idna",
@@ -3591,9 +3589,9 @@ checksum = "9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"

 [[package]]
 name = "walkdir"
-version = "2.3.3"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36df944cda56c7d8d8b7496af378e6b16de9284591917d307c9b4d313c44e698"
+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
 dependencies = [
 "same-file",
 "winapi-util",
@@ -4138,15 +4136,15 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2769203cd13a0c6015d515be729c526d041e9cf2c0cc478d57faee85f40c6dcd"
 dependencies = [
- "nix 0.26.2",
+ "nix 0.26.4",
 "winapi",
 ]

 [[package]]
 name = "xml-rs"
-version = "0.8.16"
+version = "0.8.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "47430998a7b5d499ccee752b41567bc3afc57e1327dc855b1a2aa44ce29b5fa1"
+checksum = "1eee6bf5926be7cf998d7381a9a23d833fd493f6a8034658a9505a4dc4b20444"

 [[package]]
 name = "zbus"
@@ -4172,7 +4170,7 @@ dependencies = [
 "futures-sink",
 "futures-util",
 "hex",
- "nix 0.26.2",
+ "nix 0.26.4",
 "once_cell",
 "ordered-stream",
 "rand",
--- a/pkgs/applications/system/asusctl/default.nix
+++ b/pkgs/applications/system/asusctl/default.nix
@@ -13,13 +13,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "asusctl";
-  version = "4.7.1";
+  version = "4.7.2";

  src = fetchFromGitLab {
    owner = "asus-linux";
    repo = "asusctl";
    rev = version;
-    hash = "sha256-T/KAhKoxZRdbJspL+Fkos6YqVhiUxCtxbCSm+8CX1to=";
+    hash = "sha256-q4V0Cn6kZeyIMGxu/blVi/Ot8LIcv+GlZhpkTQNTjRU=";
  };

  cargoHash = "";
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
    outputHashes = {
      "ecolor-0.21.0" = "sha256-m7eHX6flwO21umtx3dnIuVUnNsEs3ZCyOk5Vvp/lVfI=";
      "notify-rust-4.6.0" = "sha256-jhCgisA9f6AI9e9JQUYRtEt47gQnDv5WsdRKFoKvHJs=";
-      "supergfxctl-5.1.2" = "sha256-1XCIltd7o+Bc+UXmeuPAXdPKU86UP0p+Qh0gTZyrbH8=";
+      "supergfxctl-5.1.2" = "sha256-HJGyjFeN3bq+ArCGfFHAMnjW76wSnNyxPWR0ELcyjLg=";
    };
  };

--- a/pkgs/applications/version-management/forgejo/default.nix
+++ b/pkgs/applications/version-management/forgejo/default.nix
@@ -39,14 +39,14 @@ let
 in
 buildGoModule rec {
  pname = "forgejo";
-  version = "1.20.5-0";
+  version = "1.20.5-1";

  src = fetchFromGitea {
    domain = "codeberg.org";
    owner = "forgejo";
    repo = "forgejo";
    rev = "v${version}";
-    hash = "sha256-tuwMvSWaMUc/GghmrbGLtyjixwOwiapWEOMD9QmMLic=";
+    hash = "sha256-4arWZge+RC2lwa6CQIEsDHo229cElspm0TJo3JHz2WQ=";
  };

  vendorHash = "sha256-dgtZjsLBwblhdge3BvdbK/mN/TeZKps9K5dJbqomtjo=";
--- a/pkgs/applications/video/quvi/library.nix
+++ b/pkgs/applications/video/quvi/library.nix
@@ -1,23 +0,0 @@
-{ lib, stdenv, fetchurl, pkg-config, lua5, curl, quvi_scripts, libproxy, libgcrypt, glib }:
-
-stdenv.mkDerivation rec {
-  pname = "libquvi";
-  version="0.9.4";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/quvi/libquvi-${version}.tar.xz";
-    sha256 = "1cl1kbgxl1jnx2nwx4z90l0lap09lnnj1fg7hxsxk3m6aj4y4grd";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ lua5 curl quvi_scripts libproxy libgcrypt glib ];
-
-  meta = {
-    description = "Web video downloader";
-    homepage = "http://quvi.sf.net";
-    license = lib.licenses.lgpl21Plus;
-    platforms = lib.platforms.linux;
-    maintainers = [ ];
-    broken = true; # missing glibc-2.34 support, no upstream activity
-  };
-}
--- a/pkgs/applications/video/quvi/scripts.nix
+++ b/pkgs/applications/video/quvi/scripts.nix
@@ -1,22 +0,0 @@
-{lib, stdenv, fetchurl, pkg-config}:
-
-stdenv.mkDerivation rec {
-  pname = "quvi-scripts";
-  version="0.9.20131130";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/quvi/libquvi-scripts-${version}.tar.xz";
-    sha256 = "1qvp6z5k1qgcys7vf7jd6fm0g07xixmciwj14ypn1kqhmjgizwhp";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-
-  meta = {
-    description = "Web video downloader";
-    homepage = "http://quvi.sf.net";
-    license = lib.licenses.lgpl21Plus;
-    platforms = lib.platforms.linux;
-    maintainers = [ ];
-    broken = true; # missing glibc-2.34 support, no upstream activity
-  };
-}
--- a/pkgs/applications/video/quvi/tool.nix
+++ b/pkgs/applications/video/quvi/tool.nix
@@ -1,26 +0,0 @@
-{lib, stdenv, fetchurl, pkg-config, lua5, curl, quvi_scripts, libquvi, lua5_sockets, glib, makeWrapper}:
-
-stdenv.mkDerivation rec {
-  pname = "quvi";
-  version="0.9.5";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/quvi/quvi-${version}.tar.xz";
-    sha256 = "1h52s265rp3af16dvq1xlscp2926jqap2l4ah94vrfchv6m1hffb";
-  };
-
-  nativeBuildInputs = [ pkg-config makeWrapper ];
-  buildInputs = [ lua5 curl quvi_scripts libquvi glib ];
-  postInstall = ''
-      wrapProgram $out/bin/quvi --set LUA_PATH "${lua5_sockets}/share/lua/${lua5.luaversion}/?.lua"
-  '';
-
-  meta = {
-    description = "Web video downloader";
-    homepage = "http://quvi.sf.net";
-    license = lib.licenses.lgpl21Plus;
-    platforms = lib.platforms.linux;
-    maintainers = [ ];
-    broken = true; # missing glibc-2.34 support, no upstream activity
-  };
-}
--- a/pkgs/applications/virtualization/OVMF/default.nix
+++ b/pkgs/applications/virtualization/OVMF/default.nix
@@ -7,7 +7,9 @@
 , tpmSupport ? false
 , tlsSupport ? false
 , debug ? false
-, sourceDebug ? debug
+# Usually, this option is broken, do not use it except if you know what you are
+# doing.
+, sourceDebug ? false
 }:

 assert csmSupport -> seabios != null;
@@ -20,6 +22,8 @@ let
    "OvmfPkg/OvmfPkgX64.dsc"
  else if stdenv.hostPlatform.isAarch then
    "ArmVirtPkg/ArmVirtQemu.dsc"
+  else if stdenv.hostPlatform.isRiscV then
+    "OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc"
  else
    throw "Unsupported architecture";

@@ -67,7 +71,8 @@ edk2.mkDerivation projectDscPath (finalAttrs: {
    cp ${seabios}/Csm16.bin OvmfPkg/Csm/Csm16/Csm16.bin
  '';

-  postFixup = if stdenv.hostPlatform.isAarch then ''
+  postFixup = (
+    if stdenv.hostPlatform.isAarch then ''
    mkdir -vp $fd/FV
    mkdir -vp $fd/AAVMF
    mv -v $out/FV/QEMU_{EFI,VARS}.fd $fd/FV
@@ -80,10 +85,18 @@ edk2.mkDerivation projectDscPath (finalAttrs: {
    # Also add symlinks for Fedora dir layout: https://src.fedoraproject.org/cgit/rpms/edk2.git/tree/edk2.spec
    ln -s $fd/FV/AAVMF_CODE.fd $fd/AAVMF/QEMU_EFI-pflash.raw
    ln -s $fd/FV/AAVMF_VARS.fd $fd/AAVMF/vars-template-pflash.raw
-  '' else ''
+  ''
+  else if stdenv.hostPlatform.isRiscV then ''
+    mkdir -vp $fd/FV
+
+    mv -v $out/FV/RISCV_VIRT_{CODE,VARS}.fd $fd/FV/
+    truncate -s 32M $fd/FV/RISCV_VIRT_CODE.fd
+    truncate -s 32M $fd/FV/RISCV_VIRT_VARS.fd
+  ''
+  else ''
    mkdir -vp $fd/FV
    mv -v $out/FV/OVMF{,_CODE,_VARS}.fd $fd/FV
-  '';
+  '');

  dontPatchELF = true;

@@ -105,5 +118,6 @@ edk2.mkDerivation projectDscPath (finalAttrs: {
    license = lib.licenses.bsd2;
    inherit (edk2.meta) platforms;
    maintainers = with lib.maintainers; [ adamcstephens raitobezarius ];
+    broken = stdenv.isDarwin;
  };
 })
--- a/pkgs/applications/virtualization/gvisor/default.nix
+++ b/pkgs/applications/virtualization/gvisor/default.nix
@@ -1,4 +1,5 @@
 { lib
+, nixosTests
 , buildGoModule
 , fetchFromGitHub
 , iproute2
@@ -7,9 +8,9 @@
 , procps
 }:

-buildGoModule rec {
+buildGoModule {
  pname = "gvisor";
-  version = "20221102.1";
+  version = "20231113.0";

  # gvisor provides a synthetic go branch (https://github.com/google/gvisor/tree/go)
  # that can be used to build gvisor without bazel.
@@ -18,11 +19,11 @@ buildGoModule rec {
  src = fetchFromGitHub {
    owner = "google";
    repo = "gvisor";
-    rev = "bf8eeee3a9eb966bc72c773da060a3c8bb73b8ff";
-    sha256 = "sha256-rADQsJ+AnBVlfQURGJl1xR6Ad5NyRWSrBSpOFMRld+o=";
+    rev = "cdaf5c462c4040ed4cc88989e43f7d373acb9d24";
+    hash = "sha256-9d2AJXoGFRCSM6900gOBxNBgL6nxXqz/pPan5EeEdsI=";
  };

-  vendorHash = "sha256-iGLWxx/Kn1QaJTNOZcc+mwoF3ecEDOkaqmA0DH4pdgU=";
+  vendorHash = "sha256-QdsVELNcIVsZv2gA05YgQfMZ6hmnfN2GGqW6r+mHqbs=";

  nativeBuildInputs = [ makeWrapper ];

@@ -39,6 +40,8 @@ buildGoModule rec {
    mv $out/bin/shim $out/bin/containerd-shim-runsc-v1
  '';

+  passthru.tests = { inherit (nixosTests) gvisor; };
+
  meta = with lib; {
    description = "Application Kernel for Containers";
    homepage = "https://github.com/google/gvisor";
--- a/pkgs/applications/window-managers/sway/fx.nix
+++ b/pkgs/applications/window-managers/sway/fx.nix
@@ -27,9 +27,10 @@ sway-unwrapped.overrideAttrs (oldAttrs: rec {
  meta = with lib; {
    description = "Sway, but with eye candy!";
    homepage = "https://github.com/WillPower3309/swayfx";
-    maintainers = with maintainers; [ ricarch97 ];
    license = licenses.mit;
+    maintainers = with maintainers; [ eclairevoyant ricarch97 ];
    platforms = platforms.linux;
+    mainProgram = "sway";

    longDescription = ''
      Fork of Sway, an incredible and one of the most well established Wayland
--- a/pkgs/applications/window-managers/sway/wrapper.nix
+++ b/pkgs/applications/window-managers/sway/wrapper.nix
@@ -1,5 +1,4 @@
 { lib
-, sway-unwrapped
 , makeWrapper, symlinkJoin, writeShellScriptBin
 , withBaseWrapper ? true, extraSessionCommands ? "", dbus
 , withGtkWrapper ? false, wrapGAppsHook, gdk-pixbuf, glib, gtk3
@@ -11,6 +10,8 @@
 , dbusSupport ? true
 }:

+sway-unwrapped:
+
 assert extraSessionCommands != "" -> withBaseWrapper;

 with lib;
--- a/pkgs/by-name/ga/gatus/package.nix
+++ b/pkgs/by-name/ga/gatus/package.nix
@@ -0,0 +1,26 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+  pname = "gatus";
+  version = "5.7.0";
+
+  src = fetchFromGitHub {
+    owner = "TwiN";
+    repo = "gatus";
+    rev = "v${version}";
+    hash = "sha256-GG5p2sAIameGo6IFt3IBwFuLfVFRbfHjrQrG6Ei9odA=";
+  };
+
+  vendorHash = "sha256-VYHBqVFXX7fUuW2UqPOlbRDEfcysYvjSlfm0UJ2mMGM=";
+
+  subPackages = [ "." ];
+
+  meta = with lib;
+    {
+      description = "Automated developer-oriented status page";
+      homepage = "https://gatus.io";
+      license = licenses.asl20;
+      maintainers = with maintainers; [ undefined-moe ];
+      mainProgram = "gatus";
+    };
+}
--- a/pkgs/by-name/hy/hyprshot/package.nix
+++ b/pkgs/by-name/hy/hyprshot/package.nix
@@ -0,0 +1,46 @@
+{ stdenvNoCC
+, lib
+, fetchFromGitHub
+, hyprland
+, jq
+, grim
+, slurp
+, wl-clipboard
+, libnotify
+, makeWrapper
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "hyprshot";
+  version = "1.2.3";
+
+  src = fetchFromGitHub {
+    owner = "Gustash";
+    repo = "hyprshot";
+    rev = finalAttrs.version;
+    hash = "sha256-sew47VR5ZZaLf1kh0d8Xc5GVYbJ1yWhlug+Wvf+k7iY=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 hyprshot -t "$out/bin"
+    wrapProgram "$out/bin/hyprshot" \
+      --prefix PATH ":" ${lib.makeBinPath [
+          hyprland jq grim slurp wl-clipboard libnotify
+        ]}
+
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    homepage = "https://github.com/Gustash/hyprshot";
+    description = "Hyprshot is an utility to easily take screenshots in Hyprland using your mouse.";
+    license = licenses.gpl3Only;
+    maintainers = with maintainers; [ Cryolitia ];
+    mainProgram = "hyprshot";
+    platforms = hyprland.meta.platforms;
+  };
+})
--- a/pkgs/by-name/im/impression/package.nix
+++ b/pkgs/by-name/im/impression/package.nix
@@ -16,24 +16,25 @@
 , glib
 , gtk4
 , libadwaita
+, openssl
 , pango
 }:

 stdenv.mkDerivation rec {
  pname = "impression";
-  version = "2.1";
+  version = "3.0.1";

  src = fetchFromGitLab {
    owner = "adhami3310";
    repo = "Impression";
    rev = "v${version}";
-    hash = "sha256-Pq1Pz/uNBsk4UdtCwA5gmZoS+kiDrCbpum4ABW7oocA=";
+    hash = "sha256-xxPclDjHdXWo43cwvSuF9MpNlMTJANNXScLY1mkQTqY=";
  };

  cargoDeps = rustPlatform.fetchCargoTarball {
    inherit src;
    name = "${pname}-${version}";
-    hash = "sha256-eIfDuz4ewTzmLDKShro3VkoXAZEUOKu133eD/z75jjY=";
+    hash = "sha256-LDYckpKwNvkIdpPijTRIZPNfb4d9MZzxVFdSXarhFl0=";
  };

  nativeBuildInputs = [
@@ -55,6 +56,7 @@ stdenv.mkDerivation rec {
    glib
    gtk4
    libadwaita
+    openssl
    pango
  ];

--- a/pkgs/by-name/oh/oh-my-fish/001-writable-omf-path.diff
+++ b/pkgs/by-name/oh/oh-my-fish/001-writable-omf-path.diff
@@ -0,0 +1,12 @@
+diff -Naur source/bin/install source-new/bin/install
+--- source/bin/install	1969-12-31 21:00:01.000000000 -0300
+++ source-new/bin/install	2023-11-23 12:48:55.695330320 -0300
+@@ -245,6 +245,8 @@
+   command cp -r "$OFFLINE_PATH" "$OMF_PATH"
+     or abort "Failed to copy source!"
+
+  chmod -R u+w "$OMF_PATH"
+
+   # Set up Git remotes only if the offline install is a Git repository.
+   test -d "$OMF_PATH/.git"
+     and set_git_remotes
--- a/pkgs/by-name/oh/oh-my-fish/omf-install
+++ b/pkgs/by-name/oh/oh-my-fish/omf-install
@@ -0,0 +1,6 @@
+#!@runtimeShell@
+
+@fish@/bin/fish \
+    @OMF@/share/oh-my-fish/bin/install \
+    --noninteractive \
+    --offline=@OMF@/share/oh-my-fish
--- a/pkgs/shells/fish/oh-my-fish/default.nix
+++ b/pkgs/shells/fish/oh-my-fish/default.nix
@@ -3,7 +3,7 @@
 , fetchFromGitHub
 , fish
 , runtimeShell
-, writeShellScript
+, substituteAll
 }:

 stdenv.mkDerivation (finalAttrs: {
@@ -11,41 +11,45 @@ stdenv.mkDerivation (finalAttrs: {
  version = "unstable-2022-03-27";

  src = fetchFromGitHub {
-    owner = finalAttrs.pname;
-    repo = finalAttrs.pname;
+    owner = "oh-my-fish";
+    repo = "oh-my-fish";
    rev = "d428b723c8c18fef3b2a00b8b8b731177f483ad8";
    hash = "sha256-msItKEPe7uSUpDAfCfdYZjt5NyfM3KtOrLUTO9NGqlg=";
  };

-  strictDeps = true;
+  patches = [
+    ./001-writable-omf-path.diff
+  ];
+
  buildInputs = [
    fish
  ];

+  strictDeps = true;
+
  dontConfigure = true;
  dontBuild = true;

  installPhase = ''
    runHook preInstall

-    mkdir -pv $out/bin $out/share/${finalAttrs.pname}
-    cp -vr * $out/share/${finalAttrs.pname}
+    mkdir -pv $out/bin $out/share/oh-my-fish
+    cp -vr * $out/share/oh-my-fish

-    cat << EOF > $out/bin/omf-install
-    #!${runtimeShell}
+    cp -v ${substituteAll {
+      name = "omf-install";
+      src = ./omf-install;
+      OMF = placeholder "out";
+      inherit fish runtimeShell;
+    }} $out/bin/omf-install

-    ${fish}/bin/fish \\
-      $out/share/${finalAttrs.pname}/bin/install \\
-      --noninteractive \\
-      --offline=$out/share/${finalAttrs.pname}
-
-    EOF
    chmod +x $out/bin/omf-install
+    cat $out/bin/omf-install

    runHook postInstall
  '';

-  meta = with lib; {
+  meta = {
    homepage = "https://github.com/oh-my-fish/oh-my-fish";
    description = "The Fish Shell Framework";
    longDescription = ''
@@ -53,10 +57,10 @@ stdenv.mkDerivation (finalAttrs: {
      which extend or modify the look of your shell. It's fast, extensible and
      easy to use.
    '';
-    license = licenses.mit;
-    maintainers = with maintainers; [ AndersonTorres ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ];
    mainProgram = "omf-install";
-    platforms = fish.meta.platforms;
+    inherit (fish.meta) platforms;
  };
 })
 # TODO: customize the omf-install script
--- a/pkgs/by-name/pr/preload/0001-prevent-building-to-var-directories.patch
+++ b/pkgs/by-name/pr/preload/0001-prevent-building-to-var-directories.patch
@@ -0,0 +1,54 @@
+diff --git a/Makefile.in b/Makefile.in
+index e4072e4..4a6b069 100644
+--- a/Makefile.in
+++ b/Makefile.in
+@@ -327,23 +327,9 @@ installcheck-initdSCRIPTS: $(initd_SCRIPTS)
+ 	    else echo "$$f does not support $$opt" 1>&2; bad=1; fi; \
+ 	  done; \
+ 	done; rm -f c$${pid}_.???; exit $$bad
+-install-logDATA: $(log_DATA)
+-	@$(NORMAL_INSTALL)
+-	test -z "$(logdir)" || $(MKDIR_P) "$(DESTDIR)$(logdir)"
+-	@list='$(log_DATA)'; for p in $$list; do \
+-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f=$(am__strip_dir) \
+-	  echo " $(logDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(logdir)/$$f'"; \
+-	  $(logDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(logdir)/$$f"; \
+-	done
+install-logDATA: 
+ 
+ uninstall-logDATA:
+-	@$(NORMAL_UNINSTALL)
+-	@list='$(log_DATA)'; for p in $$list; do \
+-	  f=$(am__strip_dir) \
+-	  echo " rm -f '$(DESTDIR)$(logdir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(logdir)/$$f"; \
+-	done
+ install-logrotateDATA: $(logrotate_DATA)
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(logrotatedir)" || $(MKDIR_P) "$(DESTDIR)$(logrotatedir)"
+@@ -361,23 +347,9 @@ uninstall-logrotateDATA:
+ 	  echo " rm -f '$(DESTDIR)$(logrotatedir)/$$f'"; \
+ 	  rm -f "$(DESTDIR)$(logrotatedir)/$$f"; \
+ 	done
+-install-pkglocalstateDATA: $(pkglocalstate_DATA)
+-	@$(NORMAL_INSTALL)
+-	test -z "$(pkglocalstatedir)" || $(MKDIR_P) "$(DESTDIR)$(pkglocalstatedir)"
+-	@list='$(pkglocalstate_DATA)'; for p in $$list; do \
+-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f=$(am__strip_dir) \
+-	  echo " $(pkglocalstateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkglocalstatedir)/$$f'"; \
+-	  $(pkglocalstateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkglocalstatedir)/$$f"; \
+-	done
+install-pkglocalstateDATA: 
+ 
+ uninstall-pkglocalstateDATA:
+-	@$(NORMAL_UNINSTALL)
+-	@list='$(pkglocalstate_DATA)'; for p in $$list; do \
+-	  f=$(am__strip_dir) \
+-	  echo " rm -f '$(DESTDIR)$(pkglocalstatedir)/$$f'"; \
+-	  rm -f "$(DESTDIR)$(pkglocalstatedir)/$$f"; \
+-	done
+ install-sysconfigDATA: $(sysconfig_DATA)
+ 	@$(NORMAL_INSTALL)
+ 	test -z "$(sysconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(sysconfigdir)"
--- a/pkgs/by-name/pr/preload/package.nix
+++ b/pkgs/by-name/pr/preload/package.nix
@@ -0,0 +1,34 @@
+{ lib, stdenv, fetchzip, autoconf, automake, pkg-config, glib }:
+
+stdenv.mkDerivation rec {
+  pname = "preload";
+  version = "0.6.4";
+
+  src = fetchzip {
+    url = "mirror://sourceforge/preload/preload-${version}.tar.gz";
+    hash = "sha256-vAIaSwvbUFyTl6DflFhuSaMuX9jPVBah+Nl6c/fUbAM=";
+  };
+
+  patches = [
+    # Prevents creation of /var directories on build
+    ./0001-prevent-building-to-var-directories.patch
+  ];
+
+  nativeBuildInputs = [ autoconf automake pkg-config ];
+  buildInputs = [ glib ];
+
+  configureFlags = [ "--localstatedir=/var" ];
+
+  postInstall = ''
+    make sysconfigdir=$out/etc/conf.d install
+  '';
+
+  meta = with lib; {
+    description = "Makes applications run faster by prefetching binaries and shared objects";
+    homepage = "https://sourceforge.net/projects/preload";
+    license = licenses.gpl2Only;
+    platforms = lib.platforms.linux;
+    mainProgram = "preload";
+    maintainers = with maintainers; [ ldprg ];
+  };
+}
--- a/pkgs/applications/emulators/rpcs3/99-ds3-controllers.rules
+++ b/pkgs/applications/emulators/rpcs3/99-ds3-controllers.rules
--- a/pkgs/applications/emulators/rpcs3/99-ds4-controllers.rules
+++ b/pkgs/applications/emulators/rpcs3/99-ds4-controllers.rules
--- a/pkgs/applications/emulators/rpcs3/99-dualsense-controllers.rules
+++ b/pkgs/applications/emulators/rpcs3/99-dualsense-controllers.rules
--- a/pkgs/applications/emulators/rpcs3/default.nix
+++ b/pkgs/applications/emulators/rpcs3/default.nix
@@ -1,13 +1,10 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, wrapQtAppsHook
 , cmake
 , pkg-config
 , git
-, qtbase
-, qtquickcontrols
-, qtmultimedia
+, qt6Packages
 , openal
 , glew
 , vulkan-headers
@@ -34,10 +31,12 @@

 let
  # Keep these separate so the update script can regex them
-  rpcs3GitVersion = "15409-fd6829f75";
-  rpcs3Version = "0.0.28-15409-fd6829f75";
-  rpcs3Revision = "fd6829f7576da07e3bb90de8821834d3ce44610c";
-  rpcs3Hash = "sha256-I/CYDE7te8xxKjTyH1Mb45uemya5Sfjb96MQWlkFAbk=";
+  rpcs3GitVersion = "15726-ebf48800e";
+  rpcs3Version = "0.0.29-15726-ebf48800e";
+  rpcs3Revision = "ebf48800e6bf2569fa0a59974ab2daaeb3a92f23";
+  rpcs3Hash = "sha256-HJQ+DCZy8lwMCfq0N9StKD8bP1hCBxGMAucbQ9esy/I=";
+
+  inherit (qt6Packages) qtbase qtmultimedia wrapQtAppsHook;
 in
 stdenv.mkDerivation {
  pname = "rpcs3";
@@ -82,7 +81,7 @@ stdenv.mkDerivation {
  nativeBuildInputs = [ cmake pkg-config git wrapQtAppsHook ];

  buildInputs = [
-    qtbase qtquickcontrols qtmultimedia openal glew vulkan-headers vulkan-loader libpng ffmpeg
+    qtbase qtmultimedia openal glew vulkan-headers vulkan-loader libpng ffmpeg
    libevdev zlib libusb1 curl wolfssl python3 pugixml flatbuffers llvm_16 libSM
  ] ++ cubeb.passthru.backendLibs
    ++ lib.optionals faudioSupport [ faudio SDL2 ]
--- a/pkgs/applications/emulators/rpcs3/update.sh
+++ b/pkgs/applications/emulators/rpcs3/update.sh
@@ -57,4 +57,4 @@ sed -i -E \
    -e "s/rpcs3Version\s*=\s*\"[\.a-z0-9-]+\";$/rpcs3Version = \"${final_ver}\";/g" \
    -e "s/rpcs3Revision\s*=\s*\"[a-z0-9]+\";$/rpcs3Revision = \"${commit_sha}\";/g" \
    -e "s|rpcs3Hash\s*=\s*\"sha256-.*\";$|rpcs3Hash = \"${nix_hash}\";|g" \
-    "$ROOT/default.nix"
+    "$ROOT/package.nix"
--- a/pkgs/development/compilers/edk2/default.nix
+++ b/pkgs/development/compilers/edk2/default.nix
@@ -21,6 +21,8 @@ else if stdenv.isAarch32 then
  "ARM"
 else if stdenv.isAarch64 then
  "AARCH64"
+else if stdenv.hostPlatform.isRiscV64 then
+  "RISCV64"
 else
  throw "Unsupported architecture";

@@ -31,7 +33,7 @@ buildType = if stdenv.isDarwin then

 edk2 = stdenv.mkDerivation rec {
  pname = "edk2";
-  version = "202308";
+  version = "202311";

  patches = [
    # pass targetPrefix as an env var
@@ -46,7 +48,7 @@ edk2 = stdenv.mkDerivation rec {
    repo = "edk2";
    rev = "edk2-stable${edk2.version}";
    fetchSubmodules = true;
-    hash = "sha256-Eoi1xf/hw/Knr7n0f0rgVof7wTgrHkmvV4eJjJV1NhM=";
+    hash = "sha256-gC/If8U9qo70rGvNl3ld/mmZszwY0w/5Ge/K21mhzYw=";
  };

  # We don't want EDK2 to keep track of OpenSSL,
@@ -60,11 +62,12 @@ edk2 = stdenv.mkDerivation rec {
  '';

  nativeBuildInputs = [ pythonEnv ];
-  depsBuildBuild = [ buildPackages.stdenv.cc buildPackages.util-linux buildPackages.bash ];
+  depsBuildBuild = [ buildPackages.stdenv.cc buildPackages.bash ];
+  depsHostHost = [ libuuid ];
  strictDeps = true;

  # trick taken from https://src.fedoraproject.org/rpms/edk2/blob/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/edk2.spec#_319
-  ${"GCC5_${targetArch}_PREFIX"}=stdenv.cc.targetPrefix;
+  ${"GCC5_${targetArch}_PREFIX"} = stdenv.cc.targetPrefix;

  makeFlags = [ "-C BaseTools" ];

@@ -91,7 +94,7 @@ edk2 = stdenv.mkDerivation rec {
    description = "Intel EFI development kit";
    homepage = "https://github.com/tianocore/tianocore.github.io/wiki/EDK-II/";
    license = licenses.bsd2;
-    platforms = with platforms; aarch64 ++ arm ++ i686 ++ x86_64;
+    platforms = with platforms; aarch64 ++ arm ++ i686 ++ x86_64 ++ riscv64;
  };

  passthru = {
--- a/pkgs/development/compilers/typescript/default.nix
+++ b/pkgs/development/compilers/typescript/default.nix
@@ -1,17 +1,21 @@
-{ lib, buildNpmPackage, fetchFromGitHub }:
+{ lib, buildNpmPackage, fetchFromGitHub}:

 buildNpmPackage rec {
  pname = "typescript";
-  version = "5.2.2";
+  version = "5.3.2";

  src = fetchFromGitHub {
    owner = "microsoft";
    repo = "TypeScript";
    rev = "v${version}";
-    hash = "sha256-wjoqDmCudN5+9C3GrP1viiXBvsWgU0UIYWaFeK/TJEY=";
+    hash = "sha256-lwc2bYC2f8x3Np/LxbN+5x6Apuekp7LmHXNutqL9Z2E=";
  };

-  npmDepsHash = "sha256-7Wm6nlpqZRNqBU0mYFZRVWQkO4uqvrKrp2h2aEmZtow=";
+  patches = [
+    ./disable-dprint-dstBundler.patch
+  ];
+
+  npmDepsHash = "sha256-vD/tax5RjREdsdte3ONahVf9GPOkxPqeP9jmsxjCYkY=";

  meta = with lib; {
    description = "A superset of JavaScript that compiles to clean JavaScript output";
--- a/pkgs/development/compilers/typescript/disable-dprint-dstBundler.patch
+++ b/pkgs/development/compilers/typescript/disable-dprint-dstBundler.patch
@@ -0,0 +1,15 @@
+Disable dprint on dstBundler
+
+dprint fails on sandbox, because it requires internet access to install its
+plugins.
+
+--- a/scripts/dtsBundler.mjs
+++ b/scripts/dtsBundler.mjs
+@@ -430,5 +430,5 @@
+     return result.replace(/\r\n/g, "\n");
+ }
+ 
+-fs.writeFileSync(output, dprint(publicContents));
+-fs.writeFileSync(internalOutput, dprint(internalContents));
+fs.writeFileSync(output, publicContents);
+fs.writeFileSync(internalOutput, internalContents);
--- a/pkgs/development/interpreters/nelua/default.nix
+++ b/pkgs/development/interpreters/nelua/default.nix
@@ -1,22 +1,30 @@
-{ lib, stdenv, fetchFromGitHub, luaPackages }:
+{ lib, stdenv, fetchFromGitHub, luaPackages, unstableGitUpdater }:

-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
  pname = "nelua";
-  version = "unstable-2023-09-16";
+  version = "unstable-2023-11-19";

  src = fetchFromGitHub {
    owner = "edubart";
    repo = "nelua-lang";
-    rev = "596fcca5c77932da8a07c249de59a9dff3099495";
-    hash = "sha256-gXTlAxW7s3VBiC1fGU0aUlGspHlvyY7FC5KLeU2FyGQ=";
+    rev = "e82695abf0a68a30a593cefb0bf1143cf9e14b6b";
+    hash = "sha256-Srgoq07JQirxmZcDvw4UdfoYZ5HFT0PbYPoHY99BW/c=";
  };

+  postPatch = ''
+    substituteInPlace lualib/nelua/version.lua \
+      --replace "NELUA_GIT_HASH = nil" "NELUA_GIT_HASH = '${src.rev}'" \
+      --replace "NELUA_GIT_DATE = nil" "NELUA_GIT_DATE = '${lib.removePrefix "unstable-" version}'"
+  '';
+
  makeFlags = [ "PREFIX=$(out)" ];

  nativeCheckInputs = [ luaPackages.luacheck ];

  doCheck = true;

+  passthru.updateScript = unstableGitUpdater { };
+
  meta = with lib; {
    description = "Minimal, efficient, statically-typed and meta-programmable systems programming language heavily inspired by Lua, which compiles to C and native code";
    homepage = "https://nelua.io/";
--- a/pkgs/development/libraries/igraph/default.nix
+++ b/pkgs/development/libraries/igraph/default.nix
@@ -26,13 +26,13 @@ assert (blas.isILP64 == lapack.isILP64 &&

 stdenv.mkDerivation (finalAttrs: {
  pname = "igraph";
-  version = "0.10.7";
+  version = "0.10.8";

  src = fetchFromGitHub {
    owner = "igraph";
    repo = finalAttrs.pname;
    rev = finalAttrs.version;
-    hash = "sha256-1ge5V9G2jmIWQE5TW7+6cXCV9viFkhcnjpYrLQVLrgg=";
+    hash = "sha256-suma1iS9NdJwU/4EQl6qoFyD4bErLSkY+0yxgh3dHkw=";
  };

  postPatch = ''
--- a/pkgs/development/libraries/libmcrypt/default.nix
+++ b/pkgs/development/libraries/libmcrypt/default.nix
@@ -18,6 +18,10 @@ stdenv.mkDerivation rec {
      "ac_cv_func_realloc_0_nonnull=yes"
    ];

+  env = lib.optionalAttrs stdenv.cc.isClang {
+    NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration -Wno-implicit-int";
+  };
+
  meta = {
    description = "Replacement for the old crypt() package and crypt(1) command, with extensions";
    homepage = "https://mcrypt.sourceforge.net";
--- a/pkgs/development/libraries/libpostal/0001-test-adding-header-to-fix-warning.patch
+++ b/pkgs/development/libraries/libpostal/0001-test-adding-header-to-fix-warning.patch
@@ -0,0 +1,24 @@
+From bfdb6b8f87cc1cae9ba47870ff23deae0bb8ba51 Mon Sep 17 00:00:00 2001
+From: Al <albarrentine@gmail.com>
+Date: Sun, 17 Dec 2017 20:17:01 -0500
+Subject: [PATCH] [test] adding header to fix warning
+
+---
+ test/test_expand.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/test_expand.c b/test/test_expand.c
+index 59ed9af7..2b211728 100644
+--- a/test/test_expand.c
+++ b/test/test_expand.c
+@@ -4,6 +4,7 @@
+ #include <stdarg.h>
+ 
+ #include "greatest.h"
+#include "../src/string_utils.h"
+ #include "../src/libpostal.h"
+ 
+ SUITE(libpostal_expansion_tests);
+-- 
+2.42.0
+
--- a/pkgs/development/libraries/libpostal/default.nix
+++ b/pkgs/development/libraries/libpostal/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, autoreconfHook }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook }:

 stdenv.mkDerivation rec {
  pname = "libpostal";
@@ -11,6 +11,18 @@ stdenv.mkDerivation rec {
    sha256 = "sha256-gQTD2LQibaB2TK0SbzoILAljAGExURvDcF3C/TfDXqk=";
  };

+  patches = [
+    # Fix darwin compilation with XCode 12 https://github.com/openvenues/libpostal/issues/511
+    (fetchpatch {
+      name = "Fix-C-compilation-macOS.patch";
+      url = "https://github.com/openvenues/libpostal/commit/9fcf066e38121b5c1439fc6bdc9a7e02234c8622.patch";
+      hash = "sha256-VpboGK+5sc1XrxMB051KWc8vP7Eu2g7zmTirzSaerns=";
+    })
+    # https://github.com/openvenues/libpostal/commit/bfdb6b8f87cc1cae9ba47870ff23deae0bb8ba51.patch
+    # with extra hunk removed so it applies
+    ./0001-test-adding-header-to-fix-warning.patch
+  ];
+
  nativeBuildInputs = [ autoreconfHook ];

  configureFlags = [
--- a/pkgs/development/libraries/rapidfuzz-cpp/default.nix
+++ b/pkgs/development/libraries/rapidfuzz-cpp/default.nix
@@ -7,13 +7,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "rapidfuzz-cpp";
-  version = "2.1.1";
+  version = "2.2.3";

  src = fetchFromGitHub {
    owner = "maxbachmann";
    repo = "rapidfuzz-cpp";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-OeGn3ks+vSHt4Kdzy6kqhpFOtjoHrbPZB1BrV6Ggzz4=";
+    hash = "sha256-yEDihPvTGGL5gsd4QMYNRyfLucKLItIQM4pm6W0i2W8=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/augeas/default.nix
+++ b/pkgs/development/python-modules/augeas/default.nix
@@ -1,30 +1,36 @@
-{ stdenv, lib, buildPythonPackage, fetchFromGitHub, augeas, cffi }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, buildPythonPackage
+, unittestCheckHook
+, pkg-config
+, augeas
+, cffi
+, pkgs # for libxml2
+}:
 buildPythonPackage rec {
    pname = "augeas";
-    version = "1.1.0";
+    version = "1.2.0";

    src = fetchFromGitHub {
      owner = "hercules-team";
      repo = "python-augeas";
      rev = "v${version}";
-      sha256 = "12q52ilcx059rn544x3712xq6myn99niz131l0fs3xx67456pajh";
+      hash = "sha256-Lq8ckra3sqN38zo1d5JsEq6U5TtLKRmqysoWNwR9J9A=";
    };

-    # TODO: not very nice!
-    postPatch =
-      let libname = "libaugeas${stdenv.hostPlatform.extensions.sharedLibrary}";
-      in
-      ''
-        substituteInPlace augeas/ffi.py \
-          --replace 'ffi.dlopen("augeas")' \
-                    'ffi.dlopen("${lib.makeLibraryPath [augeas]}/${libname}")'
-      '';
+    nativeBuildInputs = [ pkg-config ];

-    propagatedBuildInputs = [ cffi augeas ];
+    buildInputs = [ augeas pkgs.libxml2 ];

-    doCheck = false;
+    propagatedBuildInputs = [ cffi ];
+
+    nativeCheckInputs = [ unittestCheckHook ];
+
+    pythonImportsCheck = [ "augeas" ];

    meta = with lib; {
+      changelog = "https://github.com/hercules-team/python-augeas/releases/tag/v${version}";
      description = "Pure python bindings for augeas";
      homepage = "https://github.com/hercules-team/python-augeas";
      license = licenses.lgpl2Plus;
--- a/pkgs/development/python-modules/authcaptureproxy/default.nix
+++ b/pkgs/development/python-modules/authcaptureproxy/default.nix
@@ -1,28 +1,33 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+
+# build-system
 , poetry-core
+
+# dependencies
 , aiohttp
 , beautifulsoup4
 , httpx
-, importlib-metadata
 , multidict
 , typer
 , yarl
+
+# tests
 , pytest-asyncio
 , pytestCheckHook
 }:

 buildPythonPackage rec {
  pname = "authcaptureproxy";
-  version = "1.2.0";
-  format = "pyproject";
+  version = "1.2.1";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "alandtse";
    repo = "auth_capture_proxy";
    rev = "refs/tags/v${version}";
-    hash = "sha256-OY6wT0xi7f6Bn8VOL9+6kyv5cENYbrGGTWWKc6o36cw=";
+    hash = "sha256-z5qtaZJzTHwPkwGpRUBtrN0pCsumztkeexT0sBitXPg=";
  };

  nativeBuildInputs = [
@@ -33,7 +38,6 @@ buildPythonPackage rec {
    aiohttp
    beautifulsoup4
    httpx
-    importlib-metadata
    multidict
    typer
    yarl
--- a/pkgs/development/python-modules/canals/default.nix
+++ b/pkgs/development/python-modules/canals/default.nix
@@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "canals";
-  version = "0.10.0";
+  version = "0.11.0";
  pyproject = true;

  disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
    owner = "deepset-ai";
    repo = "canals";
    rev = "refs/tags/v${version}";
-    hash = "sha256-zTC9zaY2WQ4Sx/1YeEaw23UH0hoP/ktMwzH8x/rER00=";
+    hash = "sha256-xoJqj/zPBPPCheBxA+8EFRJqUnlP+4aWLEh42q1X1mM=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/confection/default.nix
+++ b/pkgs/development/python-modules/confection/default.nix
@@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "confection";
-  version = "0.1.3";
+  version = "0.1.4";
  format = "setuptools";

  disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
    owner = "explosion";
    repo = pname;
    rev = "refs/tags/v${version}";
-    hash = "sha256-PJbFv+5bT4+oF7PRAO6AGnjRhjNudiJEkPFgGSmuI8c=";
+    hash = "sha256-PWtxLcnPd7V4yeHfOl1kYPr5UeqkYCfzGE/DoL94tq0=";
  };

  propagatedBuildInputs = [
--- a/pkgs/development/python-modules/igraph/default.nix
+++ b/pkgs/development/python-modules/igraph/default.nix
@@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "igraph";
-  version = "0.11.2";
+  version = "0.11.3";

  disabled = pythonOlder "3.8";

@@ -20,7 +20,7 @@ buildPythonPackage rec {
    owner = "igraph";
    repo = "python-igraph";
    rev = "refs/tags/${version}";
-    hash = "sha256-evYnUv2PWO+LbVBBQPa708dQb8Wq8SQ92bJ6clQNV/g=";
+    hash = "sha256-Pki0ygcQeuC5E4SwhzGX7oIe9LUSgoBKiXbtcpjL3ng=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/localstack/default.nix
+++ b/pkgs/development/python-modules/localstack/default.nix
@@ -20,13 +20,13 @@

 buildPythonPackage rec {
  pname = "localstack";
-  version = "2.3.2";
+  version = "3.0.0";

  src = fetchFromGitHub {
    owner = "localstack";
    repo = "localstack";
    rev = "refs/tags/v${version}";
-    hash = "sha256-8HrPnMmzoxgAhu3Qm18FBJ3kNoGOD7bGmI1t7tcETwM=";
+    hash = "sha256-N/Mc1bubCcq38VxUqkO9LGG25pEetEyJ+VJMdg/7hrU=";
  };

  postPatch = ''
--- a/pkgs/development/python-modules/nibe/default.nix
+++ b/pkgs/development/python-modules/nibe/default.nix
@@ -16,7 +16,7 @@

 buildPythonPackage rec {
  pname = "nibe";
-  version = "2.5.0";
+  version = "2.5.1";
  pyproject = true;

  disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
    owner = "yozik04";
    repo = "nibe";
    rev = "refs/tags/${version}";
-    hash = "sha256-PCfodp8gyjOUgb4FthMlbanbEtJuc6axM8DkQJ/ykLg=";
+    hash = "sha256-9pnY3ssDLxPmMMRT6TexkGcYDTzuB5dAP8VHCTAwD7I=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/pgvector/default.nix
+++ b/pkgs/development/python-modules/pgvector/default.nix
@@ -13,11 +13,12 @@
 , pytestCheckHook
 , pythonOlder
 , sqlalchemy
+, sqlmodel
 }:

 buildPythonPackage rec {
  pname = "pgvector";
-  version = "0.2.3";
+  version = "0.2.4";
  format = "setuptools";

  disabled = pythonOlder "3.8";
@@ -26,7 +27,7 @@ buildPythonPackage rec {
    owner = "pgvector";
    repo = "pgvector-python";
    rev = "refs/tags/v${version}";
-    hash = "sha256-KQROG0cHvKmdWssr7Git3JH0YguRPno/ZzYiQL7VhwU=";
+    hash = "sha256-XKoaEwLW59pV4Dwis7p2L65XoO2zUEa1kXxz6Lgs2d8=";
  };

  propagatedBuildInputs = [
@@ -44,6 +45,7 @@ buildPythonPackage rec {
    pytest-asyncio
    pytestCheckHook
    sqlalchemy
+    sqlmodel
  ];

  env = {
--- a/pkgs/development/python-modules/phik/default.nix
+++ b/pkgs/development/python-modules/phik/default.nix
@@ -2,27 +2,29 @@
 , buildPythonPackage
 , cmake
 , fetchFromGitHub
-, isPy3k
-, pytestCheckHook
-, nbconvert
 , joblib
 , jupyter
 , jupyter-client
-, numpy
-, scipy
-, pandas
 , matplotlib
+, nbconvert
 , ninja
 , numba
+, numpy
+, pandas
 , pybind11
+, pytestCheckHook
+, pythonOlder
 , scikit-build
+, scipy
+, setuptools
 }:

 buildPythonPackage rec {
  pname = "phik";
  version = "0.12.3";
-  disabled = !isPy3k;
-  format = "pyproject";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
    owner = "KaveIO";
@@ -31,11 +33,11 @@ buildPythonPackage rec {
    hash = "sha256-9o3EDhgmne2J1QfzjjNQc1mUcyCzoVrCnWXqjWkiZU0=";
  };

-  nativeCheckInputs = [
-    pytestCheckHook
-    nbconvert
-    jupyter
-    jupyter-client
+  nativeBuildInputs = [
+    cmake
+    ninja
+    scikit-build
+    setuptools
  ];

  propagatedBuildInputs = [
@@ -48,16 +50,19 @@ buildPythonPackage rec {
    pybind11
  ];

-  # uses setuptools to drive build process
-  dontUseCmakeConfigure = true;
-
-  nativeBuildInputs = [
-    cmake
-    ninja
-    scikit-build
+  nativeCheckInputs = [
+    pytestCheckHook
+    nbconvert
+    jupyter
+    jupyter-client
  ];

-  pythonImportsCheck = [ "phik" ];
+  # Uses setuptools to drive build process
+  dontUseCmakeConfigure = true;
+
+  pythonImportsCheck = [
+    "phik"
+  ];

  postInstall = ''
    rm -r $out/bin
@@ -68,12 +73,27 @@ buildPythonPackage rec {
    rm -r phik
  '';

+  disabledTests = [
+    # TypeError: 'numpy.float64' object cannot be interpreted as an integer
+    # https://github.com/KaveIO/PhiK/issues/73
+    "test_significance_matrix_hybrid"
+    "test_significance_matrix_mc"
+  ];
+
+  disabledTestPaths = [
+    # Don't test integrations
+    "tests/phik_python/integration/"
+  ];
+
  meta = with lib; {
    description = "Phi_K correlation analyzer library";
-    longDescription = "Phi_K is a new and practical correlation coefficient based on several refinements to Pearson’s hypothesis test of independence of two variables.";
-    homepage = "https://phik.readthedocs.io/en/latest/";
-    changelog = "https://github.com/KaveIO/PhiK/blob/${src.rev}/CHANGES.rst";
-    maintainers = with maintainers; [ melsigl ];
+    longDescription = ''
+      Phi_K is a new and practical correlation coefficient based on several refinements to
+      Pearson’s hypothesis test of independence of two variables.
+    '';
+    homepage = "https://phik.readthedocs.io/";
+    changelog = "https://github.com/KaveIO/PhiK/blob/${version}/CHANGES.rst";
    license = licenses.asl20;
+    maintainers = with maintainers; [ melsigl ];
  };
 }
--- a/pkgs/development/python-modules/pycontrol4/default.nix
+++ b/pkgs/development/python-modules/pycontrol4/default.nix
@@ -2,6 +2,7 @@
 , buildPythonPackage
 , pythonOlder
 , fetchFromGitHub
+, setuptools
 , aiohttp
 , xmltodict
 , python-socketio
@@ -10,17 +11,17 @@

 buildPythonPackage rec {
  pname = "pycontrol4";
-  version = "1.1.0";
+  version = "1.1.2";

  disabled = pythonOlder "3.6";

-  format = "setuptools";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "lawtancool";
    repo = "pyControl4";
-    rev = "v${version}";
-    hash = "sha256-dMv2b6dbMauPvPf4LHKmLF4jnXYRYe6A+2lDtiZDUhY=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-oKKc9s3/fO7cFMjOeKtpvEwmfglxI2lxlN3EIva7zR8=";
  };

  postPatch = ''
@@ -28,6 +29,10 @@ buildPythonPackage rec {
      --replace "python-socketio>=4,<5" "python-socketio>=4"
  '';

+  nativeBuildInputs = [
+    setuptools
+  ];
+
  propagatedBuildInputs = [
    aiohttp
    xmltodict
--- a/pkgs/development/python-modules/pyheck/default.nix
+++ b/pkgs/development/python-modules/pyheck/default.nix
@@ -2,11 +2,13 @@
 , buildPythonPackage
 , cargo
 , fetchFromGitHub
+, libiconv
 , poetry-core
 , pytestCheckHook
 , pythonOlder
 , rustc
 , rustPlatform
+, stdenv
 }:

 buildPythonPackage rec {
@@ -39,6 +41,8 @@ buildPythonPackage rec {
    rustPlatform.maturinBuildHook
  ];

+  buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
+
  nativeCheckInputs = [
    pytestCheckHook
  ];
--- a/pkgs/development/python-modules/pykdl/default.nix
+++ b/pkgs/development/python-modules/pykdl/default.nix
@@ -1,4 +1,5 @@
-{ lib, stdenv, toPythonModule, cmake, orocos-kdl, eigen, python }:
+{ lib, stdenv, toPythonModule, fetchpatch, cmake, pybind11, orocos-kdl, eigen
+, python }:

 toPythonModule (stdenv.mkDerivation {
  pname = "pykdl";
@@ -6,13 +7,22 @@ toPythonModule (stdenv.mkDerivation {

  sourceRoot = "${orocos-kdl.src.name}/python_orocos_kdl";

+  patches = [
+    # Support system pybind11; the vendored copy doesn't support Python 3.11
+    (fetchpatch {
+      url = "https://github.com/orocos/orocos_kinematics_dynamics/commit/e25a13fc5820dbca6b23d10506407bca9bcdd25f.patch";
+      hash = "sha256-NGMVGEYsa7hVX+SgRZgeSm93BqxFR1uiyFvzyF5H0Y4=";
+      stripLen = 1;
+    })
+  ];
+
  # Fix hardcoded installation path
  postPatch = ''
    substituteInPlace CMakeLists.txt \
      --replace dist-packages site-packages
  '';

-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [ cmake pybind11 ];
  buildInputs = [ orocos-kdl eigen ];
  propagatedBuildInputs = [ python ];

--- a/pkgs/development/python-modules/pyreadstat/default.nix
+++ b/pkgs/development/python-modules/pyreadstat/default.nix
@@ -13,7 +13,7 @@

 buildPythonPackage rec {
  pname = "pyreadstat";
-  version = "1.2.4";
+  version = "1.2.5";
  format = "setuptools";

  disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "Roche";
    repo = "pyreadstat";
    rev = "refs/tags/v${version}";
-    hash = "sha256-+wa8HxQyEwdGF2LWJXTZ/gOFpC8P9+k5p4Lj3ePP2n8=";
+    hash = "sha256-npzriBrp/ex0noH6EAmWnFyHzVkOKvQ68J578NujMHA=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/pyvoro/default.nix
+++ b/pkgs/development/python-modules/pyvoro/default.nix
@@ -20,5 +20,15 @@ buildPythonPackage rec {
    description = "2D and 3D Voronoi tessellations: a python entry point for the voro++ library";
    license = licenses.mit;
    maintainers = [ ];
+
+    # Cython generated code is vendored directly and no longer compatible with
+    # newer versions of the CPython C API.
+    #
+    # Upstream explicitly removed the Cython source files from the source
+    # distribution, making it impossible for us to force-compile them:
+    # https://github.com/joe-jordan/pyvoro/commit/922bba6db32d44c2e1825228627a25aa891f9bc1
+    #
+    # No upstream activity since 2014.
+    broken = true;
  };
 }
--- a/pkgs/development/python-modules/radios/default.nix
+++ b/pkgs/development/python-modules/radios/default.nix
@@ -8,26 +8,28 @@
 , awesomeversion
 , backoff
 , cachetools
+, mashumaro
+, orjson
 , pycountry
-, pydantic
 , yarl
+, aresponses
 , pytest-asyncio
 , pytestCheckHook
 }:

 buildPythonPackage rec {
  pname = "radios";
-  version = "0.1.1";
+  version = "0.3.0";
+  pyproject = true;

-  disabled = pythonOlder "3.9";
+  disabled = pythonOlder "3.11";

-  format = "pyproject";

  src = fetchFromGitHub {
    owner = "frenck";
    repo = "python-radios";
    rev = "v${version}";
-    hash = "sha256-NCBch9MCWVD6ez0sIUph8rwOOzEMZtwC4atXJe53xZM=";
+    hash = "sha256-bzo+SA8kqc2GcxSV0TiIJyPVG+JshdsMoXSUhZYSphU=";
  };

  postPatch = ''
@@ -46,18 +48,22 @@ buildPythonPackage rec {
    awesomeversion
    backoff
    cachetools
+    mashumaro
+    orjson
    pycountry
-    pydantic
    yarl
  ];

  nativeCheckInputs = [
+    aresponses
    pytest-asyncio
    pytestCheckHook
  ];

  pythonImportsCheck = [ "radios" ];

+  __darwinAllowLocalNetworking = true;
+
  meta = with lib; {
    description = "Asynchronous Python client for the Radio Browser API";
    homepage = "https://github.com/frenck/python-radios";
--- a/pkgs/development/python-modules/rapidfuzz/default.nix
+++ b/pkgs/development/python-modules/rapidfuzz/default.nix
@@ -18,7 +18,7 @@

 buildPythonPackage rec {
  pname = "rapidfuzz";
-  version = "3.4.0";
+  version = "3.5.2";
  format = "pyproject";

  disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
    owner = "maxbachmann";
    repo = "RapidFuzz";
    rev = "refs/tags/v${version}";
-    hash = "sha256-JgTmhnKVzv9m8//GMQjvCFPNJQM/7dalCD5bk6fWBPc=";
+    hash = "sha256-D7Z0xKqAJAPKSAEK+3Mpz/LaEKqKYczp+m6SqfzufwA=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/rotary-embedding-torch/default.nix
+++ b/pkgs/development/python-modules/rotary-embedding-torch/default.nix
@@ -13,14 +13,14 @@

 buildPythonPackage rec {
  pname = "rotary-embedding-torch";
-  version = "0.3.5";
+  version = "0.3.6";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "lucidrains";
    repo = "rotary-embedding-torch";
-    rev = version;
-    hash = "sha256-dST3eJnOcG2s9tiD/Fb9BvLS6nIpE8RXly92PK/gCC8=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-sbkUHFUv/+nY6AT3wu/ipuDF45VUjQalsYcIvUFR9PE=";
  };

  nativeBuildInputs = [
--- a/pkgs/development/python-modules/sqlmodel/default.nix
+++ b/pkgs/development/python-modules/sqlmodel/default.nix
@@ -0,0 +1,58 @@
+{ lib
+, buildPythonPackage
+, fastapi
+, fetchFromGitHub
+, poetry-core
+, pydantic
+, pytest-asyncio
+, pytestCheckHook
+, pythonOlder
+, sqlalchemy
+}:
+
+buildPythonPackage rec {
+  pname = "sqlmodel";
+  version = "0.0.12";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "tiangolo";
+    repo = "sqlmodel";
+    rev = "refs/tags/${version}";
+    hash = "sha256-ER8NGDcCCCXT8lsm8fgJUaLyjdf5v2/UdrBw5T9EeXQ=";
+  };
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  propagatedBuildInputs = [
+    pydantic
+    sqlalchemy
+  ];
+
+  nativeCheckInputs = [
+    fastapi
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "sqlmodel"
+  ];
+
+  disabledTestPaths = [
+    # Coverage
+    "tests/test_tutorial/test_create_db_and_table/test_tutorial001.py"
+  ];
+
+  meta = with lib; {
+    description = "Module to work with SQL databases";
+    homepage = "https://github.com/tiangolo/sqlmodel";
+    changelog = "https://github.com/tiangolo/sqlmodel/releases/tag/${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+  };
+}
--- a/pkgs/development/python-modules/uri-template/default.nix
+++ b/pkgs/development/python-modules/uri-template/default.nix
@@ -1,30 +1,45 @@
-{ lib, buildPythonPackage, fetchFromGitHub, python }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, python
+, pythonOlder
+, setuptools
+, setuptools-scm
+}:

 buildPythonPackage rec {
  pname = "uri-template";
-  version = "1.2.0";
+  version = "1.3.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";

  src = fetchFromGitHub {
    owner = "plinss";
    repo = "uri_template";
-    rev = "v${version}";
-    hash = "sha256-IAq6GpEwimq45FU0QugLZLSOhwAmC1KbpZKD0zyxsUs=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-38HFFqM6yfpsPrhIpE639ePy/NbLqKw7gbnE3y8sL3w=";
  };

-  postPatch = ''
-    sed -i -e 's/0.0.0/${version}/' setup.py
-  '';
+  env.SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+  nativeBuildInputs = [
+    setuptools
+    setuptools-scm
+  ];

  checkPhase = ''
    ${python.interpreter} test.py
  '';

-  pythonImportsCheck = [ "uri_template" ];
+  pythonImportsCheck = [
+    "uri_template"
+  ];

  meta = with lib; {
    description = "An implementation of RFC 6570 URI Templates";
    homepage = "https://github.com/plinss/uri_template/";
    license = licenses.mit;
-    maintainers = [];
+    maintainers = with maintainers; [ ];
  };
 }
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -444,6 +444,7 @@ let
    units = [ pkgs.udunits ];
    V8 = [ pkgs.v8 ];
    XBRL = with pkgs; [ zlib libxml2.dev ];
+    XLConnect = [ pkgs.jdk ];
    xml2 = [ pkgs.libxml2.dev ] ++ lib.optionals stdenv.isDarwin [ pkgs.perl ];
    XML = with pkgs; [ libtool libxml2.dev xmlsec libxslt ];
    affyPLM = [ pkgs.zlib.dev ];
@@ -489,6 +490,7 @@ let
    QF = [ pkgs.gsl ];
    PICS = [ pkgs.gsl ];
    RcppCWB = [ pkgs.pkg-config ];
+    redux = [ pkgs.pkg-config ];
    rrd = [ pkgs.pkg-config ];
    trackViewer = [ pkgs.zlib.dev ];
    themetagenomics = [ pkgs.zlib.dev ];
@@ -618,6 +620,7 @@ let
    scModels = [ pkgs.mpfr.dev ];
    multibridge = [ pkgs.mpfr.dev ];
    RcppCWB = with pkgs; [ pcre.dev glib.dev ];
+    redux = [ pkgs.hiredis ];
    RmecabKo = [ pkgs.mecab ];
    PoissonBinomial = [ pkgs.fftw.dev ];
    rrd = [ pkgs.rrdtool ];
--- a/pkgs/development/tools/fblog/default.nix
+++ b/pkgs/development/tools/fblog/default.nix
@@ -2,16 +2,16 @@

 rustPlatform.buildRustPackage rec {
  pname = "fblog";
-  version = "4.5.0";
+  version = "4.6.0";

  src = fetchFromGitHub {
    owner = "brocode";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-T0NvcNg2UeUpEf1hjSdoaUkIzCAP29vo6edfeno/oyo=";
+    hash = "sha256-yNl+A0nwzCO4vJMNJTSTIpXK1zgfaK+ROMQ41gB+H1Y=";
  };

-  cargoHash = "sha256-3/j/TjsQjXFe+rTfCncjoownXzaUiUBUkCXbFc5RM2o=";
+  cargoHash = "sha256-r+6kTNUn97SVCgZj7vCjksS2s/74OzeZgXOx7XOgMdY=";

  meta = with lib; {
    description = "A small command-line JSON log viewer";
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -6,14 +6,14 @@ let
  # NOTE: When updating these, please also take a look at the changes done to
  # kernel config in the xanmod version commit
  ltsVariant = {
-    version = "6.1.62";
-    hash = "sha256-fo5OQ/MZ+QVdCmLzX0OgFUBedfqrkqp+Ev081RVdtWw=";
+    version = "6.1.63";
+    hash = "sha256-WBMKJCLYexWJuTpli8vjvdms2ZYPXIS0yUxTgAL00io=";
    variant = "lts";
  };

  mainVariant = {
-    version = "6.5.11";
-    hash = "sha256-1bb5LG6JvqX5eNSe2Xyu86HxaqkUVkKUf1H3T7bFkGE=";
+    version = "6.5.12";
+    hash = "sha256-zG9+d+hKg0S0qCX2hOc02CowC6s9u82MB45+X1bGYpE=";
    variant = "main";
  };

--- a/pkgs/servers/photofield/default.nix
+++ b/pkgs/servers/photofield/default.nix
@@ -5,17 +5,19 @@
 , makeWrapper
 , exiftool
 , ffmpeg
+, testers
+, photofield
 }:

 let
  pname = "photofield-ui";
-  version = "0.11.0";
+  version = "0.13.0";

  src = fetchFromGitHub {
    owner = "SmilyOrg";
    repo = "photofield";
-    rev = "v${version}";
-    hash = "sha256-AqOhagqH0wRKjwcRHFVw0izC0DBv9uY3B5MMDBJoFVE=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-6pJvOn3sN6zfjt2dVZ/xH6pSXM0WgbG7au9tSVUGYys=";
  };

  webui = buildNpmPackage {
@@ -24,7 +26,7 @@ let

    sourceRoot = "${src.name}/ui";

-    npmDepsHash = "sha256-YVyaZsFh5bolDzMd5rXWrbbXQZBeEIV6Fh/kwN+rvPk=";
+    npmDepsHash = "sha256-trKcNuhRdiabFKMafOLtPg8x1bQHLOif6Hm4k5bTAYc=";

    installPhase = ''
      mkdir -p $out/share
@@ -37,7 +39,7 @@ buildGoModule rec {
  pname = "photofield";
  inherit version src;

-  vendorHash = "sha256-0rrBHkKZfStwzIv5Us/8Db6z3ZSqassCMWQMpScZq7Y=";
+  vendorHash = "sha256-4JFP3vs/Z8iSKgcwfxpdnQpO9kTF68XQArFHYP8IoDQ=";

  preBuild = ''
    cp -r ${webui}/share/photofield-ui ui/dist
@@ -50,7 +52,7 @@ buildGoModule rec {
    "-X main.builtBy=Nix"
  ];

-  tags = [ "embedstatic" ];
+  tags = [ "embedui" ];

  doCheck = false; # tries to modify filesytem

@@ -61,10 +63,16 @@ buildGoModule rec {
      --prefix PATH : "${lib.makeBinPath [exiftool ffmpeg]}"
  '';

+  passthru.tests.version = testers.testVersion {
+    package = photofield;
+    command = "photofield -version";
+  };
+
  meta = with lib; {
    description = "Experimental fast photo viewer";
    homepage = "https://github.com/SmilyOrg/photofield";
    license = licenses.mit;
+    mainProgram = "photofield";
    maintainers = with maintainers; [ dit7ya ];
  };
 }
--- a/pkgs/servers/search/sonic-server/default.nix
+++ b/pkgs/servers/search/sonic-server/default.nix
@@ -2,6 +2,7 @@
 , rustPlatform
 , fetchFromGitHub
 , nix-update-script
+, nixosTests
 , testers
 , sonic-server
 }:
@@ -42,6 +43,7 @@ rustPlatform.buildRustPackage rec {

  passthru = {
    tests = {
+      inherit (nixosTests) sonic-server;
      version = testers.testVersion {
        command = "sonic --version";
        package = sonic-server;
--- a/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
+++ b/pkgs/servers/sql/postgresql/ext/plpgsql_check.nix
@@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  pname = "plpgsql_check";
-  version = "2.6.1";
+  version = "2.6.2";

  src = fetchFromGitHub {
    owner = "okbob";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-mC8cDLfTu/gpMjNfXGCAV8EhE+kMq2MofzibIWijX3w=";
+    hash = "sha256-JYlcd4VveSoQM/PIRRCeCLfJTDRGRl3zrc6iAd1V3aE=";
  };

  buildInputs = [ postgresql ];
--- a/pkgs/tools/backup/rustic-rs/default.nix
+++ b/pkgs/tools/backup/rustic-rs/default.nix
@@ -1,4 +1,12 @@
-{ lib, fetchFromGitHub, rustPlatform, stdenv, Security, installShellFiles, nix-update-script }:
+{ lib
+, fetchFromGitHub
+, rustPlatform
+, stdenv
+, Security
+, SystemConfiguration
+, installShellFiles
+, nix-update-script
+}:

 rustPlatform.buildRustPackage rec {
  pname = "rustic-rs";
@@ -15,7 +23,7 @@ rustPlatform.buildRustPackage rec {

  nativeBuildInputs = [ installShellFiles ];

-  buildInputs = lib.optionals stdenv.isDarwin [ Security ];
+  buildInputs = lib.optionals stdenv.isDarwin [ Security SystemConfiguration ];

  postInstall = ''
    for shell in {ba,fi,z}sh; do
--- a/pkgs/tools/filesystems/duperemove/default.nix
+++ b/pkgs/tools/filesystems/duperemove/default.nix
@@ -13,13 +13,13 @@

 stdenv.mkDerivation rec {
  pname = "duperemove";
-  version = "0.14";
+  version = "0.14.1";

  src = fetchFromGitHub {
    owner = "markfasheh";
    repo = "duperemove";
    rev = "v${version}";
-    hash = "sha256-hYBD5XFjM2AEsQm7yKEHkfjwLZmXTxkY/6S3hs1uBPw=";
+    hash = "sha256-iMv80UKktYOhNfVA3mW6kKv8TwLZaP6MQt24t3Rchk4=";
  };

  postPatch = ''
@@ -33,7 +33,6 @@ stdenv.mkDerivation rec {
  makeFlags = [
    "PREFIX=${placeholder "out"}"
    "VERSION=v${version}"
-    "CFLAGS=-Wno-error=format-security"
  ];

  passthru.tests.version = testers.testVersion {
--- a/pkgs/tools/misc/mcrypt/default.nix
+++ b/pkgs/tools/misc/mcrypt/default.nix
@@ -19,6 +19,10 @@ stdenv.mkDerivation rec {

  buildInputs = [ libmcrypt libmhash ];

+  env = lib.optionalAttrs stdenv.cc.isClang {
+    NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration";
+  };
+
  meta = {
    description = "Replacement for old UNIX crypt(1)";
    longDescription = ''
--- a/pkgs/tools/misc/trash-cli/default.nix
+++ b/pkgs/tools/misc/trash-cli/default.nix
@@ -2,13 +2,13 @@

 python3Packages.buildPythonApplication rec {
  pname = "trash-cli";
-  version = "0.23.9.23";
+  version = "0.23.11.10";

  src = fetchFromGitHub {
    owner = "andreafrancia";
    repo = "trash-cli";
    rev = version;
-    hash = "sha256-EbW7P9fl7CDA6etOba7qcOtcxB2GkCd+zoi+NW0ZP9c=";
+    hash = "sha256-bP1x+yYAsPQ1vXS3rmHD11UiJ7r/02akb84hr+o8JLs=";
  };

  propagatedBuildInputs = with python3Packages; [ psutil six ];
--- a/pkgs/tools/networking/ddns-go/default.nix
+++ b/pkgs/tools/networking/ddns-go/default.nix
@@ -5,13 +5,13 @@

 buildGoModule rec {
  pname = "ddns-go";
-  version = "5.6.4";
+  version = "5.6.6";

  src = fetchFromGitHub {
    owner = "jeessy2";
    repo = pname;
    rev = "v${version}";
-    hash = "sha256-wE4xzAH31yQ8xrA0dI7f961KNwK84gRSit+XNoW37pc=";
+    hash = "sha256-4OBY2Bj23uOBOAHKmOpecFXu0Lr8sLrwiU3/BdHpGOQ=";
  };

  vendorHash = "sha256-e4mmUneFZCsteSrxfSeeky/pFc0sgNs0eRVnZQuG1ZI=";
--- a/pkgs/tools/networking/wol/default.nix
+++ b/pkgs/tools/networking/wol/default.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
    homepage = "https://sourceforge.net/projects/wake-on-lan/";
    license = licenses.gpl2;
    maintainers = with maintainers; [ makefu ];
+    mainProgram = "wol";
    platforms = platforms.linux;
  };
 }
--- a/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py
+++ b/pkgs/tools/nix/nixos-render-docs/src/nixos_render_docs/md.py
@@ -365,7 +365,7 @@ def _attr_span_plugin(md: markdown_it.MarkdownIt) -> None:
                return False
            id, classes = parsed_attrs

-            token = state.push("attr_span_begin", "span", 1) # type: ignore[no-untyped-call]
+            token = state.push("attr_span_begin", "span", 1)
            if id:
                token.attrs['id'] = id
            if classes:
@@ -375,7 +375,7 @@ def _attr_span_plugin(md: markdown_it.MarkdownIt) -> None:
            state.posMax = label_end
            state.md.inline.tokenize(state)

-            state.push("attr_span_end", "span", -1) # type: ignore[no-untyped-call]
+            state.push("attr_span_end", "span", -1)

        state.pos = label_end + match.end() + 1
        state.posMax = input_end
--- a/pkgs/tools/security/gopass/default.nix
+++ b/pkgs/tools/security/gopass/default.nix
@@ -13,7 +13,7 @@

 buildGoModule rec {
  pname = "gopass";
-  version = "1.15.9";
+  version = "1.15.10";

  nativeBuildInputs = [ installShellFiles makeWrapper ];

@@ -21,10 +21,10 @@ buildGoModule rec {
    owner = "gopasspw";
    repo = "gopass";
    rev = "v${version}";
-    hash = "sha256-GGaFQyO/4FVG9gVW2xMiJJKEl+OECsvAdKvgonSDLG0=";
+    hash = "sha256-6s4rg2+oC+RB2gE4FQIY2MPmFSh+RxiZxaIuMI/T8hE=";
  };

-  vendorHash = "sha256-3x4AuUpsAdIm99tVAF2juFAaDhNKe2eMpWWrbsr3tq8=";
+  vendorHash = "sha256-tbZpNraGVC+p6O1MOh4vPmcwUgW5ykg7rGTNOWKFk0M=";

  subPackages = [ "." ];

--- a/pkgs/tools/security/gopass/git-credential.nix
+++ b/pkgs/tools/security/gopass/git-credential.nix
@@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "git-credential-gopass";
-  version = "1.15.9";
+  version = "1.15.10";

  src = fetchFromGitHub {
    owner = "gopasspw";
    repo = "git-credential-gopass";
    rev = "v${version}";
-    hash = "sha256-8gHOWi4Xa5McbKVWborclgFqOpuQApUDW9wV849855I=";
+    hash = "sha256-DQPjnCwpFOKN0ObPXPbwy7GK1VsPSj+pcLKjfSPPPRo=";
  };

-  vendorHash = "sha256-znmBV6sLx0g7zKkkv3S4TfVQu79ch5epq8l2uImF/Go=";
+  vendorHash = "sha256-gvnBlf0JfdrHSHTF+OQxBHFER5F910mruzCa/prvIYA=";

  subPackages = [ "." ];

--- a/pkgs/tools/security/gopass/hibp.nix
+++ b/pkgs/tools/security/gopass/hibp.nix
@@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "gopass-hibp";
-  version = "1.15.9";
+  version = "1.15.10";

  src = fetchFromGitHub {
    owner = "gopasspw";
    repo = "gopass-hibp";
    rev = "v${version}";
-    hash = "sha256-ngLtxzRupvQF5BERdHhq+Ywf8F2rBpBSx/eH/JgA+IY=";
+    hash = "sha256-v3FtWBi5H9LiFN/mowufonABr+aV3Z8MWBKiIUoy0NE=";
  };

-  vendorHash = "sha256-yvimjsDaEXXLBUHtCovNSz4GUQ9TlvAogMgw+HSX0Mg=";
+  vendorHash = "sha256-c4kk1RrvB+c+8IfbIsLRvG7O3cy+u9l+pDZ52XX1AhI=";

  subPackages = [ "." ];

--- a/pkgs/tools/security/gopass/jsonapi.nix
+++ b/pkgs/tools/security/gopass/jsonapi.nix
@@ -8,16 +8,16 @@

 buildGoModule rec {
  pname = "gopass-jsonapi";
-  version = "1.15.9";
+  version = "1.15.10";

  src = fetchFromGitHub {
    owner = "gopasspw";
    repo = "gopass-jsonapi";
    rev = "v${version}";
-    hash = "sha256-p1z1jFk+Fmh7kMyMI5kMCkmp62q/CC8BqsbHHpfGWaI=";
+    hash = "sha256-3E55MNS9QBLeae+Dc7NqbVMGie6NUKMBMGvkMqKeWoE=";
  };

-  vendorHash = "sha256-bFHm2mSWI00lVAfFK8DSjt0hgM52IycpHGRADk0QSoQ=";
+  vendorHash = "sha256-sarNWeBi93oXL9v2EkP/z2+Bd4TyNy+z6576hOCf1/Q=";

  subPackages = [ "." ];

--- a/pkgs/tools/security/gopass/summon.nix
+++ b/pkgs/tools/security/gopass/summon.nix
@@ -7,16 +7,16 @@

 buildGoModule rec {
  pname = "gopass-summon-provider";
-  version = "1.15.9";
+  version = "1.15.10";

  src = fetchFromGitHub {
    owner = "gopasspw";
    repo = "gopass-summon-provider";
    rev = "v${version}";
-    hash = "sha256-Ob/G1xDAgPlh2aM+TwbpycqhTodHNs97pvBpCWTYxXE=";
+    hash = "sha256-S4BPUl7KuRakHr2fvNobChfevFw1UAbAdpFUkwXcmxs=";
  };

-  vendorHash = "sha256-znmBV6sLx0g7zKkkv3S4TfVQu79ch5epq8l2uImF/Go=";
+  vendorHash = "sha256-gvnBlf0JfdrHSHTF+OQxBHFER5F910mruzCa/prvIYA=";

  subPackages = [ "." ];

--- a/pkgs/tools/system/augeas/bootstrap.diff
+++ b/pkgs/tools/system/augeas/bootstrap.diff
@@ -0,0 +1,15 @@
+diff --git a/bootstrap b/bootstrap
+index a84eb39..cac656d 100755
+--- a/bootstrap
+++ b/bootstrap
+@@ -53,9 +53,6 @@ case ${GNULIB_SRCDIR--} in
+     echo "$0: getting gnulib files..."
+     git submodule update || exit $?
+     GNULIB_SRCDIR=.gnulib
+-  else
+-    echo >&2 "$0: invalid gnulib srcdir: $GNULIB_SRCDIR"
+-    exit 1
+   fi
+   ;;
+ esac
+
--- a/pkgs/tools/system/augeas/default.nix
+++ b/pkgs/tools/system/augeas/default.nix
@@ -1,23 +1,65 @@
-{ lib, stdenv, fetchurl, pkg-config, readline, libxml2 }:
+{ lib
+, stdenv
+, fetchFromGitHub
+, autoreconfHook
+, bison
+, flex
+, perl # for pod2man
+, pkg-config
+, readline
+, libxml2
+}:

 stdenv.mkDerivation rec {
  pname = "augeas";
-  version = "1.12.0";
+  version = "1.14.1";

-  src = fetchurl {
-    url = "http://download.augeas.net/${pname}-${version}.tar.gz";
-    sha256 = "11ybhb13wkkilsn7b416a1dn61m1xrq0lbdpkhp5w61jrk4l469j";
+  src = fetchFromGitHub {
+    owner = "hercules-team";
+    repo = "augeas";
+    rev = "release-${version}";
+    fetchSubmodules = true;
+    hash = "sha256-U5tm3LDUeI/idHtL2Zy33BigkyvHunXPjToDC59G9VE=";
  };
-  nativeBuildInputs = [ pkg-config ];
+
+  patches = [
+    # already have the submodules so don't fail when .git doesn't exist.
+    ./bootstrap.diff
+  ];
+
+  postPatch = ''
+    ./bootstrap --gnulib-srcdir=.gnulib
+  '';
+
+  nativeBuildInputs = [
+    autoreconfHook
+    bison
+    flex
+    perl
+    pkg-config
+  ];
+
  buildInputs = [ readline libxml2 ];

  enableParallelBuilding = true;

+  doCheck = true;
+
+  checkPhase = ''
+    runHook preCheck
+    patchShebangs --build gnulib/tests tests
+    make -j $NIX_BUILD_CORES check
+    runHook postCheck
+  '';
+
+  outputs = [ "out" "dev" ];
+
  meta = with lib; {
    description = "Configuration editing tool";
    license = licenses.lgpl21Only;
    homepage = "https://augeas.net/";
-    changelog = "https://augeas.net/news.html";
+    changelog = "https://github.com/hercules-team/augeas/releases/tag/release-${version}";
+    mainProgram = "augtool";
    maintainers = with maintainers; [ offline ];
    platforms = platforms.unix;
  };
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -263,6 +263,7 @@ mapAliases ({
  foundationdb60 = throw "foundationdb60 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
  foundationdb61 = throw "foundationdb61 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
  foxitreader = throw "foxitreader has been removed because it had vulnerabilities and was unmaintained"; # added 2023-02-20
+  fractal-next = fractal; # added 2023-11-25
  fuse2fs = if stdenv.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too.
  fx_cast_bridge = fx-cast-bridge; # added 2023-07-26

@@ -766,6 +767,7 @@ mapAliases ({
  qtcurve = libsForQt5.qtcurve; # Added 2020-11-07
  qtile-unwrapped = python3.pkgs.qtile; # Added 2023-05-12
  qutebrowser-qt6 = throw "'qutebrowser-qt6' has been replaced by 'qutebrowser', since the the qt5 version has been removed"; # Added 2023-08-19
+  quvi = throw "'quvi' has been removed, as it was broken and unmaintained"; # Added 2023-11-25

  ### R ###

--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2800,8 +2800,6 @@ with pkgs;

  rpcemu = callPackage ../applications/emulators/rpcemu { };

-  rpcs3 = libsForQt5.callPackage ../applications/emulators/rpcs3 { };
-
  ruffle = callPackage ../applications/emulators/ruffle { };

  ryujinx = callPackage ../applications/emulators/ryujinx { };
@@ -11538,8 +11536,6 @@ with pkgs;

  oh-my-posh = callPackage ../development/tools/oh-my-posh { };

-  oh-my-zsh = callPackage ../shells/zsh/oh-my-zsh { };
-
  ola = callPackage ../applications/misc/ola {
    protobuf = protobuf_21;
  };
@@ -15409,8 +15405,6 @@ with pkgs;

  fish = callPackage ../shells/fish { };

-  oh-my-fish = callPackage ../shells/fish/oh-my-fish { };
-
  wrapFish = callPackage ../shells/fish/wrapper.nix { };

  fishPlugins = recurseIntoAttrs (callPackage ../shells/fish/plugins { });
@@ -27285,7 +27279,9 @@ with pkgs;

  roon-server = callPackage ../servers/roon-server { };

-  rustic-rs = callPackage ../tools/backup/rustic-rs { inherit (darwin) Security; };
+  rustic-rs = callPackage ../tools/backup/rustic-rs {
+    inherit (darwin.apple_sdk.frameworks) Security SystemConfiguration;
+  };

  supervise = callPackage ../tools/system/supervise { };

@@ -31994,10 +31990,6 @@ with pkgs;

  fractal = callPackage ../applications/networking/instant-messengers/fractal { };

-  fractal-next = callPackage ../applications/networking/instant-messengers/fractal-next {
-    inherit (gst_all_1) gstreamer gst-plugins-base gst-plugins-bad;
-  };
-
  fragments = callPackage ../applications/networking/p2p/fragments { };

  freecad = libsForQt5.callPackage ../applications/graphics/freecad {
@@ -32141,8 +32133,6 @@ with pkgs;

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

-  libquvi = callPackage ../applications/video/quvi/library.nix { };
-
  LibreArp = callPackage ../applications/audio/LibreArp { };

  LibreArp-lv2 = callPackage ../applications/audio/LibreArp/lv2.nix { };
@@ -32191,13 +32181,6 @@ with pkgs;

  praat = callPackage ../applications/audio/praat { };

-  quvi = callPackage ../applications/video/quvi/tool.nix {
-    lua5_sockets = lua51Packages.luasocket;
-    lua5 = lua5_1;
-  };
-
-  quvi_scripts = callPackage ../applications/video/quvi/scripts.nix { };
-
  rhvoice = callPackage ../applications/audio/rhvoice { };

  svox = callPackage ../applications/audio/svox { };
@@ -32647,10 +32630,11 @@ with pkgs;
    wlroots_0_16
    wlroots;

+  wrapSway = callPackage ../applications/window-managers/sway/wrapper.nix { };
  sway-unwrapped = callPackage ../applications/window-managers/sway {
    wlroots = wlroots_0_16;
  };
-  sway = callPackage ../applications/window-managers/sway/wrapper.nix { };
+  sway = wrapSway sway-unwrapped;
  swaybg = callPackage ../applications/window-managers/sway/bg.nix { };
  swayidle = callPackage ../applications/window-managers/sway/idle.nix { };
  swaylock = callPackage ../applications/window-managers/sway/lock.nix { };
@@ -32661,7 +32645,8 @@ with pkgs;

  swaycons = callPackage ../applications/window-managers/sway/swaycons.nix { };

-  swayfx = callPackage ../applications/window-managers/sway/fx.nix { };
+  swayfx-unwrapped = callPackage ../applications/window-managers/sway/fx.nix { };
+  swayfx = wrapSway swayfx-unwrapped;

  swaylock-fancy = callPackage ../applications/window-managers/sway/lock-fancy.nix { };

--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13421,6 +13421,8 @@ self: super: with self; {

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

+  sqlmodel = callPackage ../development/python-modules/sqlmodel { };
+
  sqlobject = callPackage ../development/python-modules/sqlobject { };

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