Merge staging-next into staging

2025-05-18 12:07:29 +00:00
parent 7b66c98f53 2da7e6c7e8
commit b71bd0a74d
96 changed files with 2321 additions and 2209 deletions
@@ -16,7 +16,7 @@

 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

- Create the first release note entry in this section!
+- The `services.polipo` module has been removed as `polipo` is unmaintained and archived upstream.

 ## Other Notable Changes {#sec-release-25.11-notable-changes}

@@ -167,7 +167,7 @@ in
      nsd = 126;
      gitolite = 127;
      znc = 128;
-      polipo = 129;
+      # polipo = 129; removed 2025-05-18
      mopidy = 130;
      #docker = 131; # unused
      gdm = 132;
@@ -507,7 +507,7 @@ in
      nsd = 126;
      gitolite = 127;
      znc = 128;
-      polipo = 129;
+      # polipo = 129; removed 2025-05-18
      mopidy = 130;
      docker = 131;
      gdm = 132;
@@ -1268,7 +1268,6 @@
  ./services/networking/picosnitch.nix
  ./services/networking/pixiecore.nix
  ./services/networking/pleroma.nix
-  ./services/networking/polipo.nix
  ./services/networking/powerdns.nix
  ./services/networking/pppd.nix
  ./services/networking/pptpd.nix
@@ -193,6 +193,9 @@ in
    (mkRemovedOptionModule [ "services" "pantheon" "files" ] ''
      This module was removed, please add pkgs.pantheon.elementary-files to environment.systemPackages directly.
    '')
+    (mkRemovedOptionModule [ "services" "polipo" ] ''
+      The polipo project is unmaintained and archived upstream.
+    '')
    (mkRemovedOptionModule [ "services" "prey" ] ''
      prey-bash-client is deprecated upstream
    '')
@@ -1,124 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-
-let
-
-  cfg = config.services.polipo;
-
-  polipoConfig = pkgs.writeText "polipo.conf" ''
-    proxyAddress = ${cfg.proxyAddress}
-    proxyPort = ${toString cfg.proxyPort}
-    allowedClients = ${concatStringsSep ", " cfg.allowedClients}
-    ${optionalString (cfg.parentProxy != "") "parentProxy = ${cfg.parentProxy}"}
-    ${optionalString (cfg.socksParentProxy != "") "socksParentProxy = ${cfg.socksParentProxy}"}
-    ${config.services.polipo.extraConfig}
-  '';
-
-in
-
-{
-
-  options = {
-
-    services.polipo = {
-
-      enable = mkEnableOption "polipo caching web proxy";
-
-      proxyAddress = mkOption {
-        type = types.str;
-        default = "127.0.0.1";
-        description = "IP address on which Polipo will listen.";
-      };
-
-      proxyPort = mkOption {
-        type = types.port;
-        default = 8123;
-        description = "TCP port on which Polipo will listen.";
-      };
-
-      allowedClients = mkOption {
-        type = types.listOf types.str;
-        default = [
-          "127.0.0.1"
-          "::1"
-        ];
-        example = [
-          "127.0.0.1"
-          "::1"
-          "134.157.168.0/24"
-          "2001:660:116::/48"
-        ];
-        description = ''
-          List of IP addresses or network addresses that may connect to Polipo.
-        '';
-      };
-
-      parentProxy = mkOption {
-        type = types.str;
-        default = "";
-        example = "localhost:8124";
-        description = ''
-          Hostname and port number of an HTTP parent proxy;
-          it should have the form ‘host:port’.
-        '';
-      };
-
-      socksParentProxy = mkOption {
-        type = types.str;
-        default = "";
-        example = "localhost:9050";
-        description = ''
-          Hostname and port number of an SOCKS parent proxy;
-          it should have the form ‘host:port’.
-        '';
-      };
-
-      extraConfig = mkOption {
-        type = types.lines;
-        default = "";
-        description = ''
-          Polio configuration. Contents will be added
-          verbatim to the configuration file.
-        '';
-      };
-
-    };
-
-  };
-
-  config = mkIf cfg.enable {
-
-    users.users.polipo = {
-      uid = config.ids.uids.polipo;
-      description = "Polipo caching proxy user";
-      home = "/var/cache/polipo";
-      createHome = true;
-    };
-
-    users.groups.polipo = {
-      gid = config.ids.gids.polipo;
-      members = [ "polipo" ];
-    };
-
-    systemd.services.polipo = {
-      description = "caching web proxy";
-      after = [
-        "network.target"
-        "nss-lookup.target"
-      ];
-      wantedBy = [ "multi-user.target" ];
-      serviceConfig = {
-        ExecStart = "${pkgs.polipo}/bin/polipo -c ${polipoConfig}";
-        User = "polipo";
-      };
-    };
-
-  };
-
-}
@@ -7,12 +7,12 @@

 let
  pname = "plexamp";
-  version = "4.12.2";
+  version = "4.12.3";

  src = fetchurl {
    url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage";
    name = "${pname}-${version}.AppImage";
-    hash = "sha512-qsuJv5rnw8Gprlfb3pNChMTCXDYuCd1B5Kz+TWsbjbOw8+u2mieh4gGIiPLIy2jhFBjtZUacqM6eibXL+wHGEg==";
+    hash = "sha512-gjOjk/JtHbhEDGzWH/bBtNd7qsYS97hBlPbRw7uWH/PCXD4urUWBrlihNWAOgYClVwl7nbrx/y7mhCrI2N6c1w==";
  };

  appimageContents = appimageTools.extractType2 {
@@ -38,7 +38,7 @@ appimageTools.wrapType2 {
  meta = with lib; {
    description = "Beautiful Plex music player for audiophiles, curators, and hipsters";
    homepage = "https://plexamp.com/";
-    changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/79";
+    changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/80";
    license = licenses.unfree;
    maintainers = with maintainers; [
      killercup
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
  core = "stella";
-  version = "0-unstable-2025-04-29";
+  version = "0-unstable-2025-05-17";

  src = fetchFromGitHub {
    owner = "stella-emu";
    repo = "stella";
-    rev = "e13b683c5236adf8560613a883a0af8841ee49cb";
-    hash = "sha256-0kAxCVcVMz6pxScVZhEvPWIHj29cO9xoI1bhgyXUMvU=";
+    rev = "8421af89314bbdcf118d4b3884a9f566e4b1020e";
+    hash = "sha256-uffcz8TXb0vEivOEcnL288YT8rspSOGcNdXtGijXX1g=";
  };

  makefile = "Makefile";
@@ -6,6 +6,7 @@
  # build inputs
  atk,
  file,
+  glib,
  gdk-pixbuf,
  glib-networking,
  gnome-desktop,
@@ -16,6 +17,8 @@
  pango,
  webkitgtk_4_1,
  wrapGAppsHook3,
+  meson,
+  ninja,

  # check inputs
  xvfb-run,
@@ -45,11 +48,15 @@
  pulseaudio,
  p7zip,
  xgamma,
+  gettext,
  libstrangle,
  fluidsynth,
  xorgserver,
  xorg,
  util-linux,
+  pkg-config,
+  desktop-file-utils,
+  appstream-glib,
 }:

 let
@@ -83,9 +90,18 @@ buildPythonApplication rec {
    hash = "sha256-CAXKnx5+60MITRM8enkYgFl5ZKM6HCXhCYNyG7kHhuQ=";
  };

+  format = "other";
+
  nativeBuildInputs = [
-    wrapGAppsHook3
+    appstream-glib
+    desktop-file-utils
+    gettext
+    glib
    gobject-introspection
+    meson
+    ninja
+    wrapGAppsHook3
+    pkg-config
  ];
  buildInputs =
    [
@@ -128,20 +144,6 @@ buildPythonApplication rec {
      --replace '"libmagic.so.1"' "'${lib.getLib file}/lib/libmagic.so.1'"
  '';

-  nativeCheckInputs = [
-    xvfb-run
-    nose2
-    flake8
-  ] ++ requiredTools;
-  checkPhase = ''
-    runHook preCheck
-
-    export HOME=$PWD
-    xvfb-run -s '-screen 0 800x600x24' make test
-
-    runHook postCheck
-  '';
-
  # avoid double wrapping
  dontWrapGApps = true;
  makeWrapperArgs = [
@@ -9,10 +9,10 @@

 buildMozillaMach rec {
  pname = "firefox";
-  version = "138.0.3";
+  version = "138.0.4";
  src = fetchurl {
    url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "0f1c8ee05bec465b55429c18d788856574c5b2e31d911f15f76d31c00de84d8b8681961799c4101cd1540bd228afd201a4b59fd7c9a88918695040965b9dc0f1";
+    sha512 = "64d80456da8df27d7eeed7eb20c35fcf213bc948eb48739b6101e2c476ea9a9133da928477a79683c96c160f8d53bed52be487f01a8d29e38d39071f12676806";
  };

  meta = {
@@ -17,7 +17,7 @@

 buildGoModule rec {
  pname = "rclone";
-  version = "1.69.1";
+  version = "1.69.2";

  outputs = [
    "out"
@@ -28,10 +28,10 @@ buildGoModule rec {
    owner = "rclone";
    repo = "rclone";
    tag = "v${version}";
-    hash = "sha256-TNknN4Wr+SWuYWRQmfH7Xjih5WdoSC+ky70Zru1ODsw=";
+    hash = "sha256-WhviYa9H3FsYRgnUhheP6dRj9A9l2nrGeFAhUj5TCKU=";
  };

-  vendorHash = "sha256-ms8mHUd6AxYW/OHwwad/34rx082xDK1lh6FIvFshIHM=";
+  vendorHash = "sha256-dY67FbRka58duZ4xElQr9uOCEonURhkPOyj3NKhW9gc=";

  subPackages = [ "." ];

@@ -8,13 +8,13 @@
 }:
 mkHyprlandPlugin hyprland rec {
  pluginName = "hy3";
-  version = "hl0.48.0";
+  version = "hl0.49.0";

  src = fetchFromGitHub {
    owner = "outfoxxed";
    repo = "hy3";
    tag = version;
-    hash = "sha256-CUlxc2u1Y8gpeAl7NKrZxxpeZjyU2DBxOYb8b0haM2M=";
+    hash = "sha256-dYxkdbg6yj8HhuBkCmklMQVR17N7P32R8ir7b7oNxm4=";
  };

  nativeBuildInputs = [ cmake ];
@@ -8,24 +8,24 @@

 buildGoModule rec {
  pname = "aliyun-cli";
-  version = "3.0.266";
+  version = "3.0.273";

  src = fetchFromGitHub {
    owner = "aliyun";
    repo = "aliyun-cli";
    tag = "v${version}";
-    hash = "sha256-HXjqtNx/f4vbT6Jk/r1zjHQhHpexWICDTcaMF8Fy0+w=";
+    hash = "sha256-Zmi+izG8gHZrtSaLR9sE9F0W55+PEj25lBKueIwY8iY=";
    fetchSubmodules = true;
  };

-  vendorHash = "sha256-XpsMnt3AYHMn/js1E88RBxegKrTeaZYpRhHEuq4HDjM=";
+  vendorHash = "sha256-K6et/P1GKoZeEsfB5LMBqfBx+YoVMMC87YLNKOkL30g=";

  subPackages = [ "main" ];

  ldflags = [
    "-s"
    "-w"
-    "-X github.com/aliyun/aliyun-cli/cli.Version=${version}"
+    "-X github.com/aliyun/aliyun-cli/v3/cli.Version=${version}"
  ];

  nativeCheckInputs = [ writableTmpDirAsHomeHook ];
@@ -6,13 +6,13 @@

 buildGoModule rec {
  pname = "cdncheck";
-  version = "1.1.17";
+  version = "1.1.18";

  src = fetchFromGitHub {
    owner = "projectdiscovery";
    repo = "cdncheck";
    tag = "v${version}";
-    hash = "sha256-nRnf2eLZQX878H6Em50MNkmEOTyr1KE5buGlMPE9vAE=";
+    hash = "sha256-Zp3ObJkK60g4VgH8e1aghHjCbueu/9FNru9RUx6uIuE=";
  };

  vendorHash = "sha256-/1REkZ5+sz/H4T4lXhloz7fu5cLv1GoaD3dlttN+Qd4=";
@@ -1,17 +0,0 @@
-The clean command line compiler clm checks modules for freshness by comparing timestamps.
-However, in chroot builds all files installed have the same timestamp.  This leads to clm
-trying to rebuild the library modules distributed with the Clean install every time a user
-compiles any file.  This patch changes the freshness check to use less than instead of less
-than or equal to in order to avoid this.
-
--- clean-upstream/src/tools/clm/clm.c	2010-12-10 06:12:17.000000000 -0430
-+++ clean/src/tools/clm/clm.c	2010-12-25 10:29:09.840675925 -0430
-@@ -250,7 +250,7 @@
- 		|| (t1.dwHighDateTime==t2.dwHighDateTime && (unsigned)(t1.dwLowDateTime)<=(unsigned)(t2.dwLowDateTime)))
- #else
- 	typedef unsigned long FileTime;
-#	define FILE_TIME_LE(t1,t2) (t1<=t2)
-+#	define FILE_TIME_LE(t1,t2) (t1<t2)
- #endif
- 
- typedef struct project_node {
@@ -1,66 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-}:
-
-stdenv.mkDerivation {
-  pname = "clean";
-  version = "3.0";
-
-  src =
-    if stdenv.hostPlatform.system == "i686-linux" then
-      (fetchurl {
-        url = "https://ftp.cs.ru.nl/Clean/Clean30/linux/clean3.0_32_boot.tar.gz";
-        sha256 = "0cjxv3vqrg6pz3aicwfdz1zyhk0q650464j3qyl0wzaikh750010";
-      })
-    else if stdenv.hostPlatform.system == "x86_64-linux" then
-      (fetchurl {
-        url = "https://ftp.cs.ru.nl/Clean/Clean30/linux/clean3.0_64_boot.tar.gz";
-        sha256 = "06k283y9adbi28f78k3m5ssg6py73qqkz3sm8dgxc89drv4krl2i";
-      })
-    else
-      throw "Architecture not supported";
-
-  hardeningDisable = [
-    "format"
-    "pic"
-  ];
-
-  # clm uses timestamps of dcl, icl, abc and o files to decide what must be rebuild
-  # and for chroot builds all of the library files will have equal timestamps.  This
-  # makes clm try to rebuild the library modules (and fail due to absence of write permission
-  # on the Nix store) every time any file is compiled.
-  patches = [ ./chroot-build-support-do-not-rebuild-equal-timestamps.patch ];
-
-  preBuild = ''
-    substituteInPlace Makefile --replace 'INSTALL_DIR = $(CURRENTDIR)' 'INSTALL_DIR = '$out
-
-    substituteInPlace src/tools/clm/clm.c --replace '/usr/bin/gcc' $(type -p gcc)
-    substituteInPlace src/tools/clm/clm.c --replace '/usr/bin/as' $(type -p as)
-
-    cd src
-  '';
-
-  postBuild = ''
-    cd ..
-  '';
-
-  meta = {
-    description = "General purpose, state-of-the-art, pure and lazy functional programming language";
-    longDescription = ''
-      Clean is a general purpose, state-of-the-art, pure and lazy functional
-      programming language designed for making real-world applications. Some
-      of its most notable language features are uniqueness typing, dynamic typing,
-      and generic functions.
-    '';
-
-    homepage = "http://wiki.clean.cs.ru.nl/Clean";
-    license = lib.licenses.bsd2;
-    maintainers = [ lib.maintainers.erin ];
-    platforms = [
-      "i686-linux"
-      "x86_64-linux"
-    ];
-  };
-}
@@ -107,6 +107,7 @@ stdenv.mkDerivation rec {

  postInstall = ''
    wrapProgram $out/bin/warp-svc --prefix PATH : ${lib.makeBinPath [ nftables ]}
+    wrapProgram $out/bin/warp-cli --prefix PATH : ${lib.makeBinPath [ desktop-file-utils ]}
  '';

  doInstallCheck = true;
@@ -17,18 +17,18 @@ let
 in
 maven.buildMavenPackage rec {
  pname = "cryptomator";
-  version = "1.16.1";
+  version = "1.16.2";

  src = fetchFromGitHub {
    owner = "cryptomator";
    repo = "cryptomator";
    tag = version;
-    hash = "sha256-gATygecFVUOvJXtq/0R7nqLCvR2UErFlQ0oeFwBoNGM=";
+    hash = "sha256-U/I18OtinWlk8d9OLLAzZHoN5d8KHx9CUoZsv2mrQtw=";
  };

  mvnJdk = jdk;
  mvnParameters = "-Dmaven.test.skip=true -Plinux";
-  mvnHash = "sha256-EmCuAn3waCDkngGca8f5ccV5aNTpE+fiNM6VbAS1D3w=";
+  mvnHash = "sha256-uQz70epBFKTyX/PpOyWBtxHOiX0OQT3aTX6KWKwLc1I=";

  preBuild = ''
    VERSION=${version}
@@ -11,13 +11,13 @@

 python3.pkgs.buildPythonApplication rec {
  pname = "displaycal";
-  version = "3.9.15";
+  version = "3.9.16";
  format = "setuptools";

  src = fetchPypi {
    pname = "DisplayCAL";
    inherit version;
-    hash = "sha256-VX3xQQn8FKcrqyx1RpGste2QmATgTh6cCowAmtnpbeM=";
+    hash = "sha256-Ozl0RrYJ/oarNddnz+JjQKyRY6ZNvM9sJapqn75X3Mw=";
  };

  nativeBuildInputs = [
@@ -9,7 +9,7 @@

 buildGoModule rec {
  pname = "doctl";
-  version = "1.125.1";
+  version = "1.127.0";

  vendorHash = null;

@@ -41,15 +41,15 @@ buildGoModule rec {
  src = fetchFromGitHub {
    owner = "digitalocean";
    repo = "doctl";
-    rev = "v${version}";
-    sha256 = "sha256-9i8XtxCHnK+81JrjElv7lfS43vmzGBKoGAhsC/RHrz4=";
+    tag = "v${version}";
+    hash = "sha256-wdba3kly0Iqsqs0i+AGMsNtzO3dsFIZVc0g0arL/NfM=";
  };

-  meta = with lib; {
+  meta = {
    description = "Command line tool for DigitalOcean services";
    mainProgram = "doctl";
    homepage = "https://github.com/digitalocean/doctl";
-    license = licenses.asl20;
-    maintainers = [ maintainers.siddharthist ];
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.siddharthist ];
  };
 }
@@ -7,13 +7,13 @@

 buildGoModule rec {
  pname = "fabric-ai";
-  version = "1.4.185";
+  version = "1.4.187";

  src = fetchFromGitHub {
    owner = "danielmiessler";
    repo = "fabric";
    tag = "v${version}";
-    hash = "sha256-8MevZi8vvoFfJTvv/qREOtsYkUccz0nWVaq+1fHtSwY=";
+    hash = "sha256-5vUtw8ttNB2gjVgASfgWke5tCZGzEiSvk+c4K9555ck=";
  };

  vendorHash = "sha256-ZrIzCKhEa00KOS8tauYEGLR4o7gGVVZ9pdfEQbAGDkI=";
@@ -8,13 +8,13 @@

 stdenv.mkDerivation (final: {
  pname = "glaze";
-  version = "5.0.2";
+  version = "5.2.1";

  src = fetchFromGitHub {
    owner = "stephenberry";
    repo = "glaze";
    rev = "v${final.version}";
-    hash = "sha256-1Mk/BaU1D4SASC47pHlfno6n39WR5lUVPtboqz70+4s=";
+    hash = "sha256-DiKjik8u07dRAhXDCXJy0UKyoripzgnGRzB4pNlZ+lg=";
  };

  nativeBuildInputs = [ cmake ];
@@ -225,6 +225,8 @@ let

      substituteInPlace $out/share/google/$appname/google-$appname \
        --replace-fail 'CHROME_WRAPPER' 'WRAPPER'
+      substituteInPlace $out/share/applications/com.google.Chrome.desktop \
+        --replace-fail /usr/bin/google-chrome-$dist $exe
      substituteInPlace $out/share/applications/google-$appname.desktop \
        --replace-fail /usr/bin/google-chrome-$dist $exe
      substituteInPlace $out/share/gnome-control-center/default-apps/google-$appname.xml \
@@ -0,0 +1,99 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+
+  bzip2,
+  libGL,
+  libX11,
+  libXcursor,
+  libxkbcommon,
+  libXi,
+  moltenvk,
+  sdl3,
+  wayland,
+  zstd,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "gopher64";
+  version = "1.0.16";
+
+  src = fetchFromGitHub {
+    owner = "gopher64";
+    repo = "gopher64";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-TduOmKK4OAmhP2VUT0eeoKHQHmsM8kptrxfgCdDFTRU=";
+    fetchSubmodules = true;
+    leaveDotGit = true;
+    postFetch = ''
+      cd "$out"
+      git rev-parse HEAD > $out/GIT_REV
+      find "$out" -name .git -print0 | xargs -0 rm -rf
+    '';
+  };
+
+  cargoPatches = [
+    # upstream rebuilds SDL3 from source
+    # this patch makes it use the SDL3 library provided by nixpkgs
+    ./use-sdl3-via-pkg-config.patch
+
+    # make the build script use the @GIT_REV@ string that will be substituted in the logic below
+    ./set-git-rev.patch
+  ];
+
+  postPatch = ''
+    # use the file generated in the fetcher to supply the git revision
+    substituteInPlace build.rs \
+      --replace-fail "@GIT_REV@" $(cat GIT_REV)
+  '';
+
+  useFetchCargoVendor = true;
+  cargoHash = "sha256-9fZ7zFTqt1VNnmCqFzWrZFD1PQZ7paz7r2Mb+9+C9Rs=";
+
+  env.ZSTD_SYS_USE_PKG_CONFIG = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    rustPlatform.bindgenHook
+  ];
+
+  buildInputs =
+    [
+      bzip2
+      sdl3
+      zstd
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      moltenvk
+    ];
+
+  # these are dlopen-ed during runtime
+  runtimeDependencies = lib.optionalString stdenv.hostPlatform.isLinux [
+    libGL
+    libxkbcommon
+
+    # for X11
+    libX11
+    libXcursor
+    libXi
+
+    # for wayland
+    wayland
+  ];
+
+  postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
+    patchelf $out/bin/gopher64 --add-rpath ${lib.makeLibraryPath finalAttrs.runtimeDependencies}
+  '';
+
+  meta = {
+    changelog = "https://github.com/gopher64/gopher64/releases/tag/${finalAttrs.src.tag}";
+    description = "N64 emulator written in Rust";
+    homepage = "https://github.com/gopher64/gopher64";
+    license = lib.licenses.gpl3Only;
+    mainProgram = "gopher64";
+    maintainers = with lib.maintainers; [ tomasajt ];
+  };
+})
@@ -0,0 +1,19 @@
+diff --git a/build.rs b/build.rs
+index 0b20db2..d904e63 100644
+--- a/build.rs
+++ b/build.rs
+@@ -163,13 +163,7 @@ fn main() {
+         simd_build.compile("simd");
+     }
+ 
+-    let git_output = std::process::Command::new("git")
+-        .args(["rev-parse", "HEAD"])
+-        .output()
+-        .unwrap();
+-
+-    let git_hash = String::from_utf8(git_output.stdout).unwrap();
+-    println!("cargo:rustc-env=GIT_HASH={}", git_hash);
+    println!("cargo:rustc-env=GIT_HASH={}", "@GIT_REV@");
+ 
+     println!("cargo:rustc-env=N64_STACK_SIZE={}", 8 * 1024 * 1024);
+ }
@@ -0,0 +1,85 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 89bc1d0..72b65cd 100644
+--- a/Cargo.lock
+++ b/Cargo.lock
+@@ -626,15 +626,6 @@ dependencies = [
+  "error-code",
+ ]
+ 
+-[[package]]
+-name = "cmake"
+-version = "0.1.54"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
+-dependencies = [
+- "cc",
+-]
+-
+ [[package]]
+ name = "cobs"
+ version = "0.2.3"
+@@ -3245,12 +3236,6 @@ dependencies = [
+  "windows-sys 0.52.0",
+ ]
+ 
+-[[package]]
+-name = "rpkg-config"
+-version = "0.1.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5a2d2f3481209a6b42eec2fbb49063fb4e8d35b57023401495d4fe0f85c817f0"
+-
+ [[package]]
+ name = "rustc-demangle"
+ version = "0.1.24"
+@@ -3380,21 +3365,13 @@ version = "1.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+ 
+-[[package]]
+-name = "sdl3-src"
+-version = "3.2.10"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e677fa126db179fb8f03c982163321496ddf57a6d8a1e41eeef4600f956038b1"
+-
+ [[package]]
+ name = "sdl3-sys"
+ version = "0.4.7+SDL3-3.2.10"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "f0d16a8a3623a4cb39a3661c81d9d4c5fd77ada27fc056e320b3651bf7bde1b1"
+ dependencies = [
+- "cmake",
+- "rpkg-config",
+- "sdl3-src",
+ "pkg-config",
+ ]
+ 
+ [[package]]
+diff --git a/Cargo.toml b/Cargo.toml
+index 1f41e04..9d9ea33 100644
+--- a/Cargo.toml
+++ b/Cargo.toml
+@@ -18,7 +18,7 @@ serde-big-array = "0.5"
+ eframe = { version = "0.31", default-features = false, features = ["wayland", "x11", "glow"] }
+ sha2 = "0.10"
+ ab_glyph = "0.2"
+-sdl3-sys = { version = "0.4", features = ["build-from-source-static"] }
+sdl3-sys = { version = "0.4", features = ["use-pkg-config"] }
+ rfd = { version = "0.15", default-features = false, features = ["xdg-portal", "tokio"] }
+ tokio = {version = "1.43", features = ["rt-multi-thread", "macros"] }
+ spin_sleep = "1.3"
+diff --git a/build.rs b/build.rs
+index 67a6e8d..6c9f63b 100644
+--- a/build.rs
+++ b/build.rs
+@@ -52,10 +52,7 @@ fn main() {
+         .include("parallel-rdp/parallel-rdp-standalone/vulkan")
+         .include("parallel-rdp/parallel-rdp-standalone/vulkan-headers/include")
+         .include("parallel-rdp/parallel-rdp-standalone/util")
+-        .include(
+-            std::path::PathBuf::from(std::env::var("DEP_SDL3_OUT_DIR").to_owned().unwrap())
+-                .join("include"),
+-        );
+        ;
+ 
+     let os = std::env::var("CARGO_CFG_TARGET_OS").unwrap();
+     let arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap();
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+buildGoModule (finalAttrs: {
+  pname = "gorched";
+  version = "1.6";
+
+  src = fetchFromGitHub {
+    owner = "zladovan";
+    repo = "gorched";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-cT6wkWUlz3ixv7Mu5143I5NxjfwhKQ6bLwrW3BwTtTQ=";
+  };
+  vendorHash = "sha256-9fucarQKltIxV8j8L+yQ6Fa7IRIhoQCNxcG21KYOpuw=";
+
+  postPatch = ''
+    mkdir ./cmd/gorched
+    mv ./cmd/main.go ./cmd/gorched/main.go
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = ''Terminal based game written in Go inspired by "The Mother of all games" Scorched Earth'';
+    homepage = "https://github.com/zladovan/gorched";
+    changelog = "https://github.com/zladovan/gorched/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ xiaoxiangmoe ];
+    mainProgram = "gorched";
+  };
+})
@@ -23,13 +23,13 @@

 stdenv.mkDerivation {
  pname = "ioquake3";
-  version = "0-unstable-2025-04-25";
+  version = "0-unstable-2025-05-15";

  src = fetchFromGitHub {
    owner = "ioquake";
    repo = "ioq3";
-    rev = "10afd421f23876e03535bb1958eae8b76371565d";
-    hash = "sha256-5ByaIjmyndiliU5qnt62mj2CFByVv4M4+d3KBAgysck=";
+    rev = "8d2c2b42a55598d99873203194d13161ec2789c6";
+    hash = "sha256-OszPRlS5NTvajDZhtGw2wa275O8YodkIgiBz3POouYs=";
  };

  nativeBuildInputs = [
@@ -5,16 +5,18 @@
  autoreconfHook,
  pandoc,
  pkg-config,
+  versionCheckHook,
+  nix-update-script,
 }:

-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
  pname = "jo";
  version = "1.9";

  src = fetchFromGitHub {
    owner = "jpmens";
    repo = "jo";
-    rev = version;
+    tag = finalAttrs.version;
    sha256 = "sha256-1q4/RpxfoAdtY3m8bBuj7bhD17V+4dYo3Vb8zMbI1YU=";
  };

@@ -26,12 +28,28 @@ stdenv.mkDerivation rec {
    pkg-config
  ];

-  meta = with lib; {
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "-v";
+  postInstallCheck = ''
+    $out/bin/jo -V > /dev/null
+    seq 1 10 | $out/bin/jo -a | grep '^\[1,2,3,4,5,6,7,8,9,10\]$' > /dev/null
+  '';
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
    description = "Small utility to create JSON objects";
    homepage = "https://github.com/jpmens/jo";
+    changelog = "https://github.com/jpmens/jo/blob/${finalAttrs.version}/ChangeLog";
    mainProgram = "jo";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.markus1189 ];
-    platforms = platforms.all;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [
+      xiaoxiangmoe
+      markus1189
+    ];
+    platforms = lib.platforms.all;
  };
-}
+})
@@ -7,13 +7,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "krep";
-  version = "0.4.2";
+  version = "1.1.2";

  src = fetchFromGitHub {
    owner = "davidesantangelo";
    repo = "krep";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-lg1nwBV/lfPVoMWmVh4iFElr5Qv+YA5HRKZOS3jd+6U=";
+    hash = "sha256-mZ5ki1f0q4k3imxeF9qbn8ZU/at+NNBhroau/5Z4WU4=";
  };

  makeFlags = [
@@ -13,11 +13,11 @@ let
 in
 stdenv.mkDerivation rec {
  pname = "libmikmod";
-  version = "3.3.12";
+  version = "3.3.13";

  src = fetchurl {
    url = "mirror://sourceforge/mikmod/libmikmod-${version}.tar.gz";
-    sha256 = "sha256-re9iFIY1FqSltE6/LHHvhOzf6zRElz2suscJEcm8Z+k=";
+    sha256 = "sha256-n8F5n36mqVx8WILemL6F/H0gugpKb8rK4RyMazgrsgc=";
  };

  buildInputs = [ texinfo ] ++ optional stdenv.hostPlatform.isLinux alsa-lib;
@@ -18,13 +18,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
  pname = "libpinyin";
-  version = "2.10.1";
+  version = "2.10.2";

  src = fetchFromGitHub {
    owner = "libpinyin";
    repo = "libpinyin";
    tag = finalAttrs.version;
-    hash = "sha256-bvPxbi/QwRQ5fFgVKC9kdqY/wbZApZaaIYXozQtHprY=";
+    hash = "sha256-EexmZFGvuMextbiMZ6mSV58UUUjVVGMQubtS6DzoBs0=";
  };

  postUnpack = ''
@@ -7,13 +7,13 @@

 stdenvNoCC.mkDerivation {
  pname = "libretro-shaders-slang";
-  version = "0-unstable-2025-05-04";
+  version = "0-unstable-2025-05-17";

  src = fetchFromGitHub {
    owner = "libretro";
    repo = "slang-shaders";
-    rev = "2668d46e9e79e5c364fd4dfbece7fc92eda358dd";
-    hash = "sha256-j92MH50k7eD6Zwp76aWoz3xdUMFrcviijGigr+NZRsA=";
+    rev = "37aa1f355e19701b192ae0b88855094fe2f5ff22";
+    hash = "sha256-30xMYR54z7aJqQZL8zqO93n12vYA7uE3GnZTHP92uRc=";
  };

  dontConfigure = true;
@@ -13,13 +13,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "lobster";
-  version = "2025.0";
+  version = "2025.1";

  src = fetchFromGitHub {
    owner = "aardappel";
    repo = "lobster";
    rev = "v${finalAttrs.version}";
-    sha256 = "sha256-yigWrbFQg1nQt7X1Rx7Us5cKfKW4YOmPt0/lyBvspqo=";
+    sha256 = "sha256-ia/xPyPX5lwSkiFCsJ48baCfxv6z6jL5/CIMVRWo/og=";
  };

  nativeBuildInputs = [ cmake ];
@@ -5,6 +5,7 @@
  fetchFromGitHub,
  gtk4,
  installShellFiles,
+  wrapGAppsHook4,
  libadwaita,
  nix-update-script,
  pkg-config,
@@ -38,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: {
  nativeBuildInputs = [
    installShellFiles
    pkg-config
+    wrapGAppsHook4
  ];

  buildInputs = [
@@ -56,6 +58,8 @@ stdenv.mkDerivation (finalAttrs: {
    install -Dm644 install_files/com.sidevesh.Luminance.desktop -t $out/share/applications
    install -Dm644 install_files/com.sidevesh.Luminance.gschema.xml -t $out/share/glib-2.0/schemas

+    glib-compile-schemas $out/share/glib-2.0/schemas
+
    mv icons $out/share/icons
    rm $out/share/icons/com.sidevesh.luminance.Source.svg
  '';
@@ -1,69 +0,0 @@
-{
-  stdenv,
-  fetchFromGitHub,
-  coreutils,
-  autoreconfHook,
-  smlnj,
-}:
-
-let
-  rev = "7376cb20ba5285a6b076a73c821e4743809c1d9d";
-in
-stdenv.mkDerivation {
-  pname = "manticore";
-  version = "2019.12.03";
-
-  src = fetchFromGitHub {
-    owner = "ManticoreProject";
-    repo = "manticore";
-    sha256 = "17h3ar7d6145dyrm006r3gd5frk3v4apjk383n78dh4vlniv1ay2";
-    inherit rev;
-  };
-
-  enableParallelBuilding = false;
-
-  nativeBuildInputs = [ autoreconfHook ];
-
-  buildInputs = [
-    coreutils
-    smlnj
-  ];
-
-  autoreconfFlags = [
-    "-Iconfig"
-    "-vfi"
-  ];
-
-  unpackPhase = ''
-    mkdir -p $out
-    cd $out
-    unpackFile $src
-    mv source repo_checkout
-    cd repo_checkout
-    chmod u+w . -R
-  '';
-
-  postPatch = ''
-    patchShebangs .
-    substituteInPlace configure.ac --replace 'MANTICORE_ROOT=`pwd`' 'MANTICORE_ROOT=$out/repo_checkout'
-  '';
-
-  preInstall = "mkdir -p $out/bin";
-
-  meta = {
-    description = "Parallel, pure variant of Standard ML";
-    mainProgram = "pmlc";
-
-    longDescription = ''
-      Manticore is a high-level parallel programming language aimed at
-      general-purpose applications running on multi-core
-      processors. Manticore supports parallelism at multiple levels:
-      explicit concurrency and coarse-grain parallelism via CML-style
-      constructs and fine-grain parallelism via various light-weight
-      notations, such as parallel tuple expressions and NESL/Nepal-style
-      parallel array comprehensions.
-    '';
-
-    homepage = "http://manticore.cs.uchicago.edu/";
-  };
-}
@@ -2,6 +2,7 @@
  lib,
  stdenv,
  fetchFromGitLab,
+  fetchpatch2,
  writeText,
  bluez,
  cjson,
@@ -75,6 +76,14 @@ stdenv.mkDerivation (finalAttrs: {
    hash = "sha256-VxTxvw+ftqlh3qF5qWxpK1OJsRowkRXu0xEH2bDckUA=";
  };

+  patches = [
+    # Remove with v26
+    (fetchpatch2 {
+      url = "https://gitlab.freedesktop.org/monado/monado/-/commit/2a6932d46dad9aa957205e8a47ec2baa33041076.patch";
+      hash = "sha256-CZMbGgx7mEDcjcoRJHDZ5P6BecFW8CB4fpzxQ9bpAvE=";
+    })
+  ];
+
  nativeBuildInputs = [
    cmake
    doxygen
@@ -0,0 +1,12 @@
+diff --git a/third_party/kiwi/kiwi.h b/third_party/kiwi/kiwi.h
+index d3bf4113..a8a2ad6e 100644
+--- a/third_party/kiwi/kiwi.h
+++ b/third_party/kiwi/kiwi.h
+@@ -15,6 +15,7 @@
+ #include <string.h>
+ #include <pthread.h>
+ #include <assert.h>
+#include <ctype.h>
+ #include <machinarium.h>
+ 
+ #include "kiwi/macro.h"
@@ -26,6 +26,8 @@ stdenv.mkDerivation rec {
      url = "https://github.com/yandex/odyssey/commit/01ca5b345c4483add7425785c9c33dfa2c135d63.patch";
      sha256 = "sha256-8UPkZkiI08ZZL6GShhug/5/kOVrmdqYlsD1bcqfxg/w=";
    })
+    # Fixes kiwi build.
+    ./fix-missing-c-header.patch
  ];

  nativeBuildInputs = [ cmake ];
@@ -34,6 +36,9 @@ stdenv.mkDerivation rec {
    libpq
    zstd
  ];
+
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int -Wno-error=incompatible-pointer-types";
+
  cmakeFlags = [
    "-DBUILD_COMPRESSION=ON"
    "-DPOSTGRESQL_INCLUDE_DIR=${lib.getDev libpq}/include/postgresql/server"
@@ -18,7 +18,7 @@

 stdenv.mkDerivation rec {
  pname = "opensmtpd";
-  version = "7.6.0p1";
+  version = "7.7.0p0";

  nativeBuildInputs = [
    autoreconfHook
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {

  src = fetchurl {
    url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz";
-    hash = "sha256-snyAaYKmZTomN/gQrnpFNyuaf/mTUO4QA3RlA/8OSpc=";
+    hash = "sha256-sJU9oc4sv+S+E5zbGaqTX7+rQs8KmT1CWzejl9xIOWg=";
  };

  patches = [
@@ -9,13 +9,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "plasma-panel-colorizer";
-  version = "2.5.0";
+  version = "3.0.1";

  src = fetchFromGitHub {
    owner = "luisbocanegra";
    repo = "plasma-panel-colorizer";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-5pPmXuP/7weG2EtBLnhSKHkycJw3VdAi05lRgut8Agg=";
+    hash = "sha256-d1NqC8m2ujNsAuHTKRiNz179DzlTc08SKtY/QKHB1xw=";
  };

  nativeBuildInputs = [
@@ -7,13 +7,13 @@

 rustPlatform.buildRustPackage rec {
  pname = "polarity";
-  version = "latest-unstable-2025-04-16";
+  version = "latest-unstable-2025-05-14";

  src = fetchFromGitHub {
    owner = "polarity-lang";
    repo = "polarity";
-    rev = "ba1e8861a8d32e4fad987b6dcb49d2804dce3cbe";
-    hash = "sha256-viwSbYxNcmxNEaPNNThjKxmQx5KO8bEV23KibnCwMQg=";
+    rev = "6c0370011b827886e87b7afec644788a1a54f6f7";
+    hash = "sha256-RKuL0gn734eqNQHIsSA0kLF1qUNtyEUpYf8Zv359GAs=";
  };

  useFetchCargoVendor = true;
@@ -1,33 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  texinfo,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "polipo";
-  version = "1.1.1";
-
-  src = fetchurl {
-    url = "http://www.pps.univ-paris-diderot.fr/~jch/software/files/polipo/${pname}-${version}.tar.gz";
-    sha256 = "05g09sg9qkkhnc2mxldm1w1xkxzs2ylybkjzs28w8ydbjc3pand2";
-  };
-
-  buildInputs = [ texinfo ];
-  makeFlags = [
-    "PREFIX=$(out)"
-    "LOCAL_ROOT=$(out)/share/polipo/www"
-  ];
-
-  meta = with lib; {
-    homepage = "http://www.pps.jussieu.fr/~jch/software/polipo/";
-    description = "Small and fast caching web proxy";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ehmry ];
-    platforms = platforms.all;
-    knownVulnerabilities = [
-      "Unmaintained upstream: https://github.com/jech/polipo/commit/4d42ca1b5849"
-    ];
-  };
-}
@@ -6,16 +6,20 @@

 buildGoModule rec {
  pname = "rabtap";
-  version = "1.43";
+  version = "1.44.1";

  src = fetchFromGitHub {
    owner = "jandelgado";
    repo = "rabtap";
    rev = "v${version}";
-    sha256 = "sha256-OUpDk6nfVbz/KP7vZeZV2JfbCzh/KcuxG015/uxYuEI=";
+    sha256 = "sha256-mW2O8/22zbA3/wpYkQHCI0z8EEL0Wyud2TD5vNUJrNI=";
  };

-  vendorHash = "sha256-V7AkqmEbwuW2Ni9b00Zd22ugk9ScGWf5wauHcQwG7b0=";
+  vendorHash = "sha256-Yi4vH3UMOE//p3H9iCR5RY3SjjR0mu2sBRx8WK57Dq8=";
+
+  ldflags = [
+    "-X main.BuildVersion=v${version}"
+  ];

  meta = with lib; {
    description = "RabbitMQ wire tap and swiss army knife";
@@ -7,17 +7,17 @@
 }:
 rustPlatform.buildRustPackage rec {
  pname = "railway";
-  version = "4.3.0";
+  version = "4.5.1";

  src = fetchFromGitHub {
    owner = "railwayapp";
    repo = "cli";
    rev = "v${version}";
-    hash = "sha256-3QdwwZMlhhO25GuhWFNI6HpvOXjXpVypP4oVqTt5zzo=";
+    hash = "sha256-tZwVkZDT4WtM7cxI0FKPtX7C7NdhRbIOsDIrS4hbz+I=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-ox9iqwBhdc1bPbIPlDIRK2lptoQ5kisGYr+0Ymsc3ps=";
+  cargoHash = "sha256-eK91RATbTqYJYKM5I67281oHY90aaTVvbqQnysz/8k4=";

  nativeBuildInputs = [ pkg-config ];

@@ -18,16 +18,16 @@ in

 buildGoModule rec {
  pname = "regclient";
-  version = "0.8.2";
+  version = "0.8.3";
  tag = "v${version}";

  src = fetchFromGitHub {
    owner = "regclient";
    repo = "regclient";
    rev = tag;
-    sha256 = "sha256-Y+mO/DgJ7CqzDFTNyOMUEOZTnZmOjPu8O4xRO/qGVYY=";
+    sha256 = "sha256-vuZPd51nzCasV3WWulbKCQnqVkupMu5jQhQypvTKGvk=";
  };
-  vendorHash = "sha256-SWkrPpjAA32XkToh7ujSPaRNvHtf2ymvx5E7iGD5B8k=";
+  vendorHash = "sha256-ad7IPiOMG4G80BdAZz7IN0hBPJgUIVdO9oFlM7IDmp8=";

  outputs = [ "out" ] ++ bins;

@@ -5,6 +5,9 @@
  jdk,
  ant,
  git,
+  coreutils,
+  hostname,
+  gawk,
  unzip,
 }:

@@ -44,11 +47,19 @@ stdenv.mkDerivation rec {
    # Use a location outside nix (must be writable)
    substituteInPlace installer/rtg \
      --replace-fail  '$THIS_DIR/rtg.cfg' '$HOME/.config/rtg-tools/rtg.cfg'  \
-      --replace-fail 'RTG_JAVA="java"' 'RTG_JAVA="${jdk}/lib/openjdk/bin/java"'
+      --replace-fail 'RTG_JAVA="java"' 'RTG_JAVA="${jdk}/lib/opendk/bin/java"' \
+      --replace-fail uname ${lib.getExe' coreutils "uname"} \
+      --replace-fail awk ${lib.getExe gawk} \
+      --replace-fail "hostname -s" "${lib.getExe hostname} -s"
+

    sed -i '/USER_JAVA_OPTS=$RTG_JAVA_OPTS/a mkdir -p $HOME/.config/rtg-tools'  installer/rtg
  '';

+  checkPhase = ''
+    ant runalltests
+  '';
+
  meta = with lib; {
    homepage = "https://github.com/RealTimeGenomics/rtg-tools";
    description = "Useful utilities for dealing with VCF files and sequence data, especially vcfeval";
@@ -8,13 +8,13 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "simdutf";
-  version = "7.0.0";
+  version = "7.1.0";

  src = fetchFromGitHub {
    owner = "simdutf";
    repo = "simdutf";
    rev = "v${finalAttrs.version}";
-    hash = "sha256-sXxw3PCctcy4kxJHvUfXc07gArRqF5lz9DEJvzyzY48=";
+    hash = "sha256-2nDTARUH5gb/pP4WnCfSPzreAThMAuAuwRT7y2aumBA=";
  };

  # Fix build on darwin
@@ -4,27 +4,30 @@
  libGL,
  makeWrapper,
  openal,
-  openjdk,
+  openjdk17,
  stdenv,
  xorg,
  copyDesktopItems,
  makeDesktopItem,
  writeScript,
 }:
-
+let
+  openjdk = openjdk17;
+in
 stdenv.mkDerivation rec {
  pname = "starsector";
-  version = "0.98a-RC7";
+  version = "0.98a-RC8";

  src = fetchzip {
    url = "https://f005.backblazeb2.com/file/fractalsoftworks/release/starsector_linux-${version}.zip";
-    sha256 = "sha256-qA4/9AvRWBOIbNKA9U8U7PoPmIwz8wgJZyYFln7LZHw=";
+    sha256 = "sha256-W/6QpgKbUJC+jWOlAOEEGStee5KJuLi020kRtPQXK3U=";
  };

  nativeBuildInputs = [
    copyDesktopItems
    makeWrapper
  ];
+
  buildInputs = [
    xorg.libXxf86vm
    openal
@@ -80,7 +83,7 @@ stdenv.mkDerivation rec {
  # pass-through CLI args ($@) to the JVM.
  postPatch = ''
    substituteInPlace starsector.sh \
-      --replace-fail "./jre_linux/bin/java" "${openjdk}/bin/java" \
+      --replace-fail "./jre_linux/bin/java" "${lib.getExe openjdk}" \
      --replace-fail "./native/linux" "$out/share/starsector/native/linux" \
      --replace-fail "./compiler_directives.txt" "$out/share/starsector/compiler_directives.txt" \
      --replace-fail "=." "=\''${XDG_DATA_HOME:-\$HOME/.local/share}/starsector" \
@@ -92,7 +95,7 @@ stdenv.mkDerivation rec {
    #!nix-shell -i bash -p curl gnugrep common-updater-scripts
    set -eou pipefail;
    version=$(curl -s https://fractalsoftworks.com/preorder/ | grep -oP "https://f005.backblazeb2.com/file/fractalsoftworks/release/starsector_linux-\K.*?(?=\.zip)" | head -1)
-    update-source-version ${pname} "$version" --file=./pkgs/games/starsector/default.nix
+    update-source-version ${pname} "$version" --file=./pkgs/by-name/st/starsector/package.nix
  '';

  meta = with lib; {
@@ -1,44 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  fetchpatch,
-  buildGoModule,
-  pkg-config,
-  libappindicator-gtk3,
-}:
-
-buildGoModule rec {
-  pname = "syncthing-tray";
-  version = "0.7";
-
-  src = fetchFromGitHub {
-    owner = "alex2108";
-    repo = "syncthing-tray";
-    rev = "v${version}";
-    hash = "sha256-g/seDpNdoJ1tc5CTh2EuXoeo8XNpa9CaR+s7bW2cySA=";
-  };
-
-  vendorHash = "sha256-hGV5bivDUFEbOwU9sU+Eu5Wzz/aZtj6NUkpzHlmZTtw=";
-
-  patches = [
-    # Migrate to Go modules
-    (fetchpatch {
-      url = "https://github.com/alex2108/syncthing-tray/commit/94fac974a227cd03c566f81797a21b1bcc29adf5.patch";
-      hash = "sha256-uJfnI9kGIlw4OzFoML+ulgR3keOeVB3+ox/4RtYJNXY=";
-    })
-  ];
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ libappindicator-gtk3 ];
-
-  meta = {
-    description = "Simple application tray for syncthing";
-    homepage = "https://github.com/alex2108/syncthing-tray";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [
-      luftmensch-luftmensch
-      nickhu
-    ];
-    mainProgram = "syncthing-tray";
-  };
-}
@@ -8,9 +8,7 @@
  rust-jemalloc-sys,

  # nativeBuildInputs
-  cmake,
  installShellFiles,
-  pkg-config,

  buildPackages,
  versionCheckHook,
@@ -20,29 +18,23 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "uv";
-  version = "0.7.4";
+  version = "0.7.5";

  src = fetchFromGitHub {
    owner = "astral-sh";
    repo = "uv";
    tag = finalAttrs.version;
-    hash = "sha256-Lj+qznkYIO7tu12Db2k6hzfh02Ph+Nj6n6j7ncTbPXE=";
+    hash = "sha256-sE0d18lA9pA/EpzwXZ8RSucQ5eVtnkyoTzkrB5sAaO4=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-awKbKDyU8r7pdPlce0a0mLavrfnvMssyf/VDD6LRm7Q=";
+  cargoHash = "sha256-xrusRs2PEEHzEOTvJ8vcpn/uxbeW5APcFbJZNZPzs1U=";

  buildInputs = [
    rust-jemalloc-sys
  ];

-  nativeBuildInputs = [
-    cmake
-    installShellFiles
-    pkg-config
-  ];
-
-  dontUseCmakeConfigure = true;
+  nativeBuildInputs = [ installShellFiles ];

  cargoBuildFlags = [
    "--package"
@@ -64,9 +56,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
    ''
  );

-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
+  nativeInstallCheckInputs = [ versionCheckHook ];
  versionCheckProgramArg = "--version";
  doInstallCheck = true;

@@ -84,6 +74,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
      mit
    ];
    maintainers = with lib.maintainers; [
+      bengsparks
      GaetanLepage
      prince213
    ];
@@ -8,17 +8,17 @@

 rustPlatform.buildRustPackage (finalAttrs: {
  pname = "weaver";
-  version = "0.14.0";
+  version = "0.15.0";

  src = fetchFromGitHub {
    owner = "open-telemetry";
    repo = "weaver";
    tag = "v${finalAttrs.version}";
-    hash = "sha256-zsDHVa3UqJX0dPg69hQmoTc6d+fx5zHe4+ElFByMb9s=";
+    hash = "sha256-aAxVSk12bPaWbvCWd+ntPeozd/rtQxdu53APWXI6fTg=";
  };

  useFetchCargoVendor = true;
-  cargoHash = "sha256-30JR9dX+N8KLHeUt8VsGC9LgKUnTtwunWAaXEnzGyWw=";
+  cargoHash = "sha256-Sc5tSK/0C8iqwb4yM6Ra2/PcdOdn1UkpUQjgmWmfVBE=";

  checkFlags = [
    # Skip tests requiring network
@@ -4,6 +4,7 @@
  stdenv,
  fetchFromGitHub,
  fetchFromGitLab,
+  fetchpatch2,
  applyPatches,
  autoAddDriverRunpath,
  avahi,
@@ -71,6 +72,10 @@ stdenv.mkDerivation (finalAttrs: {

    patches = [
      ./force-enable-steamvr_lh.patch
+      (fetchpatch2 {
+        url = "https://gitlab.freedesktop.org/monado/monado/-/commit/2a6932d46dad9aa957205e8a47ec2baa33041076.patch";
+        hash = "sha256-CZMbGgx7mEDcjcoRJHDZ5P6BecFW8CB4fpzxQ9bpAvE=";
+      })
    ];

    postPatch = ''
@@ -191,14 +196,14 @@ stdenv.mkDerivation (finalAttrs: {

  passthru.updateScript = nix-update-script { };

-  meta = with lib; {
+  meta = {
    description = "An OpenXR streaming application to a standalone headset";
    homepage = "https://github.com/WiVRn/WiVRn/";
    changelog = "https://github.com/WiVRn/WiVRn/releases/";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ passivelemon ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Only;
+    maintainers = [ lib.maintainers.passivelemon ];
+    platforms = lib.platforms.linux;
    mainProgram = "wivrn-server";
-    sourceProvenance = with sourceTypes; [ fromSource ];
+    sourceProvenance = [ lib.sourceTypes.fromSource ];
  };
 })
@@ -0,0 +1,124 @@
+{
+  lib,
+  stdenv,
+  clangStdenv,
+  lld,
+  # Available labels: https://github.com/yaneurao/YaneuraOu/blob/59f6265cebbd4f03138091098059a881a021eefa/source/Makefile#L53-L92
+  targetLabel ?
+    with stdenv.hostPlatform;
+    if isDarwin then
+      if isAarch64 then
+        "APPLEM1"
+      else if avx2Support then
+        "APPLEAVX2"
+      else
+        "APPLESSE42"
+    else if isx86_64 then
+      if avx512Support then
+        "AVX512"
+      else if avx2Support then
+        "AVX2"
+      else if sse4_2Support then
+        "SSE42"
+      else if sse4_1Support then
+        "SSE41"
+      else if ssse3Support then
+        "SSSE3"
+      else
+        "SSE2"
+    else if isx86_32 then
+      "NO_SSE"
+    else
+      "OTHER",
+  fetchFromGitHub,
+  fetchurl,
+  _7zz,
+  nix-update-script,
+}:
+
+# Use clangStdenv instead of the default stdenv because:
+# - The upstream author treats clang++ as the primary compiler in the docs
+#   and Makefile, even though the code also builds with g++.
+# - With just stdenv the build fails on macOS, while it works out of the box
+#   with clangStdenv.
+clangStdenv.mkDerivation (finalAttrs: {
+  pname = "yaneuraou";
+  version = "8.60";
+
+  src = fetchFromGitHub {
+    owner = "yaneurao";
+    repo = "YaneuraOu";
+    tag = "v${finalAttrs.version}git";
+    hash = "sha256-1awnGCGIdeMAqAd0TWgoJr5spJo2mFBWdR3iMc2i4OM=";
+  };
+
+  sourceRoot = "${finalAttrs.src.name}/source";
+
+  nativeBuildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    lld
+  ];
+
+  buildInputs = [
+    stdenv.cc.cc # For libstdc++.so.6
+  ];
+
+  buildFlags = [
+    "TARGET_CPU=${targetLabel}"
+    "YANEURAOU_EDITION=YANEURAOU_ENGINE_NNUE"
+    "COMPILER=clang++"
+    "OBJDIR=$NIX_BUILD_TOP/obj"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/bin"
+    mv ./YaneuraOu-by-* "$out/bin/YaneuraOu"
+
+    runHook postInstall
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [
+    _7zz
+  ];
+  installCheckPhase =
+    let
+      nnue = fetchurl {
+        url = "https://github.com/yaneurao/YaneuraOu/releases/download/suisho5/Suisho5.7z";
+        hash = "sha256-ZzTjo9KOZ7kgbDRC9tEPFhSBODJ9/4Ecre389YH3mAk=";
+      };
+    in
+    ''
+      runHook preInstallCheck
+
+      7zz x '${nnue}'
+      usi_command="setoption name EvalDir value $PWD
+      isready
+      go byoyomi 1000
+      wait"
+      usi_output="$("$out/bin/YaneuraOu" <<< "$usi_command")"
+      [[ "$usi_output" == *'bestmove'* ]]
+
+      runHook postInstallCheck
+    '';
+
+  passthru = {
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--version-regex=^v([\\d.]+)git$"
+      ];
+    };
+  };
+
+  meta = {
+    description = "USI compliant shogi engine";
+    homepage = "https://github.com/yaneurao/YaneuraOu";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
+      kachick
+    ];
+    mainProgram = "YaneuraOu";
+    platforms = lib.platforms.unix ++ lib.platforms.windows;
+  };
+})
@@ -10,13 +10,13 @@

 stdenv.mkDerivation rec {
  pname = "gnome-shell-extension-arcmenu";
-  version = "63";
+  version = "65";

  src = fetchFromGitLab {
    owner = "arcmenu";
    repo = "ArcMenu";
    rev = "v${version}";
-    hash = "sha256-XlDkdNINTnUAqr2bxL0u2tHWfiggqT1oOryED7sG/vs=";
+    hash = "sha256-EEK600DwIQAPWR07IMPNZFiWWkiG0blp/D0VKAcc7ns=";
  };

  patches = [
@@ -18,7 +18,7 @@

 stdenv.mkDerivation (finalAttrs: {
  pname = "elementary-dock";
-  version = "8.0.2";
+  version = "8.1.1";

  outputs = [
    "out"
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
    owner = "elementary";
    repo = "dock";
    rev = finalAttrs.version;
-    hash = "sha256-bixNYpPdWU2FndiCPX7SxNTz2MEttRuj35NaWn3GJrI=";
+    hash = "sha256-Z6Y/UR6B4tygmetfZq5sOyn5nfq8+CmuR3NpegzCyo8=";
  };

  depsBuildBuild = [ pkg-config ];
@@ -51,6 +51,10 @@ stdenv.mkDerivation (finalAttrs: {
    wayland
  ];

+  # Fix building with GCC 14
+  # https://github.com/elementary/dock/issues/418
+  env.NIX_CFLAGS_COMPILE = "-Wno-error=int-conversion";
+
  passthru = {
    updateScript = nix-update-script { };
  };
@@ -25,18 +25,18 @@

 stdenv.mkDerivation rec {
  pname = "switchboard-plug-keyboard";
-  version = "8.0.1";
+  version = "8.0.2";

  src = fetchFromGitHub {
    owner = "elementary";
-    repo = pname;
+    repo = "settings-keyboard";
    rev = version;
-    sha256 = "sha256-/jfUftlNL+B4570ajropS7/2fqro380kZzpPwm+A9fA=";
+    sha256 = "sha256-j2D6NSwHTZQJaHm664fHF4VkcExpYwoq/J3SXus30nw=";
  };

  patches = [
    # This will try to install packages with apt.
-    # https://github.com/elementary/switchboard-plug-keyboard/issues/324
+    # https://github.com/elementary/settings-keyboard/issues/324
    ./hide-install-unlisted-engines-button.patch

    (replaceVars ./fix-paths.patch {
@@ -71,7 +71,7 @@ stdenv.mkDerivation rec {

  meta = with lib; {
    description = "Switchboard Keyboard Plug";
-    homepage = "https://github.com/elementary/switchboard-plug-keyboard";
+    homepage = "https://github.com/elementary/settings-keyboard";
    license = licenses.gpl2Plus;
    platforms = platforms.linux;
    teams = [ teams.pantheon ];
@@ -25,13 +25,13 @@

 stdenv.mkDerivation rec {
  pname = "switchboard-plug-pantheon-shell";
-  version = "8.1.0";
+  version = "8.2.0";

  src = fetchFromGitHub {
    owner = "elementary";
-    repo = pname;
+    repo = "settings-desktop";
    rev = version;
-    sha256 = "sha256-S6EJGF9jRiCzH0f7WNrbLtAX23fjD/Hzd8YLEzkXesw=";
+    sha256 = "sha256-TYwiL6+VjfSDiFAlMe482gB8a/OtCYHl5r8gh9Hcvfg=";
  };

  nativeBuildInputs = [
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {

  meta = with lib; {
    description = "Switchboard Desktop Plug";
-    homepage = "https://github.com/elementary/switchboard-plug-pantheon-shell";
+    homepage = "https://github.com/elementary/settings-desktop";
    license = licenses.gpl3Plus;
    platforms = platforms.linux;
    teams = [ teams.pantheon ];
@@ -15,13 +15,13 @@

 stdenv.mkDerivation rec {
  pname = "elementary-default-settings";
-  version = "8.0.3";
+  version = "8.1.0";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = "default-settings";
    rev = version;
-    sha256 = "sha256-V8jzebnMD41U0ycu66xIZmssoqrKVS+4L70mqc3GEzg=";
+    sha256 = "sha256-GUq7kXaidzvqbyeVh4ihcxRqZXOzZO3WMXEe8lf477I=";
  };

  nativeBuildInputs = [
@@ -40,6 +40,9 @@ stdenv.mkDerivation rec {
  mesonFlags = [
    "--sysconfdir=${placeholder "out"}/etc"
    "-Ddefault-wallpaper=${nixos-artwork.wallpapers.simple-dark-gray.gnomeFilePath}"
+    # Do not ship elementary OS specific config files.
+    "-Dapparmor-profiles=false"
+    "-Dgeoclue=false"
  ];

  postFixup = ''
@@ -29,13 +29,13 @@

 stdenv.mkDerivation rec {
  pname = "gala";
-  version = "8.1.0";
+  version = "8.2.2";

  src = fetchFromGitHub {
    owner = "elementary";
    repo = pname;
    rev = version;
-    hash = "sha256-C0Vct2xuGHd/G5x0Faif0DfpyNyCLJDxki+O9697c2s=";
+    hash = "sha256-S71NryqJjWXZgyBj6q088bdjt/NnAEJ6oeUO2OMJ3Z4=";
  };

  patches = [
@@ -171,11 +171,11 @@ in

  saxon_12-he = common rec {
    pname = "saxon-he";
-    version = "12.5";
+    version = "12.6";
    jar = "saxon-he-${version}";
    src = fetchurl {
      url = github.downloadUrl version;
-      hash = "sha256-NaRnKHkr1M7C/CYtSHd7THm1ze7wPSmB46ZOyzoZ9xY=";
+      hash = "sha256-y7ZlfaBhwVVHatnkOjVkpMySjUlR6+7S6v5aCqdOKu4=";
    };
    updateScript = github.updateScript version;
    description = "Processor for XSLT 3.0, XPath 3.1, and XQuery 3.1";
@@ -0,0 +1,9 @@
+{ callPackage, ... }@args:
+
+callPackage ./generic.nix (
+  {
+    version = "31.0";
+    hash = "sha256-Y1qTHFl9xItaIs5u3mr+US1d1KmIfVJXqC7q4AA2U/w=";
+  }
+  // args
+)
@@ -16,14 +16,14 @@

 buildPythonPackage rec {
  pname = "aiodhcpwatcher";
-  version = "1.1.1";
+  version = "1.2.0";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "bdraco";
    repo = "aiodhcpwatcher";
    rev = "v${version}";
-    hash = "sha256-qdtOEfhBrLpO14IJNuTL71ajmf9sjgKgjuT/3Mqycc8=";
+    hash = "sha256-Jyaxqs3vckXmqUNhYFA912abDhtZ9UBgGnm+qw/N9Ws=";
  };

  postPatch = ''
@@ -18,14 +18,14 @@

 buildPythonPackage rec {
  pname = "cantools";
-  version = "40.2.1";
+  version = "40.2.2";
  pyproject = true;

  disabled = pythonOlder "3.9";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-3Tvt9psNxFCiJwmdAKkTqLuP6+SoRBXutV62mSJlw+A=";
+    hash = "sha256-ba5GyqiiAL2/mIvDLw4/vLHbOE6wl+znynPAeeXu2Bw=";
  };

  nativeBuildInputs = [
@@ -7,12 +7,13 @@
  mock,
  pytestCheckHook,
  pythonOlder,
+  setuptools,
 }:

 buildPythonPackage rec {
  pname = "google-cloud-dns";
  version = "0.35.0";
-  format = "setuptools";
+  pyproject = true;

  disabled = pythonOlder "3.7";

@@ -21,7 +22,9 @@ buildPythonPackage rec {
    hash = "sha256-CsRNqesPoLEilRPNiIB0q9AhGZLEBCMAr9HBbUFHRVM=";
  };

-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
    google-api-core
    google-cloud-core
  ];
@@ -37,7 +40,7 @@ buildPythonPackage rec {
  '';

  disabledTests = [
-    # requires credentials
+    # Test requires credentials
    "test_quota"
  ];

@@ -9,14 +9,14 @@

 buildPythonPackage rec {
  pname = "hf-xet";
-  version = "1.1.0";
+  version = "1.1.2";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "huggingface";
    repo = "xet-core";
    tag = "v${version}";
-    hash = "sha256-bE3uioAn4I65tOItKzDddAWTP4ZlNUZbfMaSD2anhNk=";
+    hash = "sha256-272xEw5W2Mo7a/OFpPbVNJMNc3TlmAsOdYFVw4HbXYk=";
  };

  sourceRoot = "${src.name}/hf_xet";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
      src
      sourceRoot
      ;
-    hash = "sha256-D6R2FFGDKB4VgMkflF441Ki8o1RCwBoumQ4oeNL/fnc=";
+    hash = "sha256-wV8qF3EARKkJWGQVhOPjgi7yKL1idRiuZrJ/HnL1BsQ=";
  };

  nativeBuildInputs = [
@@ -50,7 +50,7 @@ buildPythonPackage rec {

  meta = {
    description = "Xet client tech, used in huggingface_hub";
-    homepage = "https://github.com/huggingface/xet-core/hf_xet";
+    homepage = "https://github.com/huggingface/xet-core/tree/main/hf_xet";
    changelog = "https://github.com/huggingface/xet-core/releases/tag/v${version}";
    license = lib.licenses.asl20;
    maintainers = with lib.maintainers; [ GaetanLepage ];
@@ -1,30 +1,31 @@
 {
  lib,
  aiohttp,
-  async-timeout,
  buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
  pythonOlder,
+  setuptools,
 }:

 buildPythonPackage rec {
  pname = "hole";
-  version = "0.8.0";
-  format = "setuptools";
+  version = "0.9.0";
+  pyproject = true;

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

-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-zkghLJe1SzN2qOeL23+T2ISjGkuODd9tJA1tO3hw2a0=";
+  src = fetchFromGitHub {
+    owner = "home-assistant-ecosystem";
+    repo = "python-hole";
+    tag = version;
+    hash = "sha256-yyqLbnW49R7f8C0IBL8z9Sq69TtaS5Ng2VQLJofNqcI=";
  };

-  propagatedBuildInputs = [
-    aiohttp
-    async-timeout
-  ];
+  build-system = [ setuptools ];

-  # no tests are present
+  dependencies = [ aiohttp ];
+
+  # Module has no tests
  doCheck = false;

  pythonImportsCheck = [ "hole" ];
@@ -32,8 +33,8 @@ buildPythonPackage rec {
  meta = with lib; {
    description = "Python API for interacting with a Pihole instance";
    homepage = "https://github.com/home-assistant-ecosystem/python-hole";
-    changelog = "https://github.com/home-assistant-ecosystem/python-hole/releases/tag/${version}";
-    license = with licenses; [ mit ];
+    changelog = "https://github.com/home-assistant-ecosystem/python-hole/releases/tag/${src.tag}";
+    license = licenses.mit;
    maintainers = with maintainers; [ fab ];
  };
 }
@@ -14,7 +14,7 @@

 buildPythonPackage rec {
  pname = "jc";
-  version = "1.25.4";
+  version = "1.25.5";
  format = "setuptools";
  disabled = pythonOlder "3.6";

@@ -22,7 +22,7 @@ buildPythonPackage rec {
    owner = "kellyjonbrazil";
    repo = pname;
    tag = "v${version}";
-    hash = "sha256-9006FoIGUpmb+tC2d6jLsYpKUPM5OEXxK1ztAREwZ1E=";
+    hash = "sha256-tv466jVjLtmn2U8t3sSyQLuzGcVf0RHtE+cFd8j8T5k=";
  };

  propagatedBuildInputs = [
@@ -55,7 +55,7 @@ buildPythonPackage rec {
    homepage = "https://github.com/kellyjonbrazil/jc";
    license = licenses.mit;
    maintainers = with maintainers; [ atemu ];
-    changelog = "https://github.com/kellyjonbrazil/jc/blob/v${version}/CHANGELOG";
+    changelog = "https://github.com/kellyjonbrazil/jc/blob/${src.tag}/CHANGELOG";
    mainProgram = "jc";
  };
 }
@@ -8,14 +8,14 @@

 buildPythonPackage rec {
  pname = "json-repair";
-  version = "0.42.0";
+  version = "0.44.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "mangiucugna";
    repo = "json_repair";
    tag = "v${version}";
-    hash = "sha256-gWZmDljbV1CbVjBDqImvhF2LF0uhqsiZ5mF3fuGf6HQ=";
+    hash = "sha256-S3hSbvNyvCx4qia9PRgUy+UugURjtA4hV5kuJIuLafw=";
  };

  build-system = [ setuptools ];
@@ -24,7 +24,7 @@
 let
  llm = buildPythonPackage rec {
    pname = "llm";
-    version = "0.24.2";
+    version = "0.25";
    pyproject = true;

    build-system = [ setuptools ];
@@ -35,7 +35,7 @@ let
      owner = "simonw";
      repo = "llm";
      tag = version;
-      hash = "sha256-G5XKau8sN/AW9icSmJW9ht0wP77QdJkT5xmn7Ej4NeU=";
+      hash = "sha256-iH1P0VdpwIItY1In7vlM0Sn44Db23TqFp8GZ79/GMJs=";
    };

    patches = [ ./001-disable-install-uninstall-commands.patch ];
@@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "motionblinds";
-  version = "0.6.26";
+  version = "0.6.27";
  pyproject = true;

  disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
    owner = "starkillerOG";
    repo = "motion-blinds";
    tag = version;
-    hash = "sha256-ZcDzuETPeYBQ2HdQUq3KRHRQxdaFrhQ4ipED5TL4XZY=";
+    hash = "sha256-kvCvgSoiyDCDmEG8goM3hYXpvb5CO7nqz0/CKPBlZ2g=";
  };

  build-system = [ setuptools ];
@@ -11,12 +11,12 @@

 buildPythonPackage rec {
  pname = "nodriver";
-  version = "0.45.2";
+  version = "0.46.0";
  pyproject = true;

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-cTg//IxrjVNySKx7ElzDAEZ33xflZG+r75Dzkh76Ifg=";
+    hash = "sha256-U1EAN4abZ/5xnO42yzUcRZIZccPHTfPDWcDwIxuRw08=";
  };

  disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@

 buildPythonPackage rec {
  pname = "nvchecker";
-  version = "2.16";
+  version = "2.17";
  pyproject = true;

  disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
    owner = "lilydjwg";
    repo = "nvchecker";
    tag = "v${version}";
-    hash = "sha256-HdL3BnjQZzKXtjhQqDst6dJH82g3BONFsGUnwzDMRDA=";
+    hash = "sha256-jA41WoD0WXdb8CM9dUchIAhYd4GoUA9zLYbkaPIScLg=";
  };

  build-system = [ setuptools ];
@@ -36,12 +36,12 @@ let
 in
 buildPythonPackage rec {
  pname = "pex";
-  version = "2.33.1";
+  version = "2.38.1";
  pyproject = true;

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-kHTvgXe51TencKDkFQAAdyPXuJLBNpJ0NIy1KB8p5JQ=";
+    hash = "sha256-ejd9JWmDutYpwR+KPiS90Y3XKyyOwRAMpCEN013VMdI=";
  };

  preBuild = ''
@@ -38,9 +38,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"

 [[package]]
 name = "bitflags"
-version = "2.9.0"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"

 [[package]]
 name = "bumpalo"
@@ -245,7 +245,7 @@ dependencies = [

 [[package]]
 name = "pycrdt"
-version = "0.12.15"
+version = "0.12.18"
 dependencies = [
 "pyo3",
 "yrs",
@@ -253,11 +253,10 @@ dependencies = [

 [[package]]
 name = "pyo3"
-version = "0.24.2"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5203598f366b11a02b13aa20cab591229ff0a89fd121a308a5df751d5fc9219"
+checksum = "f239d656363bcee73afef85277f1b281e8ac6212a1d42aa90e55b90ed43c47a4"
 dependencies = [
- "cfg-if",
 "indoc",
 "libc",
 "memoffset",
@@ -271,9 +270,9 @@ dependencies = [

 [[package]]
 name = "pyo3-build-config"
-version = "0.24.2"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99636d423fa2ca130fa5acde3059308006d46f98caac629418e53f7ebb1e9999"
+checksum = "755ea671a1c34044fa165247aaf6f419ca39caa6003aee791a0df2713d8f1b6d"
 dependencies = [
 "once_cell",
 "target-lexicon",
@@ -281,9 +280,9 @@ dependencies = [

 [[package]]
 name = "pyo3-ffi"
-version = "0.24.2"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78f9cf92ba9c409279bc3305b5409d90db2d2c22392d443a87df3a1adad59e33"
+checksum = "fc95a2e67091e44791d4ea300ff744be5293f394f1bafd9f78c080814d35956e"
 dependencies = [
 "libc",
 "pyo3-build-config",
@@ -291,9 +290,9 @@ dependencies = [

 [[package]]
 name = "pyo3-macros"
-version = "0.24.2"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b999cb1a6ce21f9a6b147dcf1be9ffedf02e0043aec74dc390f3007047cecd9"
+checksum = "a179641d1b93920829a62f15e87c0ed791b6c8db2271ba0fd7c2686090510214"
 dependencies = [
 "proc-macro2",
 "pyo3-macros-backend",
@@ -303,9 +302,9 @@ dependencies = [

 [[package]]
 name = "pyo3-macros-backend"
-version = "0.24.2"
+version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "822ece1c7e1012745607d5cf0bcb2874769f0f7cb34c4cde03b9358eb9ef911a"
+checksum = "9dff85ebcaab8c441b0e3f7ae40a6963ecea8a9f5e74f647e33fcf5ec9a1e89e"
 dependencies = [
 "heck",
 "proc-macro2",
@@ -325,9 +324,9 @@ dependencies = [

 [[package]]
 name = "redox_syscall"
-version = "0.5.11"
+version = "0.5.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2f103c6d277498fbceb16e84d317e2a400f160f46904d5f5410848c829511a3"
+checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af"
 dependencies = [
 "bitflags",
 ]
@@ -410,18 +409,18 @@ checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a"

 [[package]]
 name = "thiserror"
-version = "1.0.69"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.69"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -569,9 +568,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"

 [[package]]
 name = "yrs"
-version = "0.23.1"
+version = "0.23.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a7cab84724ae7f361a8c92465f5160922cbb941a499e1a8cacd103351ab9c78"
+checksum = "38f76003877bef9c609585bad08e81438161c472c15d5e8116c8f87648866c6b"
 dependencies = [
 "arc-swap",
 "async-lock",
@@ -19,14 +19,14 @@

 buildPythonPackage rec {
  pname = "pycrdt";
-  version = "0.12.15";
+  version = "0.12.18";
  pyproject = true;

  src = fetchFromGitHub {
-    owner = "jupyter-server";
+    owner = "y-crdt";
    repo = "pycrdt";
    tag = version;
-    hash = "sha256-+DRHOX4X2ez+G/nHYnXfANNzdPU7QDbq6lBWBwLJoP4=";
+    hash = "sha256-pqGzAOoCJy+7cTtQD6FeFDicg6S0X2M+DM/x6Id28ac=";
  };

  postPatch = ''
@@ -2,61 +2,40 @@
  lib,
  buildPythonPackage,
  fetchPypi,
-  pkg-config,
  rustPlatform,
  cargo,
-  rustc,
-  bzip2,
-  nettle,
-  openssl,
-  pcsclite,
-  stdenv,
-  libiconv,
 }:

 buildPythonPackage rec {
  pname = "pysequoia";
-  version = "0.1.26";
+  version = "0.1.28";
  format = "pyproject";

  src = fetchPypi {
    inherit pname version;
-    hash = "sha256-Ip4yv54e1c+zshEtLVgK5D2VcB41AzSEJHuD5t8akXI=";
+    hash = "sha256-ixTszL2IN50SDYTDZqzlMI1nY6yNkEUnK5VxCoAG0jk=";
  };

  cargoDeps = rustPlatform.fetchCargoVendor {
    inherit src;
    name = "${pname}-${version}";
-    hash = "sha256-vm9PpJHRznxNVtL28PBGnQcMUHwFn5uxW7Y9UufAUPg=";
+    hash = "sha256-cq55j3wNcV8CRbnqZPV8zrRzvUud5RXJDX1oh7WZoiU=";
  };

  nativeBuildInputs = [
-    pkg-config
    rustPlatform.bindgenHook
    rustPlatform.cargoSetupHook
    rustPlatform.maturinBuildHook
    cargo
-    rustc
  ];

-  buildInputs =
-    [
-      bzip2
-      nettle
-      openssl
-      pcsclite
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      libiconv
-    ];
-
  pythonImportsCheck = [ "pysequoia" ];

-  meta = with lib; {
+  meta = {
    description = "This library provides OpenPGP facilities in Python through the Sequoia PGP library";
-    downloadPage = "https://codeberg.org/wiktor/pysequoia";
-    homepage = "https://sequoia-pgp.gitlab.io/pysequoia";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ doronbehar ];
+    downloadPage = "https://github.com/wiktor-k/pysequoia";
+    homepage = "https://github.com/wiktor-k/pysequoia";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ doronbehar ];
  };
 }
@@ -9,7 +9,7 @@

 buildPythonPackage rec {
  pname = "pysuezv2";
-  version = "2.0.4";
+  version = "2.0.5";
  pyproject = true;

  disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
    owner = "jb101010-2";
    repo = "pySuez";
    tag = version;
-    hash = "sha256-/VgZjYWMvZYXAvt14VABKXp8Ok8EpxDsMqPl8lmUCq8=";
+    hash = "sha256-U5INSk3tcEgDJyRx17YaSDjPWgNwGeHIs2VB87E0l44=";
  };

  build-system = [ hatchling ];
@@ -16,7 +16,7 @@

 buildPythonPackage rec {
  pname = "pyswitchbot";
-  version = "0.62.0";
+  version = "0.62.2";
  pyproject = true;

  disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
    owner = "Danielhiversen";
    repo = "pySwitchbot";
    tag = version;
-    hash = "sha256-Zzr6UGwj25PaIUBW4NsIWMtSbcM/KE4cdQ+VrOqcv7U=";
+    hash = "sha256-kYk1mMY73RKW7OkKyK5idN+ib8OsIoMiGB5i/trgMZc=";
  };

  build-system = [ setuptools ];
@@ -38,6 +38,7 @@ buildPythonPackage rec {
  postPatch = ''
    substituteInPlace pyproject.toml \
      --replace-fail "mypy[mypyc]==1.15.0" "mypy"
+    sed -i "/black>=/d" pyproject.toml
  '';

  build-system = [ setuptools-scm ];
@@ -28,14 +28,14 @@

 buildPythonPackage rec {
  pname = "tensordict";
-  version = "0.8.2";
+  version = "0.8.3";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "pytorch";
    repo = "tensordict";
    tag = "v${version}";
-    hash = "sha256-Qk+pVSwKAIOz6EczGjf4gsOsxAno/vHCgO1EQZDNTsk=";
+    hash = "sha256-d/6JKGFcFLXY9pxsnP27uwnAnIQ9EKvfTS30DCwQrCM=";
  };

  build-system = [
@@ -42,6 +42,7 @@
  # Build inputs
  apple-sdk_13,
  numactl,
+  llvmPackages,

  # dependencies
  astunparse,
@@ -120,7 +121,7 @@ let

  setBool = v: if v then "1" else "0";

-  # https://github.com/pytorch/pytorch/blob/v2.6.0/torch/utils/cpp_extension.py#L2046-L2048
+  # https://github.com/pytorch/pytorch/blob/v2.7.0/torch/utils/cpp_extension.py#L2343-L2345
  supportedTorchCudaCapabilities =
    let
      real = [
@@ -142,6 +143,12 @@ let
        "9.0"
        "9.0a"
        "10.0"
+        "10.0"
+        "10.0a"
+        "10.1"
+        "10.1a"
+        "12.0"
+        "12.0a"
      ];
      ptx = lists.map (x: "${x}+PTX") real;
    in
@@ -173,7 +180,13 @@ let
    else if cudaSupport then
      gpuArchWarner supportedCudaCapabilities unsupportedCudaCapabilities
    else if rocmSupport then
-      rocmPackages.clr.gpuTargets
+      # Remove RDNA1 gfx101x archs from default ROCm support list to avoid
+      # use of undeclared identifier 'CK_BUFFER_RESOURCE_3RD_DWORD'
+      # TODO: Retest after ROCm 6.4 or torch 2.8
+      lib.lists.subtractLists [
+        "gfx1010"
+        "gfx1012"
+      ] (rocmPackages.clr.localGpuTargets or rocmPackages.clr.gpuTargets)
    else
      throw "No GPU targets specified"
  );
@@ -187,6 +200,7 @@ let
      rccl
      miopen
      aotriton
+      composable_kernel
      rocrand
      rocblas
      rocsparse
@@ -254,7 +268,7 @@ in
 buildPythonPackage rec {
  pname = "torch";
  # Don't forget to update torch-bin to the same version.
-  version = "2.6.0";
+  version = "2.7.0";
  pyproject = true;

  stdenv = stdenv';
@@ -279,9 +293,6 @@ buildPythonPackage rec {
  patches =
    [
      ./clang19-template-warning.patch
-      # fix invalid static cast in XNNPACK
-      # https://github.com/google/XNNPACK/issues/7489
-      ./xnnpack-bfloat16.patch
    ]
    ++ lib.optionals cudaSupport [ ./fix-cmake-cuda-toolkit.patch ]
    ++ lib.optionals stdenv.hostPlatform.isLinux [
@@ -298,6 +309,11 @@ buildPythonPackage rec {

  postPatch =
    ''
+      # Prevent NCCL from being cloned during the configure phase
+      # TODO: remove when updating to the next release as it will not be needed anymore
+      substituteInPlace tools/build_pytorch_libs.py \
+        --replace-fail "  checkout_nccl()" "  "
+
      substituteInPlace cmake/public/cuda.cmake \
        --replace-fail \
          'message(FATAL_ERROR "Found two conflicting CUDA' \
@@ -323,15 +339,13 @@ buildPythonPackage rec {

      # Replace hard-coded rocm paths
      substituteInPlace caffe2/CMakeLists.txt \
-        --replace-fail "/opt/rocm" "${rocmtoolkit_joined}" \
        --replace-fail "hcc/include" "hip/include" \
        --replace-fail "rocblas/include" "include/rocblas" \
        --replace-fail "hipsparse/include" "include/hipsparse"

      # Doesn't pick up the environment variable?
      substituteInPlace third_party/kineto/libkineto/CMakeLists.txt \
-        --replace-fail "\''$ENV{ROCM_SOURCE_DIR}" "${rocmtoolkit_joined}" \
-        --replace-fail "/opt/rocm" "${rocmtoolkit_joined}"
+        --replace-fail "\''$ENV{ROCM_SOURCE_DIR}" "${rocmtoolkit_joined}"

      # Strangely, this is never set in cmake
      substituteInPlace cmake/public/LoadHIP.cmake \
@@ -508,6 +522,7 @@ buildPythonPackage rec {
      blas
      blas.provider
    ]
+    ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]
    ++ lib.optionals cudaSupport (
      with cudaPackages;
      [
@@ -521,6 +536,7 @@ buildPythonPackage rec {
        cusparselt
        libcublas
        libcufft
+        libcufile
        libcurand
        libcusolver
        libcusparse
@@ -657,7 +673,7 @@ buildPythonPackage rec {
        --replace-fail "\''${_IMPORT_PREFIX}/lib64" "$lib/lib"

      substituteInPlace $dev/share/cmake/ATen/ATenConfig.cmake \
-        --replace-fail "/build/source/torch/include" "$dev/include"
+        --replace-fail "/build/${src.name}/torch/include" "$dev/include"
    '';

  postFixup =
@@ -723,6 +739,7 @@ buildPythonPackage rec {
    homepage = "https://pytorch.org/";
    license = lib.licenses.bsd3;
    maintainers = with lib.maintainers; [
+      GaetanLepage
      teh
      thoughtpolice
      tscholak
@@ -4,7 +4,7 @@
  fetchFromGitHub,
  runCommand,
 }:
-assert version == "2.6.0";
+assert version == "2.7.0";
 (rec {
  src_asmjit = fetchFromGitHub {
    owner = "asmjit";
@@ -45,8 +45,14 @@ assert version == "2.6.0";
  src_composable_kernel = fetchFromGitHub {
    owner = "ROCm";
    repo = "composable_kernel";
-    rev = "50ee4267e27b875d149e642f4cebd47be1dc3b57";
-    hash = "sha256-COkyf+FZzX6OdOPCHkP2bXsVvSXK9UR9s7RHWRtIXUE=";
+    rev = "8086bbe3a78d931eb96fe12fdc014082e18d18d3";
+    hash = "sha256-fyL1SzRs5CXW5CWy6kCN1y1xX6cG+ur7iQlbKX2zbCM=";
+  };
+  src_composable_kernel_flash-attention = fetchFromGitHub {
+    owner = "ROCm";
+    repo = "composable_kernel";
+    rev = "888317e698e9803c62bd38568abc9e05d7709f33";
+    hash = "sha256-0FAiGf7AErBzGxhOFcLQ4ceshqp0Esqo4ee7NsjfJUo=";
  };
  src_cpp-httplib = fetchFromGitHub {
    owner = "yhirose";
@@ -75,14 +81,14 @@ assert version == "2.6.0";
  src_cudnn-frontend = fetchFromGitHub {
    owner = "NVIDIA";
    repo = "cudnn-frontend";
-    rev = "936021bfed8c91dc416af1588b2c4eca631a9e45";
-    hash = "sha256-hKqIWGxVco1qkKxDZjc+pUisIcYJwFjZobJZg1WgDvY=";
+    rev = "91b7532f3386768bba4f444ee7672b497f34da8a";
+    hash = "sha256-Ks07ApADA3xQQ+N5BIfvDG+djCvxYL9btF8Aw7TuMvQ=";
  };
  src_cutlass = fetchFromGitHub {
    owner = "NVIDIA";
    repo = "cutlass";
-    rev = "bbe579a9e3beb6ea6626d9227ec32d0dae119a49";
-    hash = "sha256-81O80F3MMOn22N9UaXLU6/9DTVWenYvKhLTHoxw8EEU=";
+    rev = "afa1772203677c5118fcd82537a9c8fefbcc7008";
+    hash = "sha256-oIzlbKRdOh6gp6nRZ8udLSqleBFoFtgM7liCBlHZLOk=";
  };
  src_cutlass_fbgemm = fetchFromGitHub {
    owner = "NVIDIA";
@@ -90,6 +96,12 @@ assert version == "2.6.0";
    rev = "fc9ebc645b63f3a6bc80aaefde5c063fb72110d6";
    hash = "sha256-e2SwXNNwjl/1fV64b+mOJvwGDYeO1LFcqZGbNten37U=";
  };
+  src_cutlass_flash-attention = fetchFromGitHub {
+    owner = "NVIDIA";
+    repo = "cutlass";
+    rev = "c506e16788cb08416a4a57e11a9067beeee29420";
+    hash = "sha256-P/BgJ7MdNTzNgsqoTjxrOQwvKfhAS+rmBw3sC/SdO1I=";
+  };
  src_DCGM = fetchFromGitHub {
    owner = "NVIDIA";
    repo = "DCGM";
@@ -121,6 +133,12 @@ assert version == "2.6.0";
    rev = "7e1e1fe3858c63c251c637ae41a20de425dde96f";
    hash = "sha256-PsgUHtCE3dNR2QdUnRjrXb0ZKZNGwFkA8RWYkZEklEY=";
  };
+  src_flash-attention = fetchFromGitHub {
+    owner = "Dao-AILab";
+    repo = "flash-attention";
+    rev = "979702c87a8713a8e0a5e9fee122b90d2ef13be5";
+    hash = "sha256-7jk8TD+EkkOPrVT5Nzoc+zoZ4jH/C1AtjLcP12hBrp0=";
+  };
  src_flatbuffers = fetchFromGitHub {
    owner = "google";
    repo = "flatbuffers";
@@ -130,8 +148,8 @@ assert version == "2.6.0";
  src_fmt = fetchFromGitHub {
    owner = "fmtlib";
    repo = "fmt";
-    rev = "0c9fce2ffefecfdce794e1859584e25877b7b592";
-    hash = "sha256-IKNt4xUoVi750zBti5iJJcCk3zivTt7nU12RIf8pM+0=";
+    rev = "123913715afeb8a437e6388b4473fcc4753e1c9a";
+    hash = "sha256-sUbxlYi/Aupaox3JjWFqXIjcaQa0LFjclQAOleT+FRA=";
  };
  src_fmt_dynolog = fetchFromGitHub {
    owner = "fmtlib";
@@ -250,8 +268,8 @@ assert version == "2.6.0";
  src_ideep = fetchFromGitHub {
    owner = "intel";
    repo = "ideep";
-    rev = "c7ccd5bdbe5434ba156f4e856dcef0601637334b";
-    hash = "sha256-/u3wJQl49tBw/QNVDBXL+eNSRCuvltso7g1+siIhlXM=";
+    rev = "719d8e6cd7f7a0e01b155657526d693acf97c2b3";
+    hash = "sha256-WX1lluqYeoB2IuwJX1vqZ6nr8W8KsWxUDIvKNA3CAxo=";
  };
  src_ittapi = fetchFromGitHub {
    owner = "intel";
@@ -280,8 +298,14 @@ assert version == "2.6.0";
  src_kineto = fetchFromGitHub {
    owner = "pytorch";
    repo = "kineto";
-    rev = "338140f58a28d599da3434ced4fd2d75dd1a213d";
-    hash = "sha256-ydHUYB2m7dbbqBtLordZUCraewU0Q4m/ohBXNKtqHnw=";
+    rev = "a054a4be0db117c579a21747debf19c863631f26";
+    hash = "sha256-FyxMiDoDrjI8JZZNxK4S18yjULkKLUvqLQsCyxaTLSg=";
+  };
+  src_kleidiai = fetchFromGitHub {
+    owner = "ARM-software";
+    repo = "kleidiai";
+    rev = "ef685a13cfbe8d418aa2ed34350e21e4938358b6";
+    hash = "sha256-5RS2o+163/6Q+0y0FuWz6OBXw3FKxZINDkGOqlmd2N0=";
  };
  src_libnop = fetchFromGitHub {
    owner = "google";
@@ -304,14 +328,8 @@ assert version == "2.6.0";
  src_mkl-dnn = fetchFromGitHub {
    owner = "intel";
    repo = "mkl-dnn";
-    rev = "66f0cb9eb66affd2da3bf5f8d897376f04aae6af";
-    hash = "sha256-/ERkk6bgGEKoJEVdnBxMFEzB8pii71t3zQZNtyg+TdQ=";
-  };
-  src_nccl = fetchFromGitHub {
-    owner = "NVIDIA";
-    repo = "nccl";
-    rev = "ab2b89c4c339bd7f816fbc114a4b05d386b66290";
-    hash = "sha256-IF2tILwW8XnzSmfn7N1CO7jXL95gUp02guIW5n1eaig=";
+    rev = "8d263e693366ef8db40acc569cc7d8edf644556d";
+    hash = "sha256-+4z5l0mJsw0SOW245GfZh41mdHGZ8u+xED7afm6pQjs=";
  };
  src_NNPACK = fetchFromGitHub {
    owner = "Maratyszcza";
@@ -386,10 +404,10 @@ assert version == "2.6.0";
    hash = "sha256-lV+VZi2b4SQlRYrhKx9Dxc6HlDEFz3newvcBjTekupo=";
  };
  src_pthreadpool = fetchFromGitHub {
-    owner = "google";
+    owner = "Maratyszcza";
    repo = "pthreadpool";
-    rev = "b92447772365661680f486e39a91dfe6675adafc";
-    hash = "sha256-lRY+5sYv/KOuVngsrODRa4/yj1CDmZBW2HuKEbjsY+0=";
+    rev = "4fe0e1e183925bf8cfa6aae24237e724a96479b8";
+    hash = "sha256-R4YmNzWEELSkAws/ejmNVxqXDTJwcqjLU/o/HvgRn2E=";
  };
  src_pybind11 = fetchFromGitHub {
    owner = "pybind";
@@ -412,14 +430,14 @@ assert version == "2.6.0";
  src_pytorch = fetchFromGitHub {
    owner = "pytorch";
    repo = "pytorch";
-    rev = "v2.6.0";
-    hash = "sha256-X58OPtnPplEFtzOrQzyYRwdTmaoWEOGWWF5v6y+vaWo=";
+    rev = "v2.7.0";
+    hash = "sha256-ReXyzy+OuYxEQwU+t2WL3+jqd7ItdW6w8MiS0f9t+aY=";
  };
  src_sleef = fetchFromGitHub {
    owner = "shibatch";
    repo = "sleef";
-    rev = "60e76d2bce17d278b439d9da17177c8f957a9e9b";
-    hash = "sha256-JfARLkdt4je8ll+oqPGJqzUCQbsXoJ0bbX3jf0aHd0o=";
+    rev = "56e1f79cb140fb9326d612d0be06b5250565cade";
+    hash = "sha256-5hha7c/Lu6fkbXGlDieoJP6n2bnjY5iPp+hm0f//0ek=";
  };
  src_tensorpipe = fetchFromGitHub {
    owner = "pytorch";
@@ -442,8 +460,8 @@ assert version == "2.6.0";
  src_XNNPACK = fetchFromGitHub {
    owner = "google";
    repo = "XNNPACK";
-    rev = "4ea82e595b36106653175dcb04b2aa532660d0d8";
-    hash = "sha256-5IubxhCW5E6xzrOLfJzWPrPeftaxXApTx09p6B3NPgo=";
+    rev = "51a0103656eff6fc9bfd39a4597923c4b542c883";
+    hash = "sha256-nhowllqv/hBs7xHdTwbWtiKJ1mvAYsVIyIZ35ZGsmkg=";
  };
  src_asmjit_recursive = src_asmjit;
  src_benchmark_recursive = src_benchmark;
@@ -452,6 +470,7 @@ assert version == "2.6.0";
  src_civetweb_recursive = src_civetweb;
  src_clang-cindex-python3_recursive = src_clang-cindex-python3;
  src_composable_kernel_recursive = src_composable_kernel;
+  src_composable_kernel_flash-attention_recursive = src_composable_kernel_flash-attention;
  src_cpp-httplib_recursive = src_cpp-httplib;
  src_cpr_recursive = src_cpr;
  src_cpuinfo_recursive = src_cpuinfo;
@@ -459,6 +478,7 @@ assert version == "2.6.0";
  src_cudnn-frontend_recursive = src_cudnn-frontend;
  src_cutlass_recursive = src_cutlass;
  src_cutlass_fbgemm_recursive = src_cutlass_fbgemm;
+  src_cutlass_flash-attention_recursive = src_cutlass_flash-attention;
  src_DCGM_recursive = src_DCGM;
  src_dynolog_recursive = runCommand "dynolog" { } ''
    cp -r ${src_dynolog} $out
@@ -494,6 +514,13 @@ assert version == "2.6.0";
    cp -r ${src_hipify_torch_recursive}/* $out/third_party/hipify_torch
  '';
  src_fbjni_recursive = src_fbjni;
+  src_flash-attention_recursive = runCommand "flash-attention" { } ''
+    cp -r ${src_flash-attention} $out
+    chmod u+w $out/csrc/composable_kernel
+    cp -r ${src_composable_kernel_flash-attention_recursive}/* $out/csrc/composable_kernel
+    chmod u+w $out/csrc/cutlass
+    cp -r ${src_cutlass_flash-attention_recursive}/* $out/csrc/cutlass
+  '';
  src_flatbuffers_recursive = src_flatbuffers;
  src_fmt_recursive = src_fmt;
  src_fmt_dynolog_recursive = src_fmt_dynolog;
@@ -537,11 +564,11 @@ assert version == "2.6.0";
    chmod u+w $out/libkineto/third_party/googletest
    cp -r ${src_googletest_kineto_recursive}/* $out/libkineto/third_party/googletest
  '';
+  src_kleidiai_recursive = src_kleidiai;
  src_libnop_recursive = src_libnop;
  src_libuv_recursive = src_libuv;
  src_mimalloc_recursive = src_mimalloc;
  src_mkl-dnn_recursive = src_mkl-dnn;
-  src_nccl_recursive = src_nccl;
  src_NNPACK_recursive = src_NNPACK;
  src_NVTX_recursive = src_NVTX;
  src_onnx_recursive = runCommand "onnx" { } ''
@@ -616,6 +643,8 @@ assert version == "2.6.0";
    cp -r ${src_eigen_recursive}/* $out/third_party/eigen
    chmod u+w $out/third_party/fbgemm
    cp -r ${src_fbgemm_recursive}/* $out/third_party/fbgemm
+    chmod u+w $out/third_party/flash-attention
+    cp -r ${src_flash-attention_recursive}/* $out/third_party/flash-attention
    chmod u+w $out/third_party/flatbuffers
    cp -r ${src_flatbuffers_recursive}/* $out/third_party/flatbuffers
    chmod u+w $out/third_party/fmt
@@ -636,10 +665,10 @@ assert version == "2.6.0";
    cp -r ${src_ittapi_recursive}/* $out/third_party/ittapi
    chmod u+w $out/third_party/kineto
    cp -r ${src_kineto_recursive}/* $out/third_party/kineto
+    chmod u+w $out/third_party/kleidiai
+    cp -r ${src_kleidiai_recursive}/* $out/third_party/kleidiai
    chmod u+w $out/third_party/mimalloc
    cp -r ${src_mimalloc_recursive}/* $out/third_party/mimalloc
-    chmod u+w $out/third_party/nccl/nccl
-    cp -r ${src_nccl_recursive}/* $out/third_party/nccl/nccl
    chmod u+w $out/third_party/nlohmann
    cp -r ${src_json_recursive}/* $out/third_party/nlohmann
    chmod u+w $out/third_party/NNPACK
@@ -1,21 +0,0 @@
-diff --git a/third_party/XNNPACK/src/reference/unary-elementwise.cc b/third_party/XNNPACK/src/reference/unary-elementwise.cc
-index bd95ded6c..da892d8be 100644
--- a/third_party/XNNPACK/src/reference/unary-elementwise.cc
-+++ b/third_party/XNNPACK/src/reference/unary-elementwise.cc
-@@ -127,6 +127,16 @@ struct ConvertOp {
-   }
- };
- 
-+#ifdef XNN_HAVE_FLOAT16
-+template <>
-+struct ConvertOp<xnn_bfloat16, _Float16> {
-+  explicit ConvertOp(const xnn_unary_uparams*) {}
-+  _Float16 operator()(xnn_bfloat16 x) const {
-+    return static_cast<_Float16>(static_cast<float>(x));
-+  }
-+};
-+#endif
-+
- template <typename TIn, typename TOut>
- const xnn_unary_elementwise_config* get_convert_config(
-     std::true_type /*input_quantized*/, std::true_type /*output_quantized*/) {
@@ -15,6 +15,7 @@
  pybind11,
  sox,
  torch,
+  llvmPackages,

  cudaSupport ? torch.cudaSupport,
  cudaPackages,
@@ -76,7 +77,7 @@ let
 in
 buildPythonPackage rec {
  pname = "torchaudio";
-  version = "2.6.0";
+  version = "2.7.0";
  pyproject = true;

  stdenv = torch.stdenv;
@@ -85,7 +86,7 @@ buildPythonPackage rec {
    owner = "pytorch";
    repo = "audio";
    tag = "v${version}";
-    hash = "sha256-WNdDBB2nShbPPW7GU5cMij00u5PUdN+j5pm41yrKnCA=";
+    hash = "sha256-/5XIVj0jLE7+A1LZxA3bFH3mdwNIcrV4XMOa4xznr/w=";
  };

  patches = [
@@ -133,7 +134,7 @@ buildPythonPackage rec {
    pybind11
    sox
    torch.cxxdev
-  ];
+  ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];

  dependencies = [ torch ];

@@ -161,6 +162,9 @@ buildPythonPackage rec {
    platforms =
      lib.platforms.linux
      ++ lib.optionals (!cudaSupport && !rocmSupport) lib.platforms.darwin;
-    maintainers = with lib.maintainers; [ junjihashimoto ];
+    maintainers = with lib.maintainers; [
+      GaetanLepage
+      junjihashimoto
+    ];
  };
 }
@@ -48,14 +48,14 @@

 buildPythonPackage rec {
  pname = "torchrl";
-  version = "0.8.0";
+  version = "0.8.1";
  pyproject = true;

  src = fetchFromGitHub {
    owner = "pytorch";
    repo = "rl";
    tag = "v${version}";
-    hash = "sha256-icT+QeA2FNhZjwD0ykui4aq5WswDv2i1QRh7dNlA4Cg=";
+    hash = "sha256-ANoqIAVKSq023hG83Q71t8oLzud1LeVN5WVPYL3nOks=";
  };

  build-system = [
@@ -29,7 +29,7 @@ let
  inherit (torch) cudaCapabilities cudaPackages cudaSupport;

  pname = "torchvision";
-  version = "0.21.0";
+  version = "0.22.0";
 in
 buildPythonPackage {
  inherit pname version;
@@ -40,7 +40,7 @@ buildPythonPackage {
    owner = "pytorch";
    repo = "vision";
    tag = "v${version}";
-    hash = "sha256-eDWw1Lt/sUc2Xt6cqOM5xaOfmsm+NEL5lZO+cIJKMtU=";
+    hash = "sha256-+70Rhfma4dM5tRlYNz0cuuTIxRbYf6dsnAhvkw7a5kM=";
  };

  nativeBuildInputs = [
@@ -71,15 +71,15 @@ buildPythonPackage {
    scipy
  ];

-  preConfigure =
-    ''
-      export TORCHVISION_INCLUDE="${libjpeg_turbo.dev}/include/"
-      export TORCHVISION_LIBRARY="${libjpeg_turbo}/lib/"
-    ''
-    + lib.optionalString cudaSupport ''
-      export TORCH_CUDA_ARCH_LIST="${lib.concatStringsSep ";" cudaCapabilities}"
-      export FORCE_CUDA=1
-    '';
+  env =
+    {
+      TORCHVISION_INCLUDE = "${libjpeg_turbo.dev}/include/";
+      TORCHVISION_LIBRARY = "${libjpeg_turbo}/lib/";
+    }
+    // lib.optionalAttrs cudaSupport {
+      TORCH_CUDA_ARCH_LIST = "${lib.concatStringsSep ";" cudaCapabilities}";
+      FORCE_CUDA = 1;
+    };

  # tests download big datasets, models, require internet connection, etc.
  doCheck = false;
@@ -101,6 +101,6 @@ buildPythonPackage {
    changelog = "https://github.com/pytorch/vision/releases/tag/v${version}";
    license = lib.licenses.bsd3;
    platforms = with lib.platforms; linux ++ lib.optionals (!cudaSupport) darwin;
-    maintainers = with lib.maintainers; [ ];
+    maintainers = with lib.maintainers; [ GaetanLepage ];
  };
 }
@@ -14,7 +14,6 @@ buildPythonPackage {
    version
    src
    cargoDeps
-    cargoBuildFlags
    ;

  nativeBuildInputs = [
@@ -1,9 +1,9 @@
 {
  buildPythonPackage,
  installShellFiles,
-  pkg-config,
  rustPlatform,
  pkgs,
+  versionCheckHook,
 }:

 buildPythonPackage {
@@ -12,7 +12,6 @@ buildPythonPackage {
    version
    src
    cargoDeps
-    dontUseCmakeConfigure
    meta
    cargoBuildFlags
    postInstall
@@ -25,13 +24,13 @@ buildPythonPackage {
  '';

  nativeBuildInputs = [
-    pkgs.cmake
    installShellFiles
-    pkg-config
    rustPlatform.cargoSetupHook
    rustPlatform.maturinBuildHook
  ];

+  nativeCheckInputs = [ versionCheckHook ];
+
  pyproject = true;
  pythonImportsCheck = [ "uv" ];
 }
@@ -57,17 +57,18 @@ stdenv.mkDerivation (
    gpuTargets' = lib.concatStringsSep ";" gpuTargets;
    compiler = "amdclang++";
    cFlags = "-O3 -DNDEBUG";
+    cxxFlags = "${cFlags} -Wno-c++11-narrowing";
    triton-llvm' = triton-llvm;
  in
  {
    pname = "aotriton";
-    version = "0.8.2b";
+    version = "0.9.2b";

    src = fetchFromGitHub {
      owner = "ROCm";
      repo = "aotriton";
      rev = "${finalAttrs.version}";
-      hash = "sha256-gSzGYWfyUNLyzqpu3BM8rjFFL7cRVZ+w9L5pnh9QGz4=";
+      hash = "sha256-1Cf0olD3zRg9JESD6s/WaGifm3kfD12VUvjTZHpmGAE=";
      fetchSubmodules = true;
    };
    env.CXX = compiler;
@@ -152,10 +153,13 @@ stdenv.mkDerivation (
      substituteInPlace third_party/triton/python/setup.py \
        --replace-fail "from distutils.command.clean import clean" "import setuptools;from distutils.command.clean import clean" \
        --replace-fail 'system == "Linux"' 'False'
+      # Fix 'ld: error: unable to insert .comment after .comment'
+      substituteInPlace v2python/ld_script.py \
+        --replace-fail 'INSERT AFTER .comment;' ""

      cmakeFlagsArray+=(
        '-DCMAKE_C_FLAGS_RELEASE=${cFlags}'
-        '-DCMAKE_CXX_FLAGS_RELEASE=${cFlags}'
+        '-DCMAKE_CXX_FLAGS_RELEASE=${cxxFlags}'
      )
      prependToVar cmakeFlags "-GNinja"
      mkdir -p /build/tmp-home
@@ -4,12 +4,12 @@
        "hash": "sha256:1l18hsnzh28m2f34rsvq4khwblzl60qc61qs6ic13jbd8jsnhsi9"
    },
    "6.1": {
-        "version": "6.1.138",
-        "hash": "sha256:04br4ln81skk4lgrgxqhpn2qjvkifi4bm360rfw9zfj9j2xsa6g3"
+        "version": "6.1.139",
+        "hash": "sha256:064zzk7kwkq7i5160s0alzkz16pp89wcq07s9jhzhv4bxvgzyspn"
    },
    "5.15": {
-        "version": "5.15.182",
-        "hash": "sha256:07m3yrkqpmh4cmsmhz8i6da0h7xlprc7r4hb0xcy812s659zmaxn"
+        "version": "5.15.183",
+        "hash": "sha256:1s4fqm83api3xk0b443b4bhgrx7bx6n8bchdpmzahqadk9i7yvyh"
    },
    "5.10": {
        "version": "5.10.237",
@@ -20,19 +20,19 @@
        "hash": "sha256:0b9p8l6ndm75751f7s03rnxg7yg9c4pj9rb537lhsv6pqx096n1l"
    },
    "6.6": {
-        "version": "6.6.90",
-        "hash": "sha256:0kh1ax0j0vl0n267cpij5lf170ab1fg0j6gjzvzc2a8ncx46g1gz"
+        "version": "6.6.91",
+        "hash": "sha256:1x2lwaaqzlgszk41cy6k5j9dcbxxkca5xjaznb82r987ahbkv3fh"
    },
    "6.12": {
-        "version": "6.12.28",
-        "hash": "sha256:07kpsl6lbsr0zw6p8bglgbchdrv1jivcwwnyh7vwzbk24lc9k878"
+        "version": "6.12.29",
+        "hash": "sha256:0k86nmmpg0jsx11w34vlj20cxpxavip4y5g7dp4bkk1q4dzfrcp8"
    },
    "6.13": {
        "version": "6.13.12",
        "hash": "sha256:0hhj49k3ksjcp0dg5yiahqzryjfdpr9c1a9ph6j9slzmkikbn7v1"
    },
    "6.14": {
-        "version": "6.14.6",
-        "hash": "sha256:1acpjxscw5nvgp19jzd29zhl1c6wdzx0bxp4yy0hy8z2k0cpz091"
+        "version": "6.14.7",
+        "hash": "sha256:0wj9yl0ymzjx3ig0l3wdl5dqqiylvjk0j8adm5bnj23dq8mj04l1"
    }
 }
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
  owner = "hg1337";
  domain = "dwd";
-  version = "2024.11.0";
+  version = "2025.5.0";

  src = fetchFromGitHub {
    owner = "hg1337";
    repo = "homeassistant-dwd";
    rev = version;
-    hash = "sha256-v5xSIUW8EMTdLY66yZ31cR/1DWVvn85CfIl/Y4xpXiw=";
+    hash = "sha256-CuoHVgk4jWDEe3OkzFCok8YqVkWLJF6Rl7i/SDeSU50=";
  };

  dependencies = [ defusedxml ];
@@ -9,13 +9,13 @@
 buildHomeAssistantComponent rec {
  owner = "hultenvp";
  domain = "solis";
-  version = "3.9.2";
+  version = "3.11.0";

  src = fetchFromGitHub {
    owner = "hultenvp";
    repo = "solis-sensor";
    rev = "v${version}";
-    hash = "sha256-BtR5Obtme0s9kIsEHZ8txTy4LF4XJ4WLXl1/or3S8Vo=";
+    hash = "sha256-PZoqS/klq58opqXofgYy7HsCQu/g4Nj60U09JSXTtMY=";
  };

  dependencies = [ aiofiles ];
@@ -432,6 +432,7 @@ mapAliases {
  citra = throw "citra has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04
  citra-nightly = throw "citra-nightly has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04
  citra-canary = throw "citra-canary has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04
+  clean = throw "'clean' has been removed from nixpkgs, as it is unmaintained and broken"; # Added 2025-05-18
  cloog = throw "cloog has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
  cloog_0_18_0 = throw "cloog_0_18_0 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
  cloogppl = throw "cloogppl has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
@@ -1135,6 +1136,7 @@ mapAliases {
  lxd-unwrapped = lib.warnOnInstantiate "lxd-unwrapped has been renamed to lxd-unwrapped-lts" lxd-unwrapped-lts; # Added 2024-04-01
  lzma = throw "'lzma' has been renamed to/replaced by 'xz'"; # Converted to throw 2024-10-17
  lzwolf = throw "'lzwolf' has been removed because it's no longer maintained upstream. Consider using 'ecwolf'"; # Added 2025-03-02
+
  ### M ###

  ma1sd = throw "ma1sd was dropped as it is unmaintained"; # Added 2024-07-10
@@ -1148,6 +1150,7 @@ mapAliases {
  maligned = throw "maligned was deprecated upstream in favor of x/tools/go/analysis/passes/fieldalignment"; # Added 20204-08-24
  manicode = throw "manicode has been renamed to codebuff"; # Added 2024-12-10
  manta = throw "manta does not support python3, and development has been abandoned upstream"; # Added 2025-03-17
+  manticore = throw "manticore is no longer maintained since 2020, and doesn't build since smlnj-110.99.7.1"; # Added 2025-05-17

  maple-mono-NF = throw ''
    maple-mono-NF had been moved to maple-mono.NF.
@@ -1544,6 +1547,7 @@ mapAliases {

  PlistCpp = plistcpp; # Added 2024-01-05
  pocket-updater-utility = pupdate; # Added 2024-01-25
+  polipo = throw "'polipo' has been removed as it is unmaintained upstream"; # Added 2025-05-18
  poppler_utils = poppler-utils; # Added 2025-02-27
  powerline-rs = throw "'powerline-rs' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
  premake3 = throw "'premake3' has been removed since it is unmaintained. Consider using 'premake' instead"; # Added 2025-05-10
@@ -1794,6 +1798,7 @@ mapAliases {
  sync = taler-sync; # Added 2024-09-04
  syncthing-cli = throw "'syncthing-cli' has been renamed to/replaced by 'syncthing'"; # Converted to throw 2024-10-17
  syncthingtray-qt6 = syncthingtray; # Added 2024-03-06
+  syncthing-tray = throw "syncthing-tray has been removed because it is broken and unmaintained";

  ### T ###

@@ -9333,6 +9333,7 @@ with pkgs;

  inherit
    ({
+      protobuf_31 = callPackage ../development/libraries/protobuf/31.nix { };
      protobuf_30 = callPackage ../development/libraries/protobuf/30.nix { };
      protobuf_29 = callPackage ../development/libraries/protobuf/29.nix { };
      protobuf_28 = callPackage ../development/libraries/protobuf/28.nix { };
@@ -9344,6 +9345,7 @@ with pkgs;
        abseil-cpp = abseil-cpp_202103;
      };
    })
+    protobuf_31
    protobuf_30
    protobuf_29
    protobuf_28
@@ -13199,7 +13201,9 @@ with pkgs;

  luddite = with python3Packages; toPythonApplication luddite;

-  lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris { };
+  lutris-unwrapped = python3.pkgs.callPackage ../applications/misc/lutris {
+    inherit (pkgs) meson;
+  };
  lutris = callPackage ../applications/misc/lutris/fhsenv.nix { };
  lutris-free = lutris.override {
    steamSupport = false;
@@ -15228,10 +15232,6 @@ with pkgs;
    buildShareware = true;
  };

-  starsector = callPackage ../games/starsector {
-    openjdk = openjdk17;
-  };
-
  scummvm = callPackage ../games/scummvm { };

  inherit (callPackage ../games/scummvm/games.nix { })