Merge staging-next into staging

maintainers/maintainer-list.nix

@@ -2461,6 +2461,12 @@
     name = "Mariia Holovata";
     keys = [ { fingerprint = "409D 201E 9450 8732 A49E  D0FC 6BDA F874 0068 08DF"; } ];
   };
+  asimpson = {
+    email = "adam@adamsimpson.net";
+    github = "asimpson";
+    githubId = 1048831;
+    name = "Adam Simpson";
+  };
   asininemonkey = {
     email = "nixpkgs@asininemonkey.com";
     github = "asininemonkey";

nixos/modules/services/networking/kea.nix

@@ -393,7 +393,7 @@ in
                 [
                   (lib.getExe' cfg.package "kea-dhcp4")
                   "-c"
-                  "etc/kea/dhcp4-server.conf"
+                  "/etc/kea/dhcp4-server.conf"
                 ]
                 ++ cfg.dhcp4.extraArgs
               );

pkgs/applications/emulators/libretro/cores/beetle-saturn.nix

@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-saturn";
-  version = "0-unstable-2026-04-20";
+  version = "0-unstable-2026-05-17";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-saturn-libretro";
-    rev = "02503506566bed8f0d68c9267a1c6c57400870f2";
-    hash = "sha256-mssOkL2y7NRaoKXwIbllP0GUnrAR5/zHIAs4x9Q7UnM=";
+    rev = "c64a467e334cde47d74df6456748deb783522752";
+    hash = "sha256-np+zzuMDtanmlUVlDoS0D4Fm+2uuXo08qar/aoXwmUI=";
   };
 
   makefile = "Makefile";

pkgs/applications/emulators/libretro/cores/ppsspp.nix

@@ -13,13 +13,13 @@
 }:
 mkLibretroCore {
   core = "ppsspp";
-  version = "0-unstable-2026-04-28";
+  version = "0-unstable-2026-05-17";
 
   src = fetchFromGitHub {
     owner = "hrydgard";
     repo = "ppsspp";
-    rev = "dbb34075bc5c72c18291547ff63d7b001ebb29ab";
-    hash = "sha256-YOOpjLUevYsQ2yWWuwqjPjaWXx2BAq7ZubbAZBtclbM=";
+    rev = "4fb74aa5a90c8eaededa5ad6883683e6a4271ef0";
+    hash = "sha256-5xgLQQye9LTQq1QLSphbmNb5vzG6m3MvUslHdeSHpZE=";
     fetchSubmodules = true;
   };
 

pkgs/applications/networking/cluster/terraform-providers/providers.json

@@ -155,11 +155,11 @@
     "vendorHash": "sha256-SO3CX7pZ+q7ytz/55cxTPlW7ByY1zKhxkQxMiqAvm8o="
   },
   "checkly_checkly": {
-    "hash": "sha256-S83+rMPCN3Bt5kftmViYS2yUTsZsFtdiAE14WrBu+XA=",
+    "hash": "sha256-v9px/k2b6zUza8ZvoOfxQLNyofcIKOLYVmGAmkyA3TQ=",
     "homepage": "https://registry.terraform.io/providers/checkly/checkly",
     "owner": "checkly",
     "repo": "terraform-provider-checkly",
-    "rev": "v1.22.0",
+    "rev": "v1.23.0",
     "spdx": null,
     "vendorHash": "sha256-fY1oLzNYYNmUvOVNCWZlo2pvn2SgGjc4JnMORZdt/ss="
   },
@@ -616,13 +616,13 @@
     "vendorHash": "sha256-TvtStKCI11frbi1C1d4/f60XXJPUQBzSJIAkjN6LfBQ="
   },
   "hashicorp_local": {
-    "hash": "sha256-VYzy+/BniYU++pw9koLWotEJzsIzOjpLX4aRSRupV58=",
+    "hash": "sha256-qntV0gfxEVV24gqiVOvUai+pai4vvU+KtLmLBqOBQbY=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/local",
     "owner": "hashicorp",
     "repo": "terraform-provider-local",
-    "rev": "v2.8.0",
+    "rev": "v2.9.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-3qnfKHionSfT2efCl0TcHWFFgrh1bPE6Maqg4MCRq0g="
+    "vendorHash": "sha256-qvJSzqGUHw1/Lu4XO7LWssA+TN8pCyTbzh6t1bz+y1g="
   },
   "hashicorp_nomad": {
     "hash": "sha256-O3dtOB+irsUeDq1yXxfqDSyz2jfPXS1UgiL+B4RFsW4=",

pkgs/applications/science/electronics/degate/default.nix

@@ -34,6 +34,13 @@ stdenv.mkDerivation rec {
       includes = [ "tests/catch2/catch.hpp" ];
       hash = "sha256-SbSA813QI8RRVy1lvAOGMGAC2KUQKjwYR2imqX40pvU=";
     })
+
+    (fetchpatch {
+      name = "memorymap-macos.patch";
+      url = "https://github.com/DegateCommunity/Degate/commit/04685b088f485b3b73c55b7bfb989d2f0c88e4ca.patch";
+      includes = [ "src/Core/Utils/MemoryMap.h" ];
+      hash = "sha256-5UfVLc4OoMBaDa0qwOCRpd+dOtdDh4kxHNVfTA50lPg=";
+    })
   ];
 
   postPatch = ''

pkgs/by-name/ca/cato-client/package.nix

@@ -9,11 +9,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "cato-client";
-  version = "5.5.0.2620";
+  version = "5.7.0.5525";
 
   src = fetchurl {
     url = "https://clients.catonetworks.com/linux/${version}/cato-client-install.deb";
-    sha256 = "sha256-V1BhgLOHP/pGlwvjVFdNslKupjHBVSTDVIRtZ6amwbk=";
+    sha256 = "sha256-UDIDddVk7UXiOoZGTz1757x66DmOSOGqMielSQ5W5z0=";
   };
 
   passthru.updateScript = writeScript "update-cato-client" ''

pkgs/by-name/fl/flare/engine.nix

@@ -12,24 +12,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flare-engine";
-  version = "1.14";
+  version = "1.15";
 
   src = fetchFromGitHub {
     owner = "flareteam";
     repo = "flare-engine";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DIzfTqwZJ8NAPB/TWzvPjepHb7hIbIr+Kk+doXJmpLc=";
+    hash = "sha256-QwrSMkJE8dNIODlmdi1c6qgTULhJP9HEV8wI7k5vHAA=";
   };
 
   patches = [
     ./desktop.patch
-
-    # cmake-4 compatibility patch
-    (fetchpatch {
-      name = "cmake-4.patch";
-      url = "https://github.com/flareteam/flare-engine/commit/9500379f886484382bba2f893faf49865de9f2c0.patch";
-      hash = "sha256-nUn54ZBEvvFkIhzE/UBbsvF0rFC9JAeQACTAPtsc1VI=";
-    })
   ];
 
   nativeBuildInputs = [ cmake ];

pkgs/by-name/fl/flare/game.nix

@@ -8,23 +8,16 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flare-game";
-  version = "1.14";
+  version = "1.15";
 
   src = fetchFromGitHub {
     owner = "flareteam";
     repo = "flare-game";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tINIwxyQn8eeJCHwRmAMo2TYRgrgJlGaUrnrgbmM3Jo=";
+    hash = "sha256-IsVfP8wmrublAqoVix7gOA4u8CRmXdyNzagnaXyFsxc=";
   };
 
-  patches = [
-    # cmake-4 compatibility patch
-    (fetchpatch {
-      name = "cmake-4.patch";
-      url = "https://github.com/flareteam/flare-game/commit/5b61dfd69f4ecbaca6439caa9ae41b3168e4d21a.patch";
-      hash = "sha256-5Um6LWAWQyialzO3KSebmLju0VOuz1S5dzavO9EWlLE=";
-    })
-  ];
+  patches = [ ];
 
   nativeBuildInputs = [ cmake ];
 

pkgs/by-name/fl/flare/package.nix

@@ -7,7 +7,7 @@
 
 buildEnv {
   pname = "flare";
-  version = "1.14";
+  version = "1.15";
 
   paths = [
     (callPackage ./engine.nix { })

pkgs/by-name/fl/flint/checkPhase.patch

@@ -1,26 +0,0 @@
-https://github.com/flintlib/flint/pull/2411
-
-From 9957b17e6b08bd57790f7da1344b4d92eefc0b38 Mon Sep 17 00:00:00 2001
-From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
-Date: Sun, 21 Sep 2025 15:58:57 -0400
-Subject: [PATCH] Fix duplicate symbols linker error
-
-When I run `make check` I get linker errors without
-this patch
----
- src/double_interval.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/double_interval.h b/src/double_interval.h
-index a423257db2..5f685c283f 100644
---- a/src/double_interval.h
-+++ b/src/double_interval.h
-@@ -13,7 +13,7 @@
- #define DOUBLE_INTERVAL_H
- 
- #ifdef DOUBLE_INTERVAL_INLINES_C
--#define DOUBLE_INTERVAL_INLINE
-+#define DOUBLE_INTERVAL_INLINE static
- #else
- #define DOUBLE_INTERVAL_INLINE static inline
- #endif

pkgs/by-name/fl/flint/package.nix

@@ -25,20 +25,13 @@ assert
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flint";
-  version = "3.4.0";
+  version = "3.5.0";
 
   src = fetchurl {
     url = "https://flintlib.org/download/flint-${finalAttrs.version}.tar.gz";
-    hash = "sha256-lJdnmATerZJuOv/rjUxYc50cdoTWDCwSgnVQ0o5FSjM=";
+    hash = "sha256-OYLzhfAGEKlE4BUusKKYk7I2b6ZA6PXzB2xHVkz34qY=";
   };
 
-  patches = [
-    # Remove once/if https://github.com/flintlib/flint/pull/2411 is merged
-    # Required or else during the check phase the build fails while
-    # linking a test due to duplicate symbol errors
-    ./checkPhase.patch
-  ];
-
   strictDeps = true;
   nativeBuildInputs = [
     autoconf

pkgs/by-name/fl/fluent-bit/package.nix

@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fluent-bit";
-  version = "5.0.3";
+  version = "5.0.5";
 
   src = fetchFromGitHub {
     owner = "fluent";
     repo = "fluent-bit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EMzTOOhtOs2/TzfKVt0aBc2rKIgKLV0+S9R1uEFSjVo=";
+    hash = "sha256-IPTM0jtlu3DZJRXCD0IE13ASGbJsDygPEuDXsiQP7Ts=";
   };
 
   # The source build documentation covers some dependencies and CMake options.

pkgs/by-name/gc/gcx/package.nix

@@ -0,0 +1,55 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  installShellFiles,
+  stdenv,
+  versionCheckHook,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "gcx";
+  version = "0.2.7";
+
+  src = fetchFromGitHub {
+    owner = "grafana";
+    repo = "gcx";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-M4qZghOhEq8WgGeJkTB1Ff+RBs2KD8ZLr/zVpX0CB28=";
+  };
+
+  vendorHash = "sha256-fgPyTVN7acPiRls038sINZwiEBs5dZXGXtB+c6CUUVw=";
+
+  subPackages = [ "cmd/gcx" ];
+
+  ldflags = [
+    "-w"
+    "-X=main.version=${finalAttrs.version}"
+    "-X=main.commit=${finalAttrs.src.rev}"
+    "-X=main.date=1970-01-01T00:00:00Z"
+  ];
+
+  __structuredAttrs = true;
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd gcx \
+      --bash <($out/bin/gcx completion bash) \
+      --fish <($out/bin/gcx completion fish) \
+      --zsh <($out/bin/gcx completion zsh)
+  '';
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  meta = {
+    description = "Grafana Cloud CLI";
+    homepage = "https://github.com/grafana/gcx";
+    changelog = "https://github.com/grafana/gcx/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.asl20;
+    mainProgram = "gcx";
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ asimpson ];
+  };
+})

pkgs/by-name/gs/gsd/package.nix

@@ -0,0 +1,83 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  fetchNpmDeps,
+  nodejs_22,
+  makeWrapper,
+  fd,
+  ripgrep,
+  gh,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "gsd";
+  version = "3.0.0";
+
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "gsd-build";
+    repo = "gsd-2";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-IXdsW7rUE6TIaIVqLSzVDwYZE+plvRwCXfepoMj/wQQ=";
+  };
+
+  npmDepsHash = "sha256-qOrMx2yBywxjavt7g5253mcWmYhTO6bbS6eecn04Kew=";
+
+  webNpmDeps = fetchNpmDeps {
+    name = "${finalAttrs.pname}-web-${finalAttrs.version}-npm-deps";
+    inherit (finalAttrs) src;
+    sourceRoot = "${finalAttrs.src.name}/web";
+    hash = "sha256-K6WndhLeST6jDgCetvUDeiJVkdPDzg6gz7pJjBqSi34=";
+  };
+
+  nodejs = nodejs_22;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  env.PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1";
+
+  # buildNpmPackage's hooks read these as plain env vars; under
+  # __structuredAttrs they are bash variables that need to be exported.
+  prePatch = ''
+    export npmDeps webNpmDeps
+  '';
+
+  postPatch = ''
+    # The npm "files" array omits "extensions/" so workspace symlinks under
+    # node_modules/@gsd-extensions/* end up dangling after `npm pack`. Include
+    # the extensions sources so they ship with the package.
+    substituteInPlace package.json \
+      --replace-fail '"packages",' '"packages",
+        "extensions",'
+  '';
+
+  preBuild = ''
+    pushd web
+    makeCacheWritable=1 npmDeps="$webNpmDeps" npmConfigHook
+    popd
+  '';
+
+  postFixup =
+    let
+      binPath = lib.makeBinPath [
+        fd
+        ripgrep
+        gh
+      ];
+    in
+    ''
+      for bin in gsd gsd-cli; do
+        wrapProgram $out/bin/$bin --prefix PATH : ${binPath}
+      done
+    '';
+
+  meta = {
+    description = "Meta-prompting and spec-driven development system for autonomous coding agents";
+    homepage = "https://github.com/gsd-build/gsd-2";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ otavio ];
+    mainProgram = "gsd";
+  };
+})

pkgs/by-name/ha/hap-py/package.nix

@@ -67,6 +67,11 @@ stdenv.mkDerivation (finalAttrs: {
 
     # Insert missing include for uint64_t
     sed -i '/#include <vector>/a #include <cstdint>' src/c++/include/helpers/Roc.hh
+
+    # pipes module was removed in Python 3.13; shlex.quote is the replacement
+    find src/python -name "*.py" -exec sed -i \
+      -e 's/import pipes/import shlex/' \
+      -e 's/pipes\.quote/shlex.quote/g' {} \;
   '';
 
   patches = [

pkgs/by-name/ha/haproxy/package.nix

@@ -33,11 +33,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "haproxy";
-  version = "3.3.8";
+  version = "3.3.9";
 
   src = fetchurl {
     url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
-    hash = "sha256-ibH+c9VNWZD3SZfag39f0NoWJ6G6pism9dNYpvPEgpU=";
+    hash = "sha256-8x6OaNsHfMCVb07T/3oexjeqXjSMbRxc0hY+ev6xueY=";
   };
 
   buildInputs = [

pkgs/by-name/hd/hdf4/package.nix

@@ -79,6 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   postInstall = ''
+    moveToOutput lib/libhdf4.settings "$dev"
     moveToOutput bin "$bin"
   '';
 

pkgs/by-name/le/lean4/package.nix

@@ -6,6 +6,7 @@
   git,
   gmp,
   cadical,
+  makeWrapper,
   pkg-config,
   libuv,
   enableMimalloc ? true,
@@ -13,6 +14,9 @@
   testers,
 }:
 
+let
+  cadical' = cadical.override { version = "2.1.3"; };
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "lean4";
   version = "4.29.1";
@@ -61,14 +65,20 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
+    makeWrapper
   ];
 
   buildInputs = [
     gmp
     libuv
-    cadical
+    cadical'
   ];
 
+  postInstall = ''
+    wrapProgram $out/bin/lean \
+      --prefix PATH : ${cadical'}/bin
+  '';
+
   nativeCheckInputs = [
     git
     perl

pkgs/by-name/ne/netbird/package.nix

@@ -67,13 +67,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "netbird-${componentName}";
-  version = "0.71.1";
+  version = "0.71.2";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "netbird";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xU2P4COLufGdFrit8+IRn96FT1IJKGQ97R9eGv5cjqU=";
+    hash = "sha256-rmm9NdWNjcEmUp84lad709EoVCZz19/5/N5ssflWzt4=";
   };
 
   vendorHash = "sha256-NeZuj9o2yu5di+6jbNqCnAw0fI55GA5Otmr77c08QFc=";

pkgs/by-name/nw/nwg-look/package.nix

@@ -14,16 +14,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "nwg-look";
-  version = "1.0.6";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "nwg-piotr";
     repo = "nwg-look";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-cNVUgtbdzEuttDO7DZyipDugACr/fIU8RKmh5trykPw=";
+    hash = "sha256-YAFZZIUd/nvDwa3dXBoBL+dmPOVgJKv/taOjLMP4owI=";
   };
 
-  vendorHash = "sha256-8ooWJTOC4fmuu+/Dy7JOaGSO5YlsMfKcf2lyv2ojJIw=";
+  vendorHash = "sha256-9jyR7RLpqdDvwgqlrvToKQlClRbk9ELxapbgb/OUB4I=";
 
   ldflags = [
     "-s"

pkgs/by-name/nw/nwipe/package.nix

@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nwipe";
-  version = "0.40";
+  version = "0.41";
 
   src = fetchFromGitHub {
     owner = "martijnvanbrummelen";
     repo = "nwipe";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-Gx7i8jxnQm+5G65JFdZ7R54ulSrBq12MIrfFGJb2tW4=";
+    sha256 = "sha256-qVO2K9Ub0AxGK89Zxhg8g7VUdWBlNWMgmdUu1Tb9nRQ=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/oe/oelint-adv/package.nix

@@ -7,18 +7,18 @@
 
 python3Packages.buildPythonApplication (finalAttrs: {
   pname = "oelint-adv";
-  version = "8.2.2";
+  version = "9.7.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "priv-kweihmann";
     repo = "oelint-adv";
     tag = finalAttrs.version;
-    hash = "sha256-W8W+hNgRVxBVkEDyKtFVx2mCyvbMA4CPjR1NrehClJs=";
+    hash = "sha256-44ebctMX7QfF459RvjJM4oz+ByBF3cz4e+02GnY9h1s=";
   };
 
   postPatch = ''
-    substituteInPlace setup.cfg \
+    substituteInPlace pyproject.toml \
       --replace-fail "--random-order-bucket=global" "" \
       --replace-fail "--random-order"               "" \
       --replace-fail "--force-sugar"                "" \

pkgs/by-name/of/officecli/package.nix

@@ -8,7 +8,7 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "officecli";
-  version = "1.0.92";
+  version = "1.0.93";
 
   strictDeps = true;
   __structuredAttrs = true;
@@ -17,7 +17,7 @@ buildDotnetModule (finalAttrs: {
     owner = "iOfficeAI";
     repo = "OfficeCLI";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-g4eCgVqlW3N+pwATIsZbmjWNQ4IScUv9e40eUH9rfQw=";
+    hash = "sha256-FCBq3Ua3mSvkIqmtwSi+j5Z76Pe/uGDUVVbDOMC/DaA=";
   };
 
   projectFile = "src/officecli/officecli.csproj";

pkgs/by-name/re/reaper/package.nix

@@ -40,17 +40,17 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "reaper";
-  version = "7.71";
+  version = "7.73";
 
   src = fetchurl {
     url = url_for_platform finalAttrs.version stdenv.hostPlatform.qemuArch;
     hash =
       if stdenv.hostPlatform.isDarwin then
-        "sha256-78TB6NNr9KemIra8w/87suP9RrlWhrCAW6d5sTrEL4E="
+        "sha256-iEslm5gmkkCwCfwilgXgRrwpj6D6lNypDZnNIv1ZPKw="
       else
         {
-          x86_64-linux = "sha256-OozJHud6PMOkFU2wMmdOYS0PKfyaAV+HHhROJfSr0GM=";
-          aarch64-linux = "sha256-59Divnr+4NVml9sYlFSlL7FLk1uHRVirAThODLbeAjk=";
+          x86_64-linux = "sha256-tXyflaxx00SCqjo7xZFOigMwAc0i/i3Jakwr6BuasbQ=";
+          aarch64-linux = "sha256-+fbpuu0iAqEnchKwkct/FmooE0cpBUkSUyI3HCT+Nwg=";
         }
         .${stdenv.hostPlatform.system};
   };

pkgs/by-name/rt/rtg-tools/package.nix

@@ -50,7 +50,9 @@ stdenv.mkDerivation (finalAttrs: {
        --replace-fail 'RTG_JAVA="java"' 'RTG_JAVA="${lib.getExe jdk}"' \
       --replace-fail uname ${lib.getExe' coreutils "uname"} \
       --replace-fail awk ${lib.getExe gawk} \
-      --replace-fail "hostname -s" "${lib.getExe hostname} -s"
+      --replace-fail "hostname -s" "${lib.getExe hostname} -s" \
+      --replace-fail dirname ${lib.getExe' coreutils "dirname"} \
+      --replace-fail readlink ${lib.getExe' coreutils "readlink"}
 
     sed -i '/USER_JAVA_OPTS=$RTG_JAVA_OPTS/a mkdir -p $HOME/.config/rtg-tools'  installer/rtg
   '';

pkgs/by-name/sa/sage/sage-src.nix

@@ -131,6 +131,13 @@ stdenv.mkDerivation rec {
       url = "https://github.com/sagemath/sage/commit/ff58afe27c80c067a8965e1d70966e25d0355aaf.patch?full_index=1";
       hash = "sha256-gWoXwhUVXL2RSVLPRbxtlP0LCSEkJ9z1PJ1wKLXef1k=";
     })
+
+    # https://github.com/sagemath/sage/pull/42089, landed in 10.10.beta0
+    (fetchpatch2 {
+      name = "flint-3.5.0-update.patch";
+      url = "https://github.com/sagemath/sage/commit/f1cf1552c2c7636fa069fbc47c5bfc937753f7b2.patch?full_index=1";
+      hash = "sha256-Z3SU6cSCnnaTZLcTh0LNb672HyBqhBd6+iYUEeK1cGQ=";
+    })
   ];
 
   patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;

pkgs/by-name/sd/SDL_image/package.nix

@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "SDL_image";
-  version = "1.2.12-unstable-2026-04-29";
+  version = "1.2.12-unstable-2026-05-13";
 
   src = fetchFromGitHub {
     owner = "libsdl-org";
     repo = "SDL_image";
-    rev = "5e690c3ff429025386837c4ff38e1761cd5e1d72";
-    hash = "sha256-BZz35PPW3UXfSyQEbYzpLD2HIZ+hCmDNVvvRypmecQY=";
+    rev = "822207ee09095b8f0a936f6f2d62e020f92a4c24";
+    hash = "sha256-a4WmLjsVC409UTbTVtMmRXaYuNN3fVwzz8F4XMV/cNI=";
   };
 
   configureFlags = [

pkgs/by-name/sd/sddm-astronaut/package.nix

@@ -15,13 +15,13 @@ let
 in
 stdenvNoCC.mkDerivation {
   pname = "sddm-astronaut";
-  version = "0-unstable-2025-12-06";
+  version = "0-unstable-2026-05-12";
 
   src = fetchFromGitHub {
     owner = "Keyitdev";
     repo = "sddm-astronaut-theme";
-    rev = "d73842c761f7d7859f3bdd80e4360f09180fad41";
-    hash = "sha256-+94WVxOWfVhIEiVNWwnNBRmN+d1kbZCIF10Gjorea9M=";
+    rev = "8c85b9c8d00ce70e39320f77071dca2040544f19";
+    hash = "sha256-+Z1igZ4BxRqXr/lxfHEr3I4n/sX8+AIwUr6JFO9yoWs=";
   };
 
   dontWrapQtApps = true;

pkgs/by-name/sl/slidev-cli/package.nix

@@ -13,13 +13,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "slidev-cli";
-  version = "52.15.1";
+  version = "52.15.2";
 
   src = fetchFromGitHub {
     owner = "slidevjs";
     repo = "slidev";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2SksaDC/OC53ZGyraS/WzySSbPEnlzdURGInZ2neQwU=";
+    hash = "sha256-h9gVfGMLTm8NDSAR/OKl5XJRBduAPHQ9mp+jtNYtxFI=";
   };
 
   pnpmWorkspaces = [ "@slidev/cli..." ];

pkgs/by-name/sn/snac2/package.nix

@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "snac2";
-  version = "2.91";
+  version = "2.92";
 
   src = fetchFromCodeberg {
     owner = "grunfink";
     repo = "snac2";
     tag = finalAttrs.version;
-    hash = "sha256-v7MKrGEvb4EyyEkRu7wd/uh4IJgfF0Uk6l0kS93NyHM=";
+    hash = "sha256-psZtNrw6EjN52Hpl3aePnPQ2F/WoPEc5JQbqFknUeQk=";
   };
 
   buildInputs = [

pkgs/by-name/su/surelog/package.nix

@@ -43,12 +43,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     libuuid
-    gperftools
     uhdm
     capnproto
     antlr4.runtime.cpp
     nlohmann_json
-  ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ gperftools ];
 
   cmakeFlags = [
     "-DSURELOG_USE_HOST_CAPNP=On"
@@ -57,7 +57,8 @@ stdenv.mkDerivation (finalAttrs: {
     "-DSURELOG_USE_HOST_ANTLR=On"
     "-DSURELOG_USE_HOST_JSON=On"
     "-DANTLR_JAR_LOCATION=${antlr4.jarLocation}"
-  ];
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DSURELOG_WITH_TCMALLOC=Off" ];
 
   doCheck = true;
   checkPhase = ''

pkgs/by-name/un/uncrustify/package.nix

@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "uncrustify";
-  version = "0.82.0";
+  version = "0.83.0";
 
   src = fetchFromGitHub {
     owner = "uncrustify";
     repo = "uncrustify";
     rev = "uncrustify-${finalAttrs.version}";
-    sha256 = "sha256-sBIjBN3tP/gwTWHDLwonEIfk3OduqQtixn4sn28V7pI=";
+    sha256 = "sha256-EcT9A9rQCfSqJqqhfdSIZP/29W+I+PHbfvqQ4Bsq5mE=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/wo/worktrunk/package.nix

@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "worktrunk";
-  version = "0.37.0";
+  version = "0.50.0";
 
   src = fetchFromGitHub {
     owner = "max-sixty";
     repo = "worktrunk";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-z+Wb0xgu15cSSYB3hPhp6qVwUUXmLJcP788LiQLowqs=";
+    hash = "sha256-ZCcrTXVVbB61r2tMTFwN3x5+C1i6T/wn28dviGr5rtM=";
   };
 
-  cargoHash = "sha256-nBbLlM4Y5IOSeGrgiu7Bm9PcTSarXiqFbC2RnTrhWeE=";
+  cargoHash = "sha256-GTWoOaDjXS1Lu2JuWw1A/RYbPreivLYuhHhoWj4bFHM=";
 
   cargoBuildFlags = [ "--package=worktrunk" ];
 
@@ -45,10 +45,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
   nativeCheckInputs = [ gitMinimal ];
 
   checkFlags = [
-    # Expects to run inside a git repository
-    "--skip=git::recover::tests::test_current_or_recover_returns_repo_when_cwd_exists"
-    # Insta snapshot mismatch across git versions
-    "--skip=git::recover::tests::test_hint_for_repo_suggests_switch"
     # Expects `which` on PATH
     "--skip=output::commit_generation::tests::test_command_exists_known_command"
     # Integration tests use insta snapshots with environment-specific paths

pkgs/by-name/xp/xprin/package.nix

@@ -0,0 +1,43 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "xprin";
+  version = "0.2.0";
+
+  src = fetchFromGitHub {
+    owner = "crossplane-contrib";
+    repo = "xprin";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-5qRPzrMAW7gw5fv5rgR9hOrZreeWXj/UFyMQAzpCA0s=";
+  };
+
+  vendorHash = "sha256-mFICxQ0WHPFxHJ5wmElqcRMOvExKWmX2XXCRQCWbXoI=";
+
+  subPackages = [
+    "cmd/xprin"
+    "cmd/xprin-helpers"
+  ];
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X github.com/crossplane-contrib/xprin/internal/version.version=v${finalAttrs.version}"
+  ];
+
+  __structuredAttrs = true;
+
+  meta = {
+    description = "Crossplane testing framework for render and schema validation";
+    homepage = "https://github.com/crossplane-contrib/xprin";
+    changelog = "https://github.com/crossplane-contrib/xprin/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      LorenzBischof
+    ];
+    mainProgram = "xprin";
+  };
+})

pkgs/by-name/ze/zenith/package.nix

@@ -8,21 +8,21 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zenith";
-  version = "0.14.3";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "bvaisvil";
     repo = "zenith";
     rev = finalAttrs.version;
-    hash = "sha256-D/o8JmKLiT8LhmJ6q2h7f5vJQNXAN5aCislxwDw9yqo=";
+    hash = "sha256-NOQ+LqymP1VQ80up6XR7kBYRfWey82wbDbGkf1NsQhc=";
   };
 
   # remove cargo config so it can find the linker on aarch64-linux
   postPatch = ''
-    rm .cargo/config
+    rm .cargo/config.toml
   '';
 
-  cargoHash = "sha256-/SRZWbsAvV4rgEsVj5WRgc5KJZm+JvIs1QTgaK/+l+g=";
+  cargoHash = "sha256-OABHxLLysx/atZBWCMJCcypugzs5OFtRp2KW3dkp2DE=";
 
   nativeBuildInputs = [ rustPlatform.bindgenHook ] ++ lib.optional nvidiaSupport makeWrapper;
 

pkgs/by-name/ze/zerofs/package.nix

@@ -10,18 +10,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zerofs";
-  version = "1.1.0";
+  version = "1.1.7";
 
   src = fetchFromGitHub {
     owner = "Barre";
     repo = "ZeroFS";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XTug8FytzAL1L9wNPlyKQBx/LnszLCFCfW9U5S0tark=";
+    hash = "sha256-DNdSrDlknZhUG7yQ5ckBcCJFktguDG1qfOtRz3MMmG4=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/zerofs";
 
-  cargoHash = "sha256-X2Sd1N4BLRhbInownKsXXvZX39gtBy3CaKbW+xRx5UE=";
+  cargoHash = "sha256-rS40vg3x+tWhlPv3KfK0mpoUeYa5O9QpTxuZm2IYZ3k=";
 
   nativeBuildInputs = [ cmake ];
 

pkgs/desktops/pantheon/apps/elementary-code/default.nix

@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-code";
-  version = "8.2.0";
+  version = "8.3.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "code";
     tag = version;
-    hash = "sha256-nLGjW7aVf+fkrYgqhj1fVhMU3aNpVUlPhBsSOAXGqWs=";
+    hash = "sha256-5ijVYfpr2SU0loPQ9L2vvxOVrNA67IhEMqIqoaf36iY=";
   };
 
   strictDeps = true;

pkgs/development/python-modules/cloudevents/default.nix

@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  pythonAtLeast,
   setuptools,
   deprecation,
   flask,
@@ -39,7 +40,15 @@ buildPythonPackage (finalAttrs: {
     sanic-testing
   ];
 
-  disabledTestPaths = [ "samples/http-image-cloudevents/image_sample_test.py" ];
+  disabledTestPaths = [
+    "samples/http-image-cloudevents/image_sample_test.py"
+  ]
+  # pydantic v1 doesn't work on python 3.14
+  ++ lib.optionals (pythonAtLeast "3.14") [
+    "cloudevents/tests/test_pydantic_cloudevent.py"
+    "cloudevents/tests/test_pydantic_conversions.py"
+    "cloudevents/tests/test_pydantic_events.py"
+  ];
 
   __darwinAllowLocalNetworking = true;
 

pkgs/development/python-modules/geodatasets/default.nix

@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "geodatasets";
-  version = "2026.1.0";
+  version = "2026.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "geopandas";
     repo = "geodatasets";
     tag = version;
-    hash = "sha256-fLhlXuqcArMb0PtFCKKqL78Z5A/j33Fzov8fg7PGvaQ=";
+    hash = "sha256-6RaWZOp5V5gc/vY3tZsXDNnDmUYnhmZFpto0pa6uMNg=";
   };
 
   build-system = [ setuptools-scm ];

pkgs/development/python-modules/gliner/default.nix

@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -17,14 +18,15 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "gliner";
-  version = "0.2.26";
+  version = "0.2.27";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "urchade";
     repo = "GLiNER";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tiQrb04SfloVJySyKu5XhOaE8Y3RcwBbW2l13UtZL0w=";
+    hash = "sha256-pM2JenMxBvCiDQyj9VFMYJGRckWJWna3gCdAlhBGR1U=";
   };
 
   build-system = [
@@ -43,7 +45,15 @@ buildPythonPackage (finalAttrs: {
     transformers
   ];
 
-  pythonImportsCheck = [ "gliner" ];
+  # aarch64-linux fails cpuinfo test, because /sys/devices/system/cpu/ does not exist in the sandbox:
+  # terminate called after throwing an instance of 'onnxruntime::OnnxRuntimeException'
+  #
+  # -> Skip the import check
+  pythonImportsCheck =
+    lib.optionals (!(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64))
+      [
+        "gliner"
+      ];
 
   # All tests require internet
   doCheck = false;
@@ -57,7 +67,7 @@ buildPythonPackage (finalAttrs: {
     badPlatforms = [
       # terminate called after throwing an instance of 'onnxruntime::OnnxRuntimeException'
       # Attempt to use DefaultLogger but none has been registered.
-      "aarch64-linux"
+      # "aarch64-linux"
     ];
   };
 })

pkgs/development/python-modules/llguidance/default.nix

@@ -23,19 +23,20 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "llguidance";
-  version = "1.7.4";
+  version = "1.7.5";
   pyproject = true;
+  __structuredAttrs = true;
 
   src = fetchFromGitHub {
     owner = "guidance-ai";
     repo = "llguidance";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vEF9+nlYP8LnlROgDU0HPg8H+OmZCQARoE6ngGIw7NM=";
+    hash = "sha256-AXTsa+ehQN46QxS4ciRMrv9wYksh6MFa1EDnuDIMsDw=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src pname version;
-    hash = "sha256-5dJkC0Iz0IBXxSq5ZeorLta7WEd81ajagSoXt1Zsq7Q=";
+    hash = "sha256-rBc6cc76fELkXqpODh4IDXgjRKSZv1c9s8+VZVWjTvs=";
   };
 
   nativeBuildInputs = [

pkgs/development/python-modules/mapclassify/default.nix

@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
   pytestCheckHook,
@@ -56,6 +57,33 @@ buildPythonPackage rec {
     # depends on remote datasets
     "test_legendgram_map"
     "test_legendgram_most_recent_cmap"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # RuntimeError: *** -[__NSPlaceholderArray initWithObjects:count:]: attempt to insert nil object from objects[1]
+    "test_legendgram_returns_axis"
+    "test_legendgram_standalone"
+    "test_legendgram_inset_false"
+    "test_legendgram_clip"
+    "test_legendgram_tick_params"
+    "test_legendgram_frameon"
+    "test_legendgram_default"
+    "test_legendgram_vlines"
+    "test_legendgram_cmap"
+    "test_legendgram_cmap_class"
+    "test_legendgram_position"
+    "test_legendgram_kwargs"
+    "test_histogram_plot"
+    "test_histogram_plot_despine"
+    "test_histogram_plot_linewidth"
+    "test_no_classify_default"
+    "test_pass_in_ax"
+    "test_classify_xy_redblue"
+    "test_divergent_revert_alpha_min_alpha"
+    "test_userdefined_colors"
+    "test_shifted_colormap"
+    "test_truncated_colormap"
+    "test_legend"
+    "test_legend_kwargs"
   ];
 
   pythonImportsCheck = [ "mapclassify" ];

pkgs/development/python-modules/oelint-parser/default.nix

@@ -13,14 +13,14 @@
 
 buildPythonPackage (finalAttrs: {
   pname = "oelint-parser";
-  version = "8.9.1";
+  version = "8.11.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "priv-kweihmann";
     repo = "oelint-parser";
     tag = finalAttrs.version;
-    hash = "sha256-k/8NESePMe70PbqZNaMJu3aPSDMfT1JkixWYBvnmR9I=";
+    hash = "sha256-wzC9tXhPuGtyD2pQ2hO4sfERNOH8+sCNvXUcrqqlEAM=";
   };
 
   pythonRelaxDeps = [ "regex" ];