Merge staging-next into staging

2024-11-25 08:23:09 +00:00 · 2024-05-23 00:02:52 +00:00 · 2024-05-23 00:02:52 +00:00 · e86d339640
commit e86d339640
parent dfe5aa3439 2cd117dd2e
65 changed files with 3184 additions and 2201 deletions
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@ -13018,6 +13018,12 @@
    githubId = 14259816;
    name = "Abin Simon";
  };
+  me-and = {
+    name = "Adam Dinwoodie";
+    email = "nix.thunder.wayne@post.dinwoodie.org";
+    github = "me-and";
+    githubId = 1397507;
+  };
  meatcar = {
    email = "nixpkgs@denys.me";
    github = "meatcar";
@ -18405,6 +18411,11 @@
    github = "sei40kr";
    githubId = 11665236;
  };
+  seineeloquenz = {
+    name = "Alexander Linder";
+    github = "SeineEloquenz";
+    githubId = 34923333;
+  };
  seirl = {
    name = "Antoine Pietri";
    email = "antoine.pietri1@gmail.com";
--- a/pkgs/applications/editors/tijolo/default.nix
+++ b/pkgs/applications/editors/tijolo/default.nix
@ -2,34 +2,49 @@
 , lib
 , fetchFromGitHub
 , crystal
-, vte
+, vte-gtk4
 , libgit2
+, gtk4
+, libadwaita
 , editorconfig-core-c
-, gtksourceview4
-, wrapGAppsHook3
+, gtksourceview5
+, wrapGAppsHook4
+, gobject-introspection
 , desktopToDarwinBundle
 }:
+
 crystal.buildCrystalPackage rec {
  pname = "tijolo";
-  version = "0.7.4";
+  version = "0.8.1";

  src = fetchFromGitHub {
    owner = "hugopl";
    repo = "tijolo";
    rev = "v${version}";
-    hash = "sha256-3TfXvRVP3lu43qF3RWCHnZ3czTaSl5EzrhuTlpnMfKo=";
+    hash = "sha256-+sRcS5bVH6WLmSDLiPw608OB6OjBVwLqWxGT5Y6caBc=";
  };

-  nativeBuildInputs = [ wrapGAppsHook3 ]
+  postPatch = ''
+    substituteInPlace Makefile \
+      --replace-fail "shards install" "true"
+  '';
+
+  shardsFile = ./shards.nix;
+  copyShardDeps = true;
+
+  preBuild = ''
+    cd lib/gi-crystal && shards build -Dpreview_mt --release --no-debug
+    cd ../.. && mkdir bin/ && cp lib/gi-crystal/bin/gi-crystal bin/
+  '';
+
+  nativeBuildInputs = [ wrapGAppsHook4 gobject-introspection ]
    ++ lib.optionals stdenv.isDarwin [ desktopToDarwinBundle ];
-  buildInputs = [ vte libgit2 gtksourceview4 editorconfig-core-c ];
+  buildInputs = [ gtk4 libadwaita vte-gtk4 libgit2 gtksourceview5 editorconfig-core-c ];

  buildTargets = [ "all" ];
  doCheck = false;

-  shardsFile = ./shards.nix;
-
-  installTargets = [ "install" "install-fonts"];
+  installTargets = [ "install" "post-install" "install-fonts"];
  doInstallCheck = false;

  meta = with lib; {
--- a/pkgs/applications/editors/tijolo/shards.nix
+++ b/pkgs/applications/editors/tijolo/shards.nix
@ -1,27 +1,42 @@
 {
-  compiled_license = {
-    url = "https://github.com/elorest/compiled_license.git";
-    rev = "v1.2.2";
-    sha256 = "1f412r6m31cc093lcw31m2rp5s3y7vh6q3wc3xh9b8vccvmj21p7";
-  };
  fzy = {
    url = "https://github.com/hugopl/fzy.git";
    rev = "v0.5.5";
    sha256 = "1zk95m43ymx9ilwr6iw9l44nkmp4sas28ib0dkr07hkhgrkw68sv";
  };
-  gobject = {
-    url = "https://github.com/jhass/crystal-gobject.git";
-    rev = "v0.10.0";
-    sha256 = "02cc3486ifbffdbvgl75ylwn47gpfb2j0srz92jx5yz1d596x746";
+  gi-crystal = {
+    url = "https://github.com/hugopl/gi-crystal.git";
+    rev = "v0.22.2";
+    sha256 = "0bpa1f8iaf97z2kbgjc7nc8km7nd7bppiwna319lm2hvm8m5pw15";
+  };
+  gtk4 = {
+    url = "https://github.com/hugopl/gtk4.cr.git";
+    rev = "v0.16.1";
+    sha256 = "1cqkbh072y70l8g0p040vf50k920p32ry1larnwn9mqabd74jwaj";
+  };
+  harfbuzz = {
+    url = "https://github.com/hugopl/harfbuzz.cr.git";
+    rev = "v0.2.0";
+    sha256 = "06wgqxwyib5416yp53j2iwcbr3bl4jjxb1flm7z103l365par694";
+  };
+  libadwaita = {
+    url = "https://github.com/geopjr/libadwaita.cr.git";
+    rev = "cffabb56e911d2a90c53c2fd14d6bd08bf5ac446";
+    sha256 = "0gcq04vgxg0vff9fcalgzq9phq0y76diihkzhlfn91bdxwkx7rl3";
+  };
+  pango = {
+    url = "https://github.com/hugopl/pango.cr.git";
+    rev = "v0.3.1";
+    sha256 = "0xlf127flimnll875mcq92q7xsi975rrgdpcpmnrwllhdhfx9qmv";
  };
  toml = {
    url = "https://github.com/crystal-community/toml.cr.git";
    rev = "v0.7.0";
    sha256 = "0vznx2irvx6m8w6chdf9ms72n2w0cf2m5cwh0cjmp1jz9y3xwv7z";
  };
-  version_from_shard = {
-    url = "https://github.com/hugopl/version_from_shard.git";
-    rev = "v1.2.5";
-    sha256 = "0xizj0q4rd541rwjbx04cjifc2gfx4l5v6q2y7gmd0ndjmkgb8ik";
+  vte = {
+    url = "https://github.com/hugopl/vte.cr.git";
+    rev = "v0.1.0";
+    sha256 = "18x2l9cm8czhwpdfng3rz00kn07c49y0555kf2j5l2wb0g05snh3";
  };
 }
--- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix
+++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix
@ -77,14 +77,14 @@ let
    urllib3
  ];
 in mkDerivation rec {
-  version = "3.34.6";
+  version = "3.34.7";
  pname = "qgis-ltr-unwrapped";

  src = fetchFromGitHub {
    owner = "qgis";
    repo = "QGIS";
    rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-eWd8oIINWVN5Dt6s4bc1RtQbytFd0foPgIcd/N2hsMw=";
+    hash = "sha256-6fIBmIoCVo0AtkjC4Vn3jMjz93gZmvkFAgo+KnasyXo=";
  };

  passthru = {
--- a/pkgs/applications/gis/qgis/unwrapped.nix
+++ b/pkgs/applications/gis/qgis/unwrapped.nix
@ -78,14 +78,14 @@ let
    urllib3
  ];
 in mkDerivation rec {
-  version = "3.36.2";
+  version = "3.36.3";
  pname = "qgis-unwrapped";

  src = fetchFromGitHub {
    owner = "qgis";
    repo = "QGIS";
    rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-/8mpzl/6UpjrMVjae2nqpS2DBRCq86rE+B3INzoRz8g=";
+    hash = "sha256-uPyW/zzoyyd3SXvP+h9joJEv9DjRNJSaorx1rNmAaFQ=";
  };

  passthru = {
--- a/pkgs/applications/graphics/paraview/default.nix
+++ b/pkgs/applications/graphics/paraview/default.nix
@ -6,13 +6,13 @@
 }:

 let
-  version = "5.11.2";
+  version = "5.12.0";

  docFiles = [
    (fetchurl {
      url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewTutorial-${version}.pdf";
      name = "Tutorial.pdf";
-      hash = "sha256-KIcd5GG+1L3rbj4qdLbc+eDa5Wy4+nqiVIxfHu5Tdpg=";
+      hash = "sha256-ETA799peqP9RAjcqPBwVb8egKfQJAuIXNgso+k8o50Q=";
    })
    (fetchurl {
      url = "https://www.paraview.org/paraview-downloads/download.php?submit=Download&version=v${lib.versions.majorMinor version}&type=data&os=Sources&downloadFile=ParaViewGettingStarted-${version}.pdf";
@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
    owner = "paraview";
    repo = "paraview";
    rev = "v${version}";
-    hash = "sha256-fe/4xxxlkal08vE971FudTnESFfGMYzuvSyAMS6HSxI=";
+    hash = "sha256-PAD48IlOU39TosjfTiDz7IjEeYEP/7F75M+8dYBIUxI=";
    fetchSubmodules = true;
  };

@ -86,12 +86,6 @@ in stdenv.mkDerivation rec {
    qtsvg
  ];

-  patches = [
-    ./dont-redefine-strlcat.patch
-  ];
-
-  env.CXXFLAGS = "-include cstdint";
-
  postInstall = let docDir = "$out/share/paraview-${lib.versions.majorMinor version}/doc"; in
    lib.optionalString withDocs ''
      mkdir -p ${docDir};
--- a/pkgs/applications/graphics/paraview/dont-redefine-strlcat.patch
+++ b/pkgs/applications/graphics/paraview/dont-redefine-strlcat.patch
@ -1,28 +0,0 @@
--- a/VTK/ThirdParty/netcdf/vtknetcdf/include/vtk_netcdf_mangle.h	2023-11-27 21:11:33.562949964 +0100
-+++ b/VTK/ThirdParty/netcdf/vtknetcdf/include/vtk_netcdf_mangle.h	2023-11-27 21:11:33.562949964 +0100
-@@ -1246,7 +1246,7 @@
- #define write_numrecs vtknetcdf_write_numrecs
- 
- /* Only define strlcat conditionally, as it's provided by system headers on the BSDs. */
-#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && !defined(__OpenBSD__) && !defined(_BSD_SOURCE)
-+#ifndef HAVE_STRLCAT
- #define strlcat vtknetcdf_strlcat
- #endif
- 
--- a/VTK/ThirdParty/netcdf/vtknetcdf/config.h.in	2023-11-27 21:10:35.113525241 +0100
-+++ b/VTK/ThirdParty/netcdf/vtknetcdf/config.h.in	2023-11-27 21:10:55.241982399 +0100
-@@ -1,7 +1,5 @@
- /* config.h.in.  Generated from configure.ac by autoheader.  */
- 
-#include "vtk_netcdf_mangle.h"
-
- /* Define if building universal (internal helper macro) */
- #cmakedefine AC_APPLE_UNIVERSAL_BUILD
- 
-@@ -621,4 +619,6 @@
- #endif
- #endif
- 
-+#include "vtk_netcdf_mangle.h"
-+
- #include "ncconfigure.h"
--- a/pkgs/applications/networking/cluster/temporal-cli/default.nix
+++ b/pkgs/applications/networking/cluster/temporal-cli/default.nix
@ -44,7 +44,7 @@ let
    doCheck = !(stdenv.isDarwin && stdenv.hostPlatform.isx86_64);

    preCheck = ''
-      export HOME=$(mktemp -d)
+      export HOME="$(mktemp -d)"
    '';

    postInstall = ''
@ -63,16 +63,16 @@ let

  tctl = buildGoModule rec {
    pname = "tctl";
-    version = "1.18.0";
+    version = "1.18.1";

    src = fetchFromGitHub {
      owner = "temporalio";
      repo = "tctl";
      rev = "v${version}";
-      hash = "sha256-LcBKkx3mcDOrGT6yJx98CSgxbwskqGPWqOzHWOu6cig=";
+      hash = "sha256-LX4hyPme+mkNmPvrTHIT5Ow3QM8BTAB7MXSY1fa8tSk=";
    };

-    vendorHash = "sha256-5wCIY95mJ6+FCln4yBu+fM4ZcsxBGcXkCvxjGzt0+dM=";
+    vendorHash = "sha256-294lnUKnXNrN6fJ+98ub7LwsJ9aT+FzWCB3nryfAlCI=";

    inherit overrideModAttrs;

@ -83,7 +83,7 @@ let
    ldflags = [ "-s" "-w" ];

    preCheck = ''
-      export HOME=$(mktemp -d)
+      export HOME="$(mktemp -d)"
    '';

    postInstall = ''
--- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
+++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix
@ -76,11 +76,11 @@ in buildPythonPackage {
    cp contrib/matrix_decrypt.py $out/bin/matrix_decrypt
    cp contrib/matrix_sso_helper.py $out/bin/matrix_sso_helper
    substituteInPlace $out/bin/matrix_upload \
-      --replace '/usr/bin/env -S python3' '${scriptPython}/bin/python'
+      --replace-fail '/usr/bin/env -S python3' '${scriptPython}/bin/python'
    substituteInPlace $out/bin/matrix_sso_helper \
-      --replace '/usr/bin/env -S python3' '${scriptPython}/bin/python'
+      --replace-fail '/usr/bin/env -S python3' '${scriptPython}/bin/python'
    substituteInPlace $out/bin/matrix_decrypt \
-      --replace '/usr/bin/env python3' '${scriptPython}/bin/python'
+      --replace-fail '/usr/bin/env python3' '${scriptPython}/bin/python'

    mkdir -p $out/${python.sitePackages}
    cp -r matrix $out/${python.sitePackages}/matrix
@ -90,7 +90,8 @@ in buildPythonPackage {
  postFixup = ''
    addToSearchPath program_PYTHONPATH $out/${python.sitePackages}
    patchPythonScript $out/share/matrix.py
-    substituteInPlace $out/${python.sitePackages}/matrix/server.py --replace \"matrix_sso_helper\" \"$out/bin/matrix_sso_helper\"
+    substituteInPlace $out/${python.sitePackages}/matrix/server.py --replace-fail \"matrix_sso_helper\" \"$out/bin/matrix_sso_helper\"
+    substituteInPlace $out/${python.sitePackages}/matrix/uploads.py --replace-fail \"matrix_upload\" \"$out/bin/matrix_upload\"
  '';

  meta = with lib; {
--- a/pkgs/applications/networking/juju/default.nix
+++ b/pkgs/applications/networking/juju/default.nix
@ -1,25 +1,38 @@
-{ lib, fetchFromGitHub, buildGoModule }:
+{ lib, fetchFromGitHub, buildGoModule, installShellFiles, testers, juju }:

 buildGoModule rec {
  pname = "juju";
-  version = "3.3.0";
+  version = "3.3.5";

  src = fetchFromGitHub {
    owner = "juju";
    repo = "juju";
-    rev = "juju-${version}";
-    sha256 = "sha256-8VSSTeN4a1zvMi4L4dR3q+kWKgYq8Jg1jDvFjEBD7jI=";
+    rev = "v${version}";
+    hash = "sha256-sp4KLRKII1oEmdbCHzs5fbE/68NbKrHE3bxO14byYFk=";
  };

-  vendorHash = "sha256-3hZywUpJe6g8IujbK0hcp12S6OKswLj/YYJGuPG06Es=";
-
-  # Disable tests because it attempts to use a mongodb instance
-  doCheck = false;
+  vendorHash = "sha256-a50W9V1xxmItHS2DZkkXYEZ7I6aJxDo1+IriOlMPDyw=";

  subPackages = [
    "cmd/juju"
  ];

+  nativeBuildInputs = [ installShellFiles ];
+
+  # Disable tests because it attempts to use a mongodb instance
+  doCheck = false;
+
+  postInstall = ''
+    for file in etc/bash_completion.d/*; do
+      installShellCompletion --bash "$file"
+    done
+  '';
+
+  passthru.tests.version = testers.testVersion {
+    package = juju;
+    command = "HOME=\"$(mktemp -d)\" juju --version";
+  };
+
  meta = with lib; {
    description = "Open source modelling tool for operating software in the cloud";
    homepage = "https://juju.is";
--- a/pkgs/applications/version-management/gitkraken/default.nix
+++ b/pkgs/applications/version-management/gitkraken/default.nix
@ -11,32 +11,32 @@ with lib;

 let
  pname = "gitkraken";
-  version = "9.13.0";
+  version = "10.0.1";

  throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";

  srcs = {
    x86_64-linux = fetchzip {
      url = "https://release.axocdn.com/linux/GitKraken-v${version}.tar.gz";
-      hash = "sha256-BBTa/MhfwTZ9YUJSGt8KocPn6f7m+W8G9yJr8I4NAtw=";
+      hash = "sha256-9xGplvSm0SVwNokO5WrEHejY5KhQfaYvIguaNR/IDM4=";
    };

    x86_64-darwin = fetchzip {
      url = "https://release.axocdn.com/darwin/GitKraken-v${version}.zip";
-      hash = "sha256-+1N4U5vV8XdHdtPeanjU38c8fzfY0uV0AA6exEe/FzQ=";
+      hash = "sha256-mRMHw6hAQocOFbJBC4LhmxdJ9Xd3ejGiTTwPk5XIeDc=";
    };

    aarch64-darwin = fetchzip {
      url = "https://release.axocdn.com/darwin-arm64/GitKraken-v${version}.zip";
-      hash = "sha256-kNX8ptDL8vvFDhH3bDU24A2xN1D+tgpzsCj/zIGqctE=";
+      hash = "sha256-qqeuhhBux6z/uytdmmaTrqz8m+IDfgmQDCdqggBgroY=";
    };
  };

  src = srcs.${stdenv.hostPlatform.system} or throwSystem;

  meta = {
-    homepage = "https://www.gitkraken.com/";
-    description = "The downright luxurious and most popular Git client for Windows, Mac & Linux";
+    homepage = "https://www.gitkraken.com/git-client";
+    description = "Simplifying Git for any OS";
    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
    license = licenses.unfree;
    platforms = builtins.attrNames srcs;
@ -97,13 +97,13 @@ let
    ];

    desktopItems = [ (makeDesktopItem {
-      name = "GitKraken";
+      name = "GitKraken Desktop";
      exec = "gitkraken";
      icon = "gitkraken";
-      desktopName = "GitKraken";
+      desktopName = "GitKraken Desktop";
      genericName = "Git Client";
      categories = [ "Development" ];
-      comment = "Graphical Git client from Axosoft";
+      comment = "Unleash your repo";
    }) ];

    nativeBuildInputs = [ copyDesktopItems (wrapGAppsHook3.override { makeWrapper = makeShellWrapper; }) ];
--- a/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprpaper/default.nix
@ -17,13 +17,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "hyprpaper";
-  version = "0.6.0";
+  version = "0.7.0";

  src = fetchFromGitHub {
    owner = "hyprwm";
    repo = finalAttrs.pname;
    rev = "v${finalAttrs.version}";
-    hash = "sha256-mqxnaNiCVJS88Dk4V1v2wdS0RaCbOk8HFOUUbp0Uiy0=";
+    hash = "sha256-l13c8ALA7ZKDgluYA1C1OfkDGYD6e1/GR6LJnxCLRhA=";
  };

  nativeBuildInputs = [
--- a/pkgs/by-name/cu/cups-kyocera-3500-4500/package.nix
+++ b/pkgs/by-name/cu/cups-kyocera-3500-4500/package.nix
@ -0,0 +1,86 @@
+{ lib
+, stdenv
+, fetchzip
+, cups
+, autoPatchelfHook
+, python3Packages
+
+# Sets the default paper format: use "EU" for A4, or "Global" for Letter
+, region ? "EU"
+}:
+
+assert region == "Global" || region == "EU";
+
+let
+  kyodialog_version_short = "9";
+  kyodialog_version_long = "9.0";
+  date = "20221003";
+in
+stdenv.mkDerivation rec {
+  pname = "cups-kyocera-3500-4500";
+  version = "${kyodialog_version_long}-${date}";
+
+  dontStrip = true;
+
+  src = fetchzip {
+    # Steps to find the release download URL:
+    # 1. Go to https://www.kyoceradocumentsolutions.us/en/support/downloads.html
+    # 2. Search for printer model, e.g. "TASKalfa 6053ci"
+    # 3. Locate e.g. "Linux Print Driver (9.3)" in the list
+    urls = [
+      "https://dam.kyoceradocumentsolutions.com/content/dam/gdam_dc/dc_global/executables/driver/product_085/KyoceraLinuxPackages-${date}.tar.gz"
+    ];
+    hash = "sha256-pqBtfKiQo/+cF8fG5vsEQvr8UdxjGsSShXI+6bun03c=";
+    extension = "tar.gz";
+    stripRoot = false;
+    postFetch = ''
+      # delete redundant Linux package dirs to reduce size in the Nix store; only keep Debian
+      rm -r $out/{CentOS,Fedora,OpenSUSE,Redhat,Ubuntu}
+    '';
+  };
+
+  sourceRoot = ".";
+
+  unpackCmd = let
+    platforms = {
+      x86_64-linux = "amd64";
+      i686-linux = "i386";
+    };
+    platform = platforms.${stdenv.hostPlatform.system} or (throw "unsupported system: ${stdenv.hostPlatform.system}");
+  in ''
+    ar p "$src/Debian/${region}/kyodialog_${platform}/kyodialog_${kyodialog_version_long}-0_${platform}.deb" data.tar.gz | tar -xz
+  '';
+
+  nativeBuildInputs = [ autoPatchelfHook python3Packages.wrapPython ];
+
+  buildInputs = [ cups ];
+
+  # For lib/cups/filter/kyofilter_pre_H.
+  # The source already contains a copy of pypdf3, but we use the Nix package
+  propagatedBuildInputs = with python3Packages; [ reportlab pypdf3 setuptools ];
+
+  installPhase = ''
+    # allow cups to find the ppd files
+    mkdir -p $out/share/cups/model
+    mv ./usr/share/kyocera${kyodialog_version_short}/ppd${kyodialog_version_short} $out/share/cups/model/Kyocera
+
+    # remove absolute path prefixes to filters in ppd
+    find $out -name "*.ppd" -exec sed -E -i "s:/usr/lib/cups/filter/::g" {} \;
+
+    mkdir -p $out/lib/cups/
+    mv ./usr/lib/cups/filter/ $out/lib/cups/
+    # for lib/cups/filter/kyofilter_pre_H
+    wrapPythonProgramsIn $out/lib/cups/filter "$propagatedBuildInputs"
+
+    install -Dm444 usr/share/doc/kyodialog/copyright $out/share/doc/${pname}/copyright
+  '';
+
+  meta = with lib; {
+    description = "CUPS drivers for Kyocera ECOSYS MA3500cix, MA3500cifx, MA4000cix, MA4000cifx, PA3500cx, PA4000cx and PA4500cx, for Kyocera CS MA4500ci and PA4500ci, and for Kyocera TASKalfa MA3500ci, MA4500ci and PI4500ci printers";
+    homepage = "https://www.kyoceradocumentsolutions.com";
+    sourceProvenance = [ sourceTypes.binaryNativeCode ];
+    license = licenses.unfree;
+    maintainers = [ maintainers.me-and ];
+    platforms = [ "i686-linux" "x86_64-linux" ];
+  };
+}
--- a/pkgs/by-name/da/davis/package.nix
+++ b/pkgs/by-name/da/davis/package.nix
@ -6,13 +6,13 @@

 php.buildComposerProject (finalAttrs: {
  pname = "davis";
-  version = "4.4.2";
+  version = "4.4.3";

  src = fetchFromGitHub {
    owner = "tchapi";
    repo = "davis";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-oPzMBCOcAJoHni9SO74RuJDEOcVYc4MtO5rGq1E9g3Q=";
+    hash = "sha256-0Km4bLQVfbkr5BL8XY5tM147Sje8hcFOjhCRnXq+4d4=";
  };

  vendorHash = "sha256-NOb6rc9jVsf+/RVOW7SLBAJk9SihcRxoepUEGBGLi2w=";
--- a/pkgs/by-name/fu/furmark/package.nix
+++ b/pkgs/by-name/fu/furmark/package.nix
@ -39,7 +39,9 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "furmark";
-  version = versions.${stdenv.hostPlatform.system};
+  version =
+    versions.${stdenv.hostPlatform.system}
+      or (throw "Furmark is not available on ${stdenv.hostPlatform.system}");

  src = fetchzip sources.${stdenv.hostPlatform.system};

--- a/pkgs/by-name/gi/github-desktop/package.nix
+++ b/pkgs/by-name/gi/github-desktop/package.nix
@ -17,6 +17,7 @@
 , mesa
 , systemd
 , openssl
+, libglvnd
 }:

 let
@ -82,6 +83,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
  preFixup = ''
    gappsWrapperArgs+=(
      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland}}"
+      --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libglvnd ]}
    )
  '';

--- a/pkgs/by-name/in/inja/package.nix
+++ b/pkgs/by-name/in/inja/package.nix
@ -0,0 +1,46 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  nlohmann_json,
+  doctest,
+  callPackage,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "inja";
+  version = "3.4.0";
+
+  src = fetchFromGitHub {
+    owner = "pantor";
+    repo = "inja";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-B1EaR+qN32nLm3rdnlZvXQ/dlSd5XSc+5+gzBTPzUZU=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+  propagatedBuildInputs = [ nlohmann_json ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "INJA_BUILD_TESTS" finalAttrs.finalPackage.doCheck)
+    (lib.cmakeBool "INJA_USE_EMBEDDED_JSON" false)
+    (lib.cmakeBool "BUILD_BENCHMARK" false)
+  ];
+
+  checkInputs = [ doctest ];
+  doCheck = true;
+
+  passthru.tests = {
+    simple-cmake = callPackage ./simple-cmake-test { };
+  };
+
+  meta = {
+    changelog = "https://github.com/pantor/inja/releases/tag/v${finalAttrs.version}";
+    description = "Template engine for modern C++, loosely inspired by jinja for python";
+    homepage = "https://github.com/pantor/inja";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ xokdvium ];
+    platforms = lib.platforms.all;
+  };
+})
--- a/pkgs/by-name/in/inja/simple-cmake-test/CMakeLists.txt
+++ b/pkgs/by-name/in/inja/simple-cmake-test/CMakeLists.txt
@ -0,0 +1,5 @@
+project(inja-simple-cmake-test LANGUAGES CXX)
+find_package(inja REQUIRED)
+add_executable(simple-cmake-test main.cpp)
+target_link_libraries(simple-cmake-test PRIVATE pantor::inja)
+install(TARGETS simple-cmake-test DESTINATION bin)
--- a/pkgs/by-name/in/inja/simple-cmake-test/default.nix
+++ b/pkgs/by-name/in/inja/simple-cmake-test/default.nix
@ -0,0 +1,27 @@
+{
+  stdenv,
+  cmake,
+  inja,
+  lib,
+}:
+
+stdenv.mkDerivation {
+  name = "inja-simple-cmake-test";
+  src = lib.fileset.toSource {
+    root = ./.;
+    fileset = lib.fileset.unions [
+      ./main.cpp
+      ./CMakeLists.txt
+    ];
+  };
+  nativeBuildInputs = [ cmake ];
+  buildInputs = [ inja ];
+  doInstallCheck = true;
+  installCheckPhase = ''
+    if [[ `$out/bin/simple-cmake-test` != "Hello world!" ]]; then
+      echo "ERROR: $out/bin/simple-cmake-test does not output 'Hello world!'"
+      exit 1
+    fi
+  '';
+  meta.timeout = 30;
+}
--- a/pkgs/by-name/in/inja/simple-cmake-test/main.cpp
+++ b/pkgs/by-name/in/inja/simple-cmake-test/main.cpp
@ -0,0 +1,8 @@
+#include <inja/inja.hpp>
+#include <iostream>
+#include <nlohmann/json.hpp>
+
+int main() {
+  nlohmann::json data = {{"name", "world"}};
+  inja::render_to(std::cout, "Hello {{ name }}!", data);
+}
--- a/pkgs/by-name/ks/ks/package.nix
+++ b/pkgs/by-name/ks/ks/package.nix
@ -0,0 +1,30 @@
+{ stdenv
+, lib
+, fetchFromGitHub
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "ks";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "loteoo";
+    repo = "ks";
+    rev = "${finalAttrs.version}";
+    hash = "sha256-jGo0u0wiwOc2n8x0rvDIg1suu6vJQ5UCfslYD5vUlyI=";
+  };
+
+  installPhase = ''
+    mkdir -p $out/bin
+    cp ${finalAttrs.pname} $out/bin/
+  '';
+
+  meta = {
+    mainProgram = "ks";
+    homepage = "https://github.com/loteoo/ks";
+    description = "Command-line secrets manager powered by macOS keychains";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ ivankovnatsky ];
+    platforms = lib.platforms.darwin;
+  };
+})
--- a/pkgs/by-name/ma/matrix-commander-rs/package.nix
+++ b/pkgs/by-name/ma/matrix-commander-rs/package.nix
@ -1,10 +1,11 @@
-{ lib
-, stdenv
-, darwin
-, fetchFromGitHub
-, openssl
-, pkg-config
-, rustPlatform
+{
+  lib,
+  stdenv,
+  darwin,
+  fetchFromGitHub,
+  openssl,
+  pkg-config,
+  rustPlatform,
 }:

 rustPlatform.buildRustPackage rec {
@ -20,16 +21,14 @@ rustPlatform.buildRustPackage rec {

  cargoHash = "sha256-2biUWLWE0XtmB79yxFahQqLmqwH/6q50IhkcbUrBifU=";

-  nativeBuildInputs = [
-    pkg-config
-  ];
+  nativeBuildInputs = [ pkg-config ];

-  buildInputs = [
-    openssl
-  ] ++ lib.optionals stdenv.isDarwin [
-    darwin.apple_sdk.frameworks.Security
-    darwin.apple_sdk.frameworks.SystemConfiguration
-  ];
+  buildInputs =
+    [ openssl ]
+    ++ lib.optionals stdenv.isDarwin [
+      darwin.apple_sdk.frameworks.Security
+      darwin.apple_sdk.frameworks.SystemConfiguration
+    ];

  meta = with lib; {
    description = "CLI-based Matrix client app for sending and receiving";
--- a/pkgs/by-name/ma/matrix-media-repo/package.nix
+++ b/pkgs/by-name/ma/matrix-media-repo/package.nix
@ -0,0 +1,68 @@
+{ lib
+, buildGoModule
+, fetchFromGitHub
+, pkg-config
+, libde265
+, libheif
+}:
+let
+  pname = "matrix-media-repo";
+  version = "1.3.4";
+
+  src = fetchFromGitHub {
+    owner = "t2bot";
+    repo = "matrix-media-repo";
+    rev = "v${version}";
+    hash = "sha256-wC69OiB3HjRs/i46+E1YS+M4zKmvH5vENHyfgU7nt1I=";
+  };
+
+  vendorHash = "sha256-STzpKqn47qS0iogVYhFl4QBfKUtnqgxobqv1WaW6UtQ=";
+
+  asset-compiler = buildGoModule {
+    pname = "${pname}-compile_assets";
+    inherit version src vendorHash;
+
+    subPackages = [
+      "cmd/utilities/compile_assets"
+    ];
+  };
+in
+
+buildGoModule {
+  inherit pname version src vendorHash;
+
+  patches = [
+    ./synapse-import-u+x.patch
+  ];
+
+  nativeBuildInputs = [
+    pkg-config
+    asset-compiler
+  ];
+
+  buildInputs = [
+    libde265
+    libheif
+  ];
+
+  preBuild = ''
+    compile_assets
+  '';
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X" "github.com/t2bot/matrix-media-repo/common/version.Version=${version}"
+  ];
+
+  doCheck = false; # requires docker
+
+  meta = with lib; {
+    description = "Highly configurable multi-domain media repository for Matrix";
+    homepage = "https://github.com/t2bot/matrix-media-repo";
+    changelog = "https://github.com/t2bot/matrix-media-repo/blob/${src.rev}/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ hexa ];
+    mainProgram = "media_repo";
+  };
+}
--- a/pkgs/by-name/ma/matrix-media-repo/synapse-import-u+x.patch
+++ b/pkgs/by-name/ma/matrix-media-repo/synapse-import-u+x.patch
@ -0,0 +1,22 @@
+diff --git a/cmd/homeserver_offline_exporters/import_to_synapse/main.go b/cmd/homeserver_offline_exporters/import_to_synapse/main.go
+index 3c7db1e..c6cba4f 100644
+--- a/cmd/homeserver_offline_exporters/import_to_synapse/main.go
+++ b/cmd/homeserver_offline_exporters/import_to_synapse/main.go
+@@ -78,7 +78,7 @@ func main() {
+ 
+ 		ctx.Log.Infof("Copying %s", mxc)
+ 		directories := path.Join(cfg.ExportPath, "local_content", record.MediaId[0:2], record.MediaId[2:4])
+-		err = os.MkdirAll(directories, 0655)
+		err = os.MkdirAll(directories, 0755)
+ 		if err != nil {
+ 			return err
+ 		}
+@@ -134,7 +134,7 @@ func main() {
+ 				dirLock.Lock()
+ 				defer dirLock.Unlock()
+ 				thumbDir := path.Join(cfg.ExportPath, "local_thumbnails", record.MediaId[0:2], record.MediaId[2:4], record.MediaId[4:])
+-				err = os.MkdirAll(thumbDir, 0655)
+				err = os.MkdirAll(thumbDir, 0755)
+ 				if err != nil {
+ 					ctx.Log.Warn("Error creating thumbnail directories. ", s, err)
+ 					return
--- a/pkgs/by-name/mo/mods/package.nix
+++ b/pkgs/by-name/mo/mods/package.nix
@ -1,9 +1,10 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
-, gitUpdater
-, testers
-, mods
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  gitUpdater,
+  testers,
+  mods,
 }:

 buildGoModule rec {
@ -19,7 +20,14 @@ buildGoModule rec {

  vendorHash = "sha256-BL5bxyeVkcm7GO1Kzk9d/hj2wY50UhauEFq9YQ/JbCE=";

-  ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
+  ldflags = [
+    "-s"
+    "-w"
+    "-X=main.Version=${version}"
+  ];
+
+  # These tests require internet access.
+  checkFlags = [ "-skip=^TestLoad/http_url$|^TestLoad/https_url$" ];

  passthru = {
    updateScript = gitUpdater {
--- a/pkgs/by-name/ne/nekoray/package.nix
+++ b/pkgs/by-name/ne/nekoray/package.nix
@ -96,6 +96,7 @@ stdenv.mkDerivation (finalAttrs: {
  buildInputs = [
    libsForQt5.qtbase
    libsForQt5.qttools
+    libsForQt5.qtwayland
    libsForQt5.qtx11extras
    protobuf
    yaml-cpp
--- a/pkgs/by-name/ni/nix-janitor/package.nix
+++ b/pkgs/by-name/ni/nix-janitor/package.nix
@ -0,0 +1,32 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "nix-janitor";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "nobbz";
+    repo = "nix-janitor";
+    rev = "refs/tags/${version}";
+    hash = "sha256-nGtbBNU6xFWXnmL1AaUbSpO0z5Kq2t/Mn8sqwzjNlkE=";
+  };
+
+  cargoHash = "sha256-j3i4c3KjI8ehg42FqbPp+8M15zT9Bu76P4zv8ApUoeA=";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    homepage = "https://github.com/nobbz/nix-janitor";
+    changelog = "https://github.com/NobbZ/nix-janitor/blob/${version}/CHANGELOG.md";
+    description = "A tool to clean up old profile generations";
+    mainProgram = "janitor";
+    platforms = lib.platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.nobbz ];
+  };
+}
--- a/pkgs/by-name/ri/river/build.zig.zon.nix
+++ b/pkgs/by-name/ri/river/build.zig.zon.nix
@ -0,0 +1,34 @@
+# generated by zon2nix (https://github.com/nix-community/zon2nix)
+
+{ linkFarm, fetchzip }:
+
+linkFarm "zig-packages" [
+  {
+    name = "122014eeb4600a059bdcfe1c864862f17e6d5e4237e3bb7d6818f2a5583f6f4eb843";
+    path = fetchzip {
+      url = "https://codeberg.org/ifreund/zig-pixman/archive/v0.1.0.tar.gz";
+      hash = "sha256-Atfkiyt9v+GWry3xA2Y0Iv6AvwbZ+EHfHLmX0AUEz6Y=";
+    };
+  }
+  {
+    name = "1220714d1cc39c3abb1d9c22a0b838d847ead099cb7d9931821490483f30c022e827";
+    path = fetchzip {
+      url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.17.0.tar.gz";
+      hash = "sha256-C1D2dBn65Z9PmDacpeYbdX574fcOyYi/BJVDUMibkPA=";
+    };
+  }
+  {
+    name = "1220840390382c88caf9b0887f6cebbba3a7d05960b8b2ee6d80567b2950b71e5017";
+    path = fetchzip {
+      url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.1.0.tar.gz";
+      hash = "sha256-xilmsDGWlkfpTiGff+/nb76jx87ANdr4zqYy6rKOBMg=";
+    };
+  }
+  {
+    name = "1220b0f8f822c1625af7aae4cb3ab2c4ec1a4c0e99ef32867b2a8d88bb070b3e7f6d";
+    path = fetchzip {
+      url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.1.0.tar.gz";
+      hash = "sha256-VLEx8nRgmJZWgLNBRqrR7bZEkW0m5HTRv984HKwoIfA=";
+    };
+  }
+]
--- a/pkgs/applications/window-managers/river/default.nix
+++ b/pkgs/applications/window-managers/river/default.nix
@ -1,5 +1,6 @@
 { lib
 , stdenv
+, callPackage
 , fetchFromGitea
 , libGL
 , libX11
@ -14,14 +15,14 @@
 , wayland-protocols
 , wlroots_0_17
 , xwayland
-, zig_0_11
+, zig_0_12
 , withManpages ? true
 , xwaylandSupport ? true
 }:

 stdenv.mkDerivation (finalAttrs: {
  pname = "river";
-  version = "0.3.1";
+  version = "0.3.2";

  outputs = [ "out" ] ++ lib.optionals withManpages [ "man" ];

@ -31,14 +32,16 @@ stdenv.mkDerivation (finalAttrs: {
    repo = "river";
    rev = "refs/tags/v${finalAttrs.version}";
    fetchSubmodules = true;
-    hash = "sha256-H/908/TP2uzJD1yH4mCXHvorY+4kAhzEkWn6nZGsyBg=";
+    hash = "sha256-I09cR5aN7qXOzV9HDXaL4TjoeJcVa0Ch00zxOJokdDE=";
  };

+  deps = callPackage ./build.zig.zon.nix { };
+
  nativeBuildInputs = [
    pkg-config
    wayland
    xwayland
-    zig_0_11.hook
+    zig_0_12.hook
  ]
  ++ lib.optional withManpages scdoc;

@ -55,14 +58,19 @@ stdenv.mkDerivation (finalAttrs: {

  dontConfigure = true;

-  zigBuildFlags = lib.optional withManpages "-Dman-pages"
-                  ++ lib.optional xwaylandSupport "-Dxwayland";
+  zigBuildFlags = [
+    "--system"
+    "${finalAttrs.deps}"
+  ] ++ lib.optional withManpages "-Dman-pages" ++ lib.optional xwaylandSupport "-Dxwayland";

  postInstall = ''
    install contrib/river.desktop -Dt $out/share/wayland-sessions
  '';

-  passthru.providedSessions = [ "river" ];
+  passthru = {
+    providedSessions = [ "river" ];
+    updateScript = ./update.nu;
+  };

  meta = {
    homepage = "https://codeberg.org/river/river";
--- a/pkgs/by-name/ri/river/update.nu
+++ b/pkgs/by-name/ri/river/update.nu
@ -0,0 +1,8 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i nu -p nushell common-updater-scripts zon2nix
+
+let latest_tag = list-git-tags --url=https://codeberg.org/river/river | lines | sort --natural | str replace v '' | last
+update-source-version river $latest_tag
+
+http get $"https://codeberg.org/river/river/raw/tag/v($latest_tag)/build.zig.zon" | save build.zig.zon
+zon2nix > pkgs/by-name/ri/river/build.zig.zon.nix
--- a/pkgs/by-name/te/televido/package.nix
+++ b/pkgs/by-name/te/televido/package.nix
@ -0,0 +1,59 @@
+{ lib
+, stdenv
+, fetchFromGitHub
+, meson
+, ninja
+, pkg-config
+, rustPlatform
+, rustc
+, cargo
+, wrapGAppsHook4
+, blueprint-compiler
+, libadwaita
+, desktop-file-utils
+, openssl
+}:
+
+stdenv.mkDerivation rec {
+  pname = "televido";
+  version = "0.3.0";
+
+  src = fetchFromGitHub {
+    owner = "d-k-bo";
+    repo = "televido";
+    rev = "v${version}";
+    hash = "sha256-qfUwPyutBNEnplD3kmTJXffzcWkEcR6FTLnT5YDSysU=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoTarball {
+    inherit src;
+    name = "${pname}-${version}";
+    hash = "sha256-CmQQH6a5xMq+v+P4/sbpQ7iDaGKtzV39FgufD5uxz4Y=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    rustPlatform.cargoSetupHook
+    rustc
+    cargo
+    wrapGAppsHook4
+    blueprint-compiler
+    openssl
+  ];
+
+  buildInputs = [
+    libadwaita
+    desktop-file-utils
+  ];
+
+  meta = with lib; {
+    description = "Viewer for German-language public broadcasting live streams and archives";
+    homepage = "https://github.com/d-k-bo/televido";
+    license = licenses.gpl3;
+    mainProgram = "televido";
+    maintainers = with maintainers; [ seineeloquenz ];
+    platforms = platforms.linux;
+  };
+}
--- a/pkgs/by-name/tr/trealla/package.nix
+++ b/pkgs/by-name/tr/trealla/package.nix
@ -1,29 +1,35 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, libffi
-, openssl
-, readline
-, valgrind
-, xxd
-, gitUpdater
-, checkLeaks ? false
-, enableFFI ? true
-, enableSSL ? true
-, enableThreads ? true
-, lineEditingLibrary ? "isocline"
+{
+  lib,
+  fetchFromGitHub,
+  libffi,
+  openssl,
+  readline,
+  stdenv,
+  testers,
+  valgrind,
+  xxd,
+  # Boolean flags
+  checkLeaks ? false,
+  enableFFI ? true,
+  enableSSL ? true,
+  enableThreads ? true,
+  # Configurable inputs
+  lineEditingLibrary ? "isocline",
 }:

-assert lib.elem lineEditingLibrary [ "isocline" "readline" ];
+assert lib.elem lineEditingLibrary [
+  "isocline"
+  "readline"
+];
 stdenv.mkDerivation (finalAttrs: {
  pname = "trealla";
-  version = "2.34.0";
+  version = "2.52.6";

  src = fetchFromGitHub {
    owner = "trealla-prolog";
    repo = "trealla";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-cqIiPeQO/M8MtpHRomN/fzxIq7TgUwZSvL3PFCVsEnY=";
+    hash = "sha256-JTyXpaoHpf10fUNxx+qllhS0D9rfOP64BpjLQ9bob8k=";
  };

  postPatch = ''
@ -33,9 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
      --replace 'GIT_VERSION :=' 'GIT_VERSION ?='
  '';

-  nativeBuildInputs = [
-    xxd
-  ];
+  nativeBuildInputs = [ xxd ];

  buildInputs =
    lib.optionals enableFFI [ libffi ]
@ -46,13 +50,12 @@ stdenv.mkDerivation (finalAttrs: {

  strictDeps = true;

-  makeFlags = [
-    "GIT_VERSION=\"v${finalAttrs.version}\""
-  ]
-  ++ lib.optionals (lineEditingLibrary == "isocline") [ "ISOCLINE=1" ]
-  ++ lib.optionals (!enableFFI) [ "NOFFI=1" ]
-  ++ lib.optionals (!enableSSL) [ "NOSSL=1" ]
-  ++ lib.optionals enableThreads [ "THREADS=1" ];
+  makeFlags =
+    [ "GIT_VERSION=\"v${finalAttrs.version}\"" ]
+    ++ lib.optionals (lineEditingLibrary == "isocline") [ "ISOCLINE=1" ]
+    ++ lib.optionals (!enableFFI) [ "NOFFI=1" ]
+    ++ lib.optionals (!enableSSL) [ "NOSSL=1" ]
+    ++ lib.optionals enableThreads [ "THREADS=1" ];

  enableParallelBuilding = true;

@ -64,12 +67,15 @@ stdenv.mkDerivation (finalAttrs: {

  doCheck = !valgrind.meta.broken;

-  checkFlags = [
-    "test"
-  ] ++ lib.optionals checkLeaks [ "leaks" ];
+  checkFlags = [ "test" ] ++ lib.optionals checkLeaks [ "leaks" ];

-  passthru.updateScript = gitUpdater {
-    rev-prefix = "v";
+  passthru = {
+    tests = {
+      version = testers.testVersion {
+        package = finalAttrs.finalPackage;
+        version = "v${finalAttrs.version}";
+      };
+    };
  };

  meta = {
@ -88,7 +94,10 @@ stdenv.mkDerivation (finalAttrs: {
    '';
    changelog = "https://github.com/trealla-prolog/trealla/releases/tag/v${finalAttrs.version}";
    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ siraben AndersonTorres ];
+    maintainers = with lib.maintainers; [
+      siraben
+      AndersonTorres
+    ];
    mainProgram = "tpl";
    platforms = lib.platforms.all;
    broken = stdenv.isDarwin && stdenv.isx86_64;
--- a/pkgs/by-name/wo/woof-doom/package.nix
+++ b/pkgs/by-name/wo/woof-doom/package.nix
@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  SDL2,
+  SDL2_net,
+  openal,
+  libsndfile,
+  fluidsynth,
+  alsa-lib,
+  libxmp,
+  python3,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "woof-doom";
+  version = "14.5.0";
+
+  src = fetchFromGitHub {
+    owner = "fabiangreffrath";
+    repo = "woof";
+    rev = "woof_${finalAttrs.version}";
+    hash = "sha256-LA4blTlee0+nRK066hj19Zm/FL2qhaZ9Y5JMfMj3IRU=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    python3
+  ];
+
+  buildInputs = [
+    SDL2
+    SDL2_net
+    alsa-lib
+    fluidsynth
+    libsndfile
+    libxmp
+    openal
+  ];
+
+  meta = {
+    description = "Woof! is a continuation of the Boom/MBF bloodline of Doom source ports";
+    homepage = "https://github.com/fabiangreffrath/woof";
+    changelog = "https://github.com/fabiangreffrath/woof/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ keenanweaver ];
+    mainProgram = "woof";
+    platforms = with lib.platforms; darwin ++ linux ++ windows;
+  };
+})
--- a/pkgs/development/beam-modules/elixir-ls/default.nix
+++ b/pkgs/development/beam-modules/elixir-ls/default.nix
@ -4,13 +4,12 @@

 let
  pname = "elixir-ls";
-  version = "0.21.1";
+  version = "0.21.3";
  src = fetchFromGitHub {
    owner = "elixir-lsp";
    repo = "elixir-ls";
    rev = "v${version}";
-    hash = "sha256-OBLSj1nqv/p1FYg7DapCnr4EU2EW51MQM+YnZqDkcB4=";
-    fetchSubmodules = true;
+    hash = "sha256-IzHvJQ7UdGXFeSyNYKeHlDuY/o1y/E4fM+lG3t9J2HM=";
  };
 in
 mixRelease {
--- a/pkgs/development/compilers/gcc/all.nix
+++ b/pkgs/development/compilers/gcc/all.nix
@ -5,7 +5,7 @@
 , callPackage
 , isl_0_11, isl_0_14, isl_0_17, isl_0_20
 , libcCross
-, threadsCrossFor
+, threadsCross
 , noSysDirs
 , texinfo5
 , cloog_0_18_0, cloog
@ -25,7 +25,7 @@ let
        reproducibleBuild = true;
        profiledCompiler = false;
        libcCross = if stdenv.targetPlatform != stdenv.buildPlatform then args.libcCross else null;
-        threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCrossFor majorMinorVersion else { };
+        threadsCross = if stdenv.targetPlatform != stdenv.buildPlatform then threadsCross else { };
        isl = if       stdenv.isDarwin then null
              else if    atLeast "9"   then isl_0_20
              else if    atLeast "7"   then isl_0_17
--- a/pkgs/development/python-modules/bc-detect-secrets/default.nix
+++ b/pkgs/development/python-modules/bc-detect-secrets/default.nix
@ -17,7 +17,7 @@

 buildPythonPackage rec {
  pname = "bc-detect-secrets";
-  version = "1.5.10";
+  version = "1.5.11";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -26,7 +26,7 @@ buildPythonPackage rec {
    owner = "bridgecrewio";
    repo = "detect-secrets";
    rev = "refs/tags/${version}";
-    hash = "sha256-b0t5xv4fWiErQsYvDKTJuweiGLqS2WpR9ECGo/cpvQ8=";
+    hash = "sha256-JUpeG3qSiMjQBo3p4AvSP7XgoYy+RJTw797IKhbmCu4=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/boltztrap2/default.nix
+++ b/pkgs/development/python-modules/boltztrap2/default.nix
@ -8,16 +8,18 @@
  matplotlib,
  ase,
  netcdf4,
-  pytest,
  pythonOlder,
  cython,
  cmake,
+  setuptools,
 }:

 buildPythonPackage rec {
  pname = "boltztrap2";
  version = "24.1.1";
-  format = "setuptools";
+
+  pyproject = true;
+  build-system = [ setuptools ];

  disabled = pythonOlder "3.5";

@ -27,6 +29,11 @@ buildPythonPackage rec {
    hash = "sha256-kgv4lPBxcBmRKihaTwPRz8bHTWAWUOGZADtJUb3y+C4=";
  };

+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace-fail "USE_CYTHON = False" "USE_CYTHON = True"
+  '';
+
  dontUseCmakeConfigure = true;

  nativeBuildInputs = [
@ -34,7 +41,7 @@ buildPythonPackage rec {
    cython
  ];

-  propagatedBuildInputs = [
+  dependencies = [
    spglib
    numpy
    scipy
--- a/pkgs/development/python-modules/model-checker/default.nix
+++ b/pkgs/development/python-modules/model-checker/default.nix
@ -10,7 +10,7 @@

 buildPythonPackage rec {
  pname = "model-checker";
-  version = "0.3.13";
+  version = "0.3.21";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -18,7 +18,7 @@ buildPythonPackage rec {
  src = fetchPypi {
    pname = "model_checker";
    inherit version;
-    hash = "sha256-3LVes+orRl8tNhhbUUDa1VM/tFf8Y1pAzKknmrjA6e4=";
+    hash = "sha256-+bWJd1mntTH+Wi+mjDJl/TTDqGwihAFyKRlT4kR2sqo=";
  };

  # z3 does not provide a dist-info, so python-runtime-deps-check will fail
--- a/pkgs/development/python-modules/nose-exclude/default.nix
+++ b/pkgs/development/python-modules/nose-exclude/default.nix
@ -1,29 +0,0 @@
-{
-  stdenv,
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  nose,
-}:
-
-buildPythonPackage rec {
-  pname = "nose-exclude";
-  version = "0.5.0";
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f78fa8b41eeb815f0486414f710f1eea0949e346cfb11d59ba6295ed69e84304";
-  };
-
-  propagatedBuildInputs = [ nose ];
-
-  # "OSError: AF_UNIX path too long" for darwin
-  doCheck = !stdenv.isDarwin;
-
-  meta = {
-    license = lib.licenses.lgpl21;
-    description = "Exclude specific directories from nosetests runs";
-    homepage = "https://github.com/kgrandis/nose-exclude";
-  };
-}
--- a/pkgs/development/python-modules/pipdeptree/default.nix
+++ b/pkgs/development/python-modules/pipdeptree/default.nix
@ -16,7 +16,7 @@

 buildPythonPackage rec {
  pname = "pipdeptree";
-  version = "2.20.0";
+  version = "2.21.0";
  pyproject = true;

  disabled = pythonOlder "3.8";
@ -25,7 +25,7 @@ buildPythonPackage rec {
    owner = "tox-dev";
    repo = "pipdeptree";
    rev = "refs/tags/${version}";
-    hash = "sha256-Mng5YUM2+T3OFrr4uGVvq5mP0aq10r21pp46tw6lLno=";
+    hash = "sha256-cs04HGmKG1I42AYH1BOfm9tnbSQuCAxo5KOdJ4/ysos=";
  };

  build-system = [
--- a/pkgs/development/python-modules/pypck/default.nix
+++ b/pkgs/development/python-modules/pypck/default.nix
@ -13,13 +13,13 @@
 buildPythonPackage rec {
  pname = "pypck";
  version = "0.7.19";
-  format = "pyproject";
+  pyproject = true;

  disabled = pythonOlder "3.9";

  src = fetchFromGitHub {
    owner = "alengwenus";
-    repo = pname;
+    repo = "pypck";
    rev = "refs/tags/${version}";
    hash = "sha256-D4uUR8A1mrT+mxUswS34hSRczjRkRro/pz9NbMUCPjM=";
  };
@ -28,7 +28,7 @@ buildPythonPackage rec {
    echo "${version}" > VERSION
  '';

-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];

  nativeCheckInputs = [
    pytest-asyncio
--- a/pkgs/development/python-modules/pypdf/default.nix
+++ b/pkgs/development/python-modules/pypdf/default.nix
@ -2,7 +2,6 @@
  lib,
  buildPythonPackage,
  fetchFromGitHub,
-  fetchpatch2,
  pythonOlder,

  # build-system
@ -28,7 +27,7 @@

 buildPythonPackage rec {
  pname = "pypdf";
-  version = "4.1.0";
+  version = "4.2.0";
  format = "pyproject";

  src = fetchFromGitHub {
@ -37,18 +36,9 @@ buildPythonPackage rec {
    rev = "refs/tags/${version}";
    # fetch sample files used in tests
    fetchSubmodules = true;
-    hash = "sha256-Z3flDC102FwEaNtef0YAfmAFSxpimQNyxt9tRfpKueg=";
+    hash = "sha256-ksLpxfRxrNVXezF0VjbAqadpF6bv/SAOOnCKabhugo0=";
  };

-  patches = [
-    (fetchpatch2 {
-      # add missing test marker on networked test
-      url = "https://github.com/py-pdf/pypdf/commit/f43268734a529d4098e6258bf346148fd24c54f0.patch";
-      includes = [ "tests/test_generic.py" ];
-      hash = "sha256-Ow32UB4crs3OgT+AmA9TNmcO5Y9SoSahybzD3AmWmVk=";
-    })
-  ];
-
  outputs = [
    "out"
    "doc"
@ -90,18 +80,11 @@ buildPythonPackage rec {
    "'not enable_socket'"
  ];

-  disabledTests = [
-    # requires fpdf2 which we don't package yet
-    "test_compression"
-    # infinite recursion when including fpdf2
-    "test_merging_many_temporary_files"
-  ];
-
  meta = with lib; {
    description = "A pure-python PDF library capable of splitting, merging, cropping, and transforming the pages of PDF files";
    homepage = "https://github.com/py-pdf/pypdf";
    changelog = "https://github.com/py-pdf/pypdf/blob/${src.rev}/CHANGELOG.md";
    license = licenses.bsd3;
-    maintainers = with maintainers; [ ];
+    maintainers = with maintainers; [ javaes ];
  };
 }
--- a/pkgs/development/python-modules/rich-rst/default.nix
+++ b/pkgs/development/python-modules/rich-rst/default.nix
@ -10,14 +10,14 @@

 buildPythonPackage rec {
  pname = "rich-rst";
-  version = "1.3.0";
+  version = "1.3.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "wasi-master";
    repo = "rich-rst";
    rev = "refs/tags/v${version}";
-    hash = "sha256-A3SPbu1N5X55c32S8z8UPpmniJT+mdqfb1+zQEJMA5k=";
+    hash = "sha256-jbzGTEth5Qoc0ORFCS3sZMrGUpoQQOVsd+l3/zMWy20=";
  };

  build-system = [ setuptools ];
--- a/pkgs/development/python-modules/tableaudocumentapi/default.nix
+++ b/pkgs/development/python-modules/tableaudocumentapi/default.nix
@ -5,12 +5,16 @@
  lxml,
  pytestCheckHook,
  pythonOlder,
+  fetchpatch,
+  setuptools,
 }:

 buildPythonPackage rec {
  pname = "tableaudocumentapi";
  version = "0.11";
-  format = "setuptools";
+
+  pyproject = true;
+  build-system = [ setuptools ];

  disabled = pythonOlder "3.7";

@ -18,8 +22,17 @@ buildPythonPackage rec {
    inherit pname version;
    hash = "sha256-g6V1UBf+P21FcZkR3PHoUmdmrQwEvjdd1VKhvNmvOys=";
  };
+  patches = [
+    # distutils has been removed since python 3.12
+    # see https://github.com/tableau/document-api-python/pull/255
+    (fetchpatch {
+      name = "no-distutils.patch";
+      url = "https://github.com/tableau/document-api-python/pull/255/commits/59280bbe073060d1249e6404e11303ed6faa84f6.patch";
+      hash = "sha256-mjIF9iP1BQXvqkS0jYNTm8otkhSKLj2b2iHSMZ2K0iI=";
+    })
+  ];

-  propagatedBuildInputs = [ lxml ];
+  dependencies = [ lxml ];

  nativeCheckInputs = [ pytestCheckHook ];

--- a/pkgs/development/tools/misc/coreboot-toolchain/default.nix
+++ b/pkgs/development/tools/misc/coreboot-toolchain/default.nix
@ -19,12 +19,12 @@ let

    stdenvNoCC.mkDerivation (finalAttrs: {
      pname = "coreboot-toolchain-${arch}";
-      version = "24.02";
+      version = "24.05";

      src = fetchgit {
        url = "https://review.coreboot.org/coreboot";
        rev = finalAttrs.version;
-        hash = "sha256-fHulr7w5I9LzBwGt/ZVaN7A3XEd7uQ2eJJifxII7rtk=";
+        hash = "sha256-jTfMFvl3sG3BIVVkpZ81BQ20Bs+2ESE6RMh0fW86rKE=";
        fetchSubmodules = false;
        leaveDotGit = true;
        postFetch = ''
@ -63,7 +63,7 @@ let
        homepage = "https://www.coreboot.org";
        description = "coreboot toolchain for ${arch} targets";
        license = with licenses; [ bsd2 bsd3 gpl2 lgpl2Plus gpl3Plus ];
-        maintainers = with maintainers; [ felixsinger ];
+        maintainers = with maintainers; [ felixsinger jmbaur ];
        platforms = platforms.linux;
      };
    })
--- a/pkgs/development/tools/misc/coreboot-toolchain/stable.nix
+++ b/pkgs/development/tools/misc/coreboot-toolchain/stable.nix
@ -28,17 +28,17 @@
    };
  }
  {
-    name = "binutils-2.41.tar.xz";
+    name = "binutils-2.42.tar.xz";
    archive = fetchurl {
-      sha256 = "0l3l003dynq11ppr2h8p0cfc7zyky8ilfwg60sbfan9lwa4mg6mf";
-      url = "mirror://gnu/binutils/binutils-2.41.tar.xz";
+      sha256 = "0058hngi16793aja9ih623mfr98dcarmf549nw38nxzwslgx9r7n";
+      url = "mirror://gnu/binutils/binutils-2.42.tar.xz";
    };
  }
  {
-    name = "R06_28_23.tar.gz";
+    name = "acpica-unix-20230628.tar.gz";
    archive = fetchurl {
-      sha256 = "0cadxihshyrjplrx01vna13r1m2f6lj1klw7mh8pg2m0gjdpjj12";
-      url = "https://github.com/acpica/acpica/archive/refs/tags/R06_28_23.tar.gz";
+      sha256 = "1kjwzyfrmw0fhawjvpqib3l5jxdlcpj3vv92sb7ls8ixbrs6m1w6";
+      url = "https://downloadmirror.intel.com/783534/acpica-unix-20230628.tar.gz";
    };
  }
  {
--- a/pkgs/development/tools/mongosh/package-lock.json
+++ b/pkgs/development/tools/mongosh/package-lock.json
--- a/pkgs/development/tools/mongosh/source.json
+++ b/pkgs/development/tools/mongosh/source.json
@ -1,6 +1,6 @@
 {
-  "version": "2.2.5",
-  "integrity": "sha512-kQ9X6xgWgE91whL8JMpLzucSiCFO+eCAH5BRiKJfvZOSUkG3VGc+JvRiffbtqq2KAA5nex4u0xEAl/SwlroPkg==",
-  "filename": "mongosh-2.2.5.tgz",
-  "deps": "sha256-PD3H45WEDP/DoCHCQuDNh/5Znca6f3TAOJL4wtQOnXI="
+  "version": "2.2.6",
+  "integrity": "sha512-ksL2zesQ82i6/km7ec4Ii3rtFDIPf4tmLDjkts/Kf+l6OGn54lox6sh/eDRMflggm8XYdFOYQFiLADzRtQwVOA==",
+  "filename": "mongosh-2.2.6.tgz",
+  "deps": "sha256-/zvqFRIGroP1YLSTlKv+ZKzB4c/Y78mn8BM8lnbqj/M="
 }
--- a/pkgs/games/steam/fhsenv.nix
+++ b/pkgs/games/steam/fhsenv.nix
@ -190,11 +190,14 @@ in buildFHSEnv rec {
    libvdpau

    # required by coreutils stuff to run correctly
-    # Steam ends up with LD_LIBRARY_PATH=<bunch of runtime stuff>:/usr/lib:<etc>
+    # Steam ends up with LD_LIBRARY_PATH=/usr/lib:<bunch of runtime stuff>:<etc>
    # which overrides DT_RUNPATH in our binaries, so it tries to dynload the
    # very old versions of stuff from the runtime.
    # FIXME: how do we even fix this correctly
    attr
+    # same thing, but for Xwayland (usually via gamescope), already in the closure
+    libkrb5
+    keyutils
  ] ++ lib.optionals withGameSpecificLibraries [
    # Not formally in runtime but needed by some games
    at-spi2-atk
--- a/pkgs/misc/rich-cli/default.nix
+++ b/pkgs/misc/rich-cli/default.nix
@ -1,68 +1,53 @@
 { lib
 , fetchFromGitHub
+, fetchpatch
 , python3
 }:

-let
-  py = python3.override {
-    packageOverrides = final: prev: {
-      rich = prev.rich.overridePythonAttrs (old: rec {
-        version = "12.4.0";
-        src = fetchFromGitHub {
-          owner = "Textualize";
-          repo = "rich";
-          rev = "refs/tags/v12.4.0";
-          hash = "sha256-ryJTusUNpvNF2031ICJWK8ScxHIh+LrXYg7nd0ph4aQ=";
-        };
-        propagatedBuildInputs = with py.pkgs; [
-          commonmark
-          pygments
-        ];
-        doCheck = false;
-      });
-
-      textual = prev.textual.overridePythonAttrs (old: rec {
-        version = "0.1.18";
-        src = fetchFromGitHub {
-          owner = "Textualize";
-          repo = "textual";
-          rev = "refs/tags/v0.1.18";
-          hash = "sha256-XVmbt8r5HL8r64ISdJozmM+9HuyvqbpdejWICzFnfiw=";
-        };
-        doCheck = false;
-      });
-    };
-  };
-in
-
 python3.pkgs.buildPythonApplication rec {
  pname = "rich-cli";
  version = "1.8.0";
-  format = "pyproject";
+  pyproject = true;

  src = fetchFromGitHub {
    owner = "Textualize";
-    repo = pname;
+    repo = "rich-cli";
    rev = "refs/tags/v${version}";
    hash = "sha256-mV5b/J9wX9niiYtlmAUouaAm9mY2zTtDmex7FNWcezQ=";
  };

-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'rich = "^12.4.0"' 'rich = "*"' \
-      --replace 'textual = "^0.1.18"' 'textual = "*"'
-  '';
+  patches = [
+    # Update dependencies, https://github.com/Textualize/rich-cli/pull/94
+    (fetchpatch {
+      name = "update-dependencies.patch";
+      url = "https://github.com/Textualize/rich-cli/pull/94/commits/1e9a11af7c1c78a5a44a207b1e0dce4c4b3c39f0.patch";
+      hash = "sha256-cU+s/LK2GDVWXLZob0n5J6sLjflCr8w10hRLgeWN5Vg=";
+    })
+    (fetchpatch {
+      name = "markdown.patch";
+      url = "https://github.com/Textualize/rich-cli/pull/94/commits/0a8e77d724ace88ce88ee9d68a46b1dc8464fe0b.patch";
+      hash = "sha256-KXvRG36Qj5kCj1RiAJsNkoJY7t41zUfJFgHeCtc0O4w=";
+    })
+  ];

-  nativeBuildInputs = with py.pkgs; [
+  pythonRelaxDeps = [
+    "textual"
+  ];
+
+  build-system = with python3.pkgs; [
    poetry-core
  ];

-  propagatedBuildInputs = with py.pkgs; [
-    rich
+  nativeBuildInputs = with python3.pkgs; [
+    pythonRelaxDepsHook
+  ];
+
+  dependencies = with python3.pkgs; [
    click
    requests
-    textual
+    rich
    rich-rst
+    textual
  ];

  pythonImportsCheck = [
--- a/pkgs/os-specific/darwin/raycast/default.nix
+++ b/pkgs/os-specific/darwin/raycast/default.nix
@ -1,21 +1,22 @@
-{ lib
-, stdenvNoCC
-, fetchurl
-, writeShellApplication
-, curl
-, jq
-, common-updater-scripts
-, undmg
+{
+  lib,
+  stdenvNoCC,
+  fetchurl,
+  writeShellApplication,
+  curl,
+  jq,
+  common-updater-scripts,
+  undmg,
 }:

 stdenvNoCC.mkDerivation (finalAttrs: {
  pname = "raycast";
-  version = "1.74.1";
+  version = "1.75.1";

  src = fetchurl {
    name = "Raycast.dmg";
    url = "https://releases.raycast.com/releases/${finalAttrs.version}/download?build=universal";
-    hash = "sha256-vIhuXZ9FxpWLPoOciyl4Qe0G8vXY+to+CGxp+nRmyp8=";
+    hash = "sha256-lHGKWj4nn0GsviV83MKgCaQ6HW/CfeP8gg4VXlVXaXg=";
  };

  dontPatch = true;
@ -38,7 +39,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {

  passthru.updateScript = lib.getExe (writeShellApplication {
    name = "raycast-update-script";
-    runtimeInputs = [ curl jq common-updater-scripts ];
+    runtimeInputs = [
+      curl
+      jq
+      common-updater-scripts
+    ];
    text = ''
      set -eo pipefail
      url=$(curl --silent "https://releases.raycast.com/releases/latest?build=universal")
@ -47,12 +52,19 @@ stdenvNoCC.mkDerivation (finalAttrs: {
    '';
  });

-  meta = with lib; {
+  meta = {
    description = "Control your tools with a few keystrokes";
    homepage = "https://raycast.app/";
-    license = with licenses; [ unfree ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    maintainers = with maintainers; [ lovesegfault stepbrobd donteatoreo ];
-    platforms = [ "aarch64-darwin" "x86_64-darwin" ];
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [
+      lovesegfault
+      stepbrobd
+      donteatoreo
+    ];
+    platforms = [
+      "aarch64-darwin"
+      "x86_64-darwin"
+    ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
  };
 })
--- a/pkgs/os-specific/windows/default.nix
+++ b/pkgs/os-specific/windows/default.nix
@ -34,10 +34,6 @@ lib.makeScope newScope (self: with self; {
    stdenv = crossThreadsStdenv;
  };

-  mcfgthreads_pre_gcc_13 = callPackage ./mcfgthreads/pre_gcc_13.nix {
-    stdenv = crossThreadsStdenv;
-  };
-
  mcfgthreads = callPackage ./mcfgthreads {
    stdenv = crossThreadsStdenv;
  };
--- a/pkgs/os-specific/windows/mcfgthreads/pre_gcc_13.nix
+++ b/pkgs/os-specific/windows/mcfgthreads/pre_gcc_13.nix
@ -1,24 +0,0 @@
-{ stdenv, fetchFromGitHub, autoreconfHook }:
-
-stdenv.mkDerivation {
-  pname = "mcfgthreads";
-  version = "git"; # unstable-2021-03-12, not in any branch
-
-  src = fetchFromGitHub {
-    owner = "lhmouse";
-    repo = "mcfgthread";
-    rev = "c446cf4fcdc262fc899a188a4bb7136284c34222";
-    sha256 = "1ib90lrd4dz8irq4yvzwhxqa86i5vxl2q2z3z04sf1i8hw427p2f";
-  };
-
-  outputs = [ "out" "dev" ];
-
-  # Don't want prebuilt binaries sneaking in.
-  postUnpack = ''
-    rm -r "$sourceRoot/debug" "$sourceRoot/release"
-  '';
-
-  nativeBuildInputs = [
-    autoreconfHook
-  ];
-}
--- a/pkgs/tools/filesystems/xfsprogs/default.nix
+++ b/pkgs/tools/filesystems/xfsprogs/default.nix
@ -5,11 +5,11 @@

 stdenv.mkDerivation rec {
  pname = "xfsprogs";
-  version = "6.6.0";
+  version = "6.8.0";

  src = fetchurl {
    url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz";
-    hash = "sha256-UMovRnbfj6tMtMPvPdUS1VUeaETUCmWjHVuOA1k9It8=";
+    hash = "sha256-eLard27r5atS4IhKcPobNjPmSigrHs+ukfXdHZ7F8H0=";
  };

  outputs = [ "bin" "dev" "out" "doc" ];
--- a/pkgs/tools/misc/coreboot-utils/default.nix
+++ b/pkgs/tools/misc/coreboot-utils/default.nix
@ -1,23 +1,23 @@
 { lib, stdenv, fetchgit, pkg-config, zlib, pciutils, openssl, coreutils, acpica-tools, makeWrapper, gnugrep, gnused, file, buildEnv }:

 let
-  version = "24.02";
+  version = "24.05";

  commonMeta = with lib; {
    description = "Various coreboot-related tools";
    homepage = "https://www.coreboot.org";
    license = with licenses; [ gpl2Only gpl2Plus ];
-    maintainers = with maintainers; [ felixsinger ];
+    maintainers = with maintainers; [ felixsinger jmbaur ];
    platforms = platforms.linux;
  };

-  generic = { pname, path ? "util/${pname}", ... }@args: stdenv.mkDerivation (rec {
+  generic = { pname, path ? "util/${pname}", ... }@args: stdenv.mkDerivation ({
    inherit pname version;

    src = fetchgit {
      url = "https://review.coreboot.org/coreboot";
-      rev = "4845b69db29107ce8d9cd2969b4aad5c7daa6399";
-      sha256 = "sha256-whALKP9MetyMJSmXVf0WYd9dP8AGa+ADAB8cmIqt4HU=";
+      rev = version;
+      hash = "sha256-Fq3tZje6QoMskxqWd61OstgI9Sj25yijf8S3LiTJuYc=";
    };

    enableParallelBuilding = true;
--- a/pkgs/tools/misc/findutils/default.nix
+++ b/pkgs/tools/misc/findutils/default.nix
@ -27,6 +27,7 @@ stdenv.mkDerivation rec {
  # Since glibc-2.25 the i686 tests hang reliably right after test-sleep.
  doCheck
    =  !stdenv.hostPlatform.isDarwin
+    && !stdenv.hostPlatform.isFreeBSD
    && !(stdenv.hostPlatform.libc == "glibc" && stdenv.hostPlatform.isi686)
    && (stdenv.hostPlatform.libc != "musl")
    && stdenv.hostPlatform == stdenv.buildPlatform;
--- a/pkgs/tools/networking/edgedb/0001-dynamically-patchelf-binaries.patch
+++ b/pkgs/tools/networking/edgedb/0001-dynamically-patchelf-binaries.patch
@ -1,8 +1,8 @@
 diff --git a/src/portable/install.rs b/src/portable/install.rs
-index dc0d932..5394fc1 100644
+index 15944e4..f873349 100644
 --- a/src/portable/install.rs
 +++ b/src/portable/install.rs
-@@ -133,8 +133,16 @@ fn unpack_package(cache_file: &Path, target_dir: &Path)
+@@ -134,8 +134,16 @@ fn unpack_package(cache_file: &Path, target_dir: &Path) -> anyhow::Result<()> {
     for entry in arch.entries()? {
         let mut entry = entry?;
         let path = entry.path()?;
@ -11,7 +11,7 @@ index dc0d932..5394fc1 100644
 +            path_iter.next(); // discards first folder
 +            path_iter.as_path().starts_with("bin")
 +        };
-         if let Some(path) = build_path(&target_dir, &*path)? {
+         if let Some(path) = build_path(&target_dir, &path)? {
 -            entry.unpack(path)?;
 +            entry.unpack(&path)?;
 +            if is_inside_bin {
@ -20,7 +20,7 @@ index dc0d932..5394fc1 100644
         }
     }
     bar.finish_and_clear();
-@@ -203,3 +211,11 @@ pub fn package(pkg_info: &PackageInfo) -> anyhow::Result<InstallInfo> {
+@@ -222,3 +230,11 @@ pub fn package(pkg_info: &PackageInfo) -> anyhow::Result<InstallInfo> {
 
     Ok(info)
 }
--- a/pkgs/tools/networking/edgedb/Cargo.lock
+++ b/pkgs/tools/networking/edgedb/Cargo.lock
--- a/pkgs/tools/networking/edgedb/default.nix
+++ b/pkgs/tools/networking/edgedb/default.nix
@ -1,51 +1,64 @@
-{ stdenv
-, lib
-, patchelf
-, fetchFromGitHub
-, rustPlatform
-, makeBinaryWrapper
-, pkg-config
-, curl
-, Security
-, CoreServices
-, libiconv
-, xz
-, perl
-, substituteAll
-# for passthru.tests:
-, edgedb
-, testers
+{
+  stdenv,
+  lib,
+  patchelf,
+  fetchFromGitHub,
+  rustPlatform,
+  makeBinaryWrapper,
+  pkg-config,
+  curl,
+  Security,
+  CoreServices,
+  libiconv,
+  xz,
+  perl,
+  substituteAll,
+  # for passthru.tests:
+  edgedb,
+  testers,
 }:
-
 rustPlatform.buildRustPackage rec {
  pname = "edgedb";
-  version = "4.1.1";
+  version = "5.1.0";

  src = fetchFromGitHub {
    owner = "edgedb";
    repo = "edgedb-cli";
    rev = "v${version}";
-    hash = "sha256-PHtjm3xlGwkDskH3A9/QQrmzt2Xi+sqnQAQV6WG7a6M=";
+    hash = "sha256-znxAtfSeepLQqkPsEzQBp3INZym5BLap6m29C/9z+h8=";
    fetchSubmodules = true;
  };

  cargoLock = {
    lockFile = ./Cargo.lock;
    outputHashes = {
-      "edgedb-derive-0.5.1" = "sha256-1tbWg3bLab3xlVQxb4G+kpXriO+zQpnrwAESy5Tqsu4=";
-      "edgeql-parser-0.1.0" = "sha256-c5xBuW47xXgy8VLR/P7DvVhLBd0rvI6P9w82IPPsTwo=";
+      "edgedb-derive-0.5.1" = "sha256-ATldvarkp/W5bz55qoMtfTMcueWklyKnrJUHvLKlWh0=";
+      "edgeql-parser-0.1.0" = "sha256-KPi2M2UEN+p3V/fcmKtb3K9XTLC4vJ5H+yG8ZfD7RBs=";
      "indexmap-2.0.0-pre" = "sha256-QMOmoUHE1F/sp+NeDpgRGqqacWLHWG02YgZc5vAdXZY=";
      "rexpect-0.5.0" = "sha256-vstAL/fJWWx7WbmRxNItKpzvgGF3SvJDs5isq9ym/OA=";
      "rustyline-8.0.0" = "sha256-CrICwQbHPzS4QdVIEHxt2euX+g+0pFYe84NfMp1daEc=";
      "serde_str-1.0.0" = "sha256-CMBh5lxdQb2085y0jc/DrV6B8iiXvVO2aoZH/lFFjak=";
+      "scram-0.7.0" = "sha256-QTPxyXBpMXCDkRRJEMYly1GKp90khrwwuMI1eHc2H+Y=";
+      "test-cert-gen-0.10.0-pre" = "sha256-Hyk4/iw6/SgEI70vPCNNbE9+nQ0pOAM158hncyUbvp8=";
+      "test-utils-0.1.0" = "sha256-FoF/U89Q9E2Dlmpoh+cfDcScmhcsSNut+rE7BECJSJI=";
+      "warp-0.3.6" = "sha256-knDt2aw/PJ0iabhKg+okwwnEzCY+vQVhE7HKCTM6QbE=";
    };
  };

-  nativeBuildInputs = [ makeBinaryWrapper pkg-config perl ];
+  nativeBuildInputs = [
+    makeBinaryWrapper
+    pkg-config
+    perl
+  ];

-  buildInputs = [
-    curl
-  ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security libiconv xz ];
+  buildInputs =
+    [ curl ]
+    ++ lib.optionals stdenv.isDarwin [
+      CoreServices
+      Security
+      libiconv
+      xz
+    ];

  checkFeatures = [ ];

@ -67,8 +80,15 @@ rustPlatform.buildRustPackage rec {
  meta = with lib; {
    description = "EdgeDB cli";
    homepage = "https://www.edgedb.com/docs/cli/index";
-    license = with licenses; [ asl20 /* or */ mit ];
-    maintainers = with maintainers; [ ahirner kirillrdy ];
+    license = with licenses; [
+      asl20
+      # or
+      mit
+    ];
+    maintainers = with maintainers; [
+      ahirner
+      kirillrdy
+    ];
    mainProgram = "edgedb";
  };
 }
--- a/pkgs/tools/networking/eternal-terminal/default.nix
+++ b/pkgs/tools/networking/eternal-terminal/default.nix
@ -12,13 +12,13 @@

 stdenv.mkDerivation rec {
  pname = "eternal-terminal";
-  version = "6.2.8";
+  version = "6.2.9";

  src = fetchFromGitHub {
    owner = "MisterTea";
    repo = "EternalTerminal";
    rev = "refs/tags/et-v${version}";
-    hash = "sha256-7LhCP7zARpigsDJmA7y/ZIgN06l8aCszXryzPoa4aL0=";
+    hash = "sha256-vukh3a6SxHaVCT4hmoVt4hEGB8Sqylu53Nz8fgBWkTM";
  };

  nativeBuildInputs = [
--- a/pkgs/tools/security/jwt-hack/default.nix
+++ b/pkgs/tools/security/jwt-hack/default.nix
@ -1,24 +1,31 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
 }:

 buildGoModule rec {
  pname = "jwt-hack";
-  version = "1.1.2";
+  version = "1.2.0";

  src = fetchFromGitHub {
    owner = "hahwul";
-    repo = pname;
-    rev = "v${version}";
-    hash = "sha256-K0ZtEi0zAKRlIGvorrXmtmkcMvyLIXWPnVMQANZbClk=";
+    repo = "jwt-hack";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-IHR+ItI4ToINLpkVc7yrgpNTS17nD02G6x3pNMEfIW4=";
  };

-  vendorHash = "sha256-VYh3oRy8bmtXf6AnLNi/M2kA6t+crW3AXBiGovpdt8U=";
+  vendorHash = "sha256-YEH+epSvyy1j0s8AIJ5+BdF47H7KqgBRC4t81noOkjo=";
+
+  ldflags = [
+    "-w"
+    "-s"
+  ];

  meta = with lib; {
    description = "Tool for attacking JWT";
    homepage = "https://github.com/hahwul/jwt-hack";
+    changelog = "https://github.com/hahwul/jwt-hack/releases/tag/v${version}";
    license = licenses.mit;
    maintainers = with maintainers; [ fab ];
    mainProgram = "jwt-hack";
--- a/pkgs/tools/system/java-service-wrapper/default.nix
+++ b/pkgs/tools/system/java-service-wrapper/default.nix
@ -9,11 +9,11 @@

 stdenv.mkDerivation rec {
  pname = "java-service-wrapper";
-  version = "3.5.56";
+  version = "3.5.57";

  src = fetchurl {
    url = "https://wrapper.tanukisoftware.com/download/${version}/wrapper_${version}_src.tar.gz";
-    hash = "sha256-zZfJP/uf78D/6G51Km1bNRRIv5i8x69Xw+imho4/ZpQ=";
+    hash = "sha256-86YusgyLUveMrXepAtnABgdZCGlQDQjVFnG9GqFnCIg=";
  };

  strictDeps = true;
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@ -1067,8 +1067,6 @@ with pkgs;

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

-  mods = callPackage ../tools/misc/mods { };
-
  mongosh = callPackage ../development/tools/mongosh { };

  mya = callPackage ../applications/misc/mya { };
@ -6132,8 +6130,6 @@ with pkgs;

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

-  river = callPackage ../applications/window-managers/river { };
-
  rivercarro = callPackage ../applications/misc/rivercarro { };

  river-luatile = callPackage ../applications/misc/river-luatile{ };
@ -17005,7 +17001,7 @@ with pkgs;
      # want the C++ library to be explicitly chosen by the caller, and null by
      # default.
      libcxx ? null
-    , extraPackages ? lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW) ((threadsCrossFor cc.version).package)
+    , extraPackages ? lib.optional (cc.isGNU or false && stdenv.targetPlatform.isMinGW) threadsCross.package
    , nixSupport ? {}
    , ...
    } @ extraArgs:
@ -21044,16 +21040,12 @@ with pkgs;

  libcCross = assert stdenv.targetPlatform != stdenv.buildPlatform; libcCrossChooser stdenv.targetPlatform.libc;

-  threadsCross = threadsCrossFor null;
-  threadsCrossFor = cc_version:
+  threadsCross =
    lib.optionalAttrs (stdenv.targetPlatform.isMinGW && !(stdenv.targetPlatform.useLLVM or false)) {
      # other possible values: win32 or posix
      model = "mcf";
      # For win32 or posix set this to null
-      package =
-        if cc_version == null || lib.versionAtLeast cc_version "13"
-        then targetPackages.windows.mcfgthreads or windows.mcfgthreads
-        else targetPackages.windows.mcfgthreads_pre_gcc_13 or windows.mcfgthreads_pre_gcc_13;
+      package = targetPackages.windows.mcfgthreads or windows.mcfgthreads;
    };

  wasilibc = callPackage ../development/libraries/wasilibc {
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@ -307,6 +307,7 @@ mapAliases ({
  nose-cov = throw "nose-cov has been removed, it was archived and unmaintained since 2012"; # added 2024-05-21
  nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16
  nose-cprof = throw "nose-cprof has been removed since it has not been maintained for 7 years and there are no dependent packages"; # added 2024-05-21
+  nose-exclude = throw "nose-exclude has been removed since it has not been maintained since 2016"; # added 2024-05-21
  nose-randomly = throw "nose-randomly has been removed, it was archived and unmaintained since 2019"; # added 2024-05-22
  nose_progressive = throw "nose_progressive has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; #added 2023-02-21
  nose_warnings_filters = nose-warnings-filters; # added 2024-01-07
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@ -8859,8 +8859,6 @@ self: super: with self; {

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

-  nose-exclude = callPackage ../development/python-modules/nose-exclude { };
-
  nose-timer = callPackage ../development/python-modules/nose-timer { };

  nose-pattern-exclude = callPackage ../development/python-modules/nose-pattern-exclude { };