Merge staging-next into staging

pkgs/by-name/ca/cargo-deny/package.nix

@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-deny";
-  version = "0.19.8";
+  version = "0.19.9";
 
   src = fetchFromGitHub {
     owner = "EmbarkStudios";
     repo = "cargo-deny";
     tag = finalAttrs.version;
-    hash = "sha256-pcF/SYtlydu09ZXQ5/1Wm2gwttFBulEt27SCEY1+kNU=";
+    hash = "sha256-b3p4UxMDUNMKusgGDji3A0myfAfYU+o4DFnhM4mrWao=";
   };
 
-  cargoHash = "sha256-I2BHVcpULObHtsqBxzTvEPevZa/CkhlC/gj0ldofDwA=";
+  cargoHash = "sha256-+FWEA2T8CASg3MmTb7WpN4MO8lwiLZtsVDuWMddkUgA=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/co/compsize/btrfs-progs-6-10-1.patch

@@ -0,0 +1,47 @@
+From a471982c82d1917637cce81a084fcd4b02d6e33b Mon Sep 17 00:00:00 2001
+From: David Roman <droman@ifae.es>
+Date: Mon, 25 Nov 2024 14:10:16 +0100
+Subject: [PATCH] fix build with btrfs-progs >= 6.10.1
+
+https://github.com/kilobyte/compsize/pull/54
+
+---
+ compsize.c   | 2 ++
+ radix-tree.h | 4 ----
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/compsize.c b/compsize.c
+index 42ec304..0f533e5 100644
+--- a/compsize.c
++++ b/compsize.c
+@@ -5,12 +5,14 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <dirent.h>
++#include "kerncompat.h"
+ #include <btrfs/ioctl.h>
+ #include <btrfs/ctree.h>
+ #include <stdarg.h>
+ #include <stdlib.h>
+ #include <sys/ioctl.h>
+ #include <inttypes.h>
++#include <errno.h>
+ #include <linux/limits.h>
+ #include <getopt.h>
+ #include <signal.h>
+diff --git a/radix-tree.h b/radix-tree.h
+index bf96d83..d99ea7e 100644
+--- a/radix-tree.h
++++ b/radix-tree.h
+@@ -37,11 +37,7 @@
+ #ifndef _LINUX_RADIX_TREE_H
+ #define _LINUX_RADIX_TREE_H
+ 
+-#if BTRFS_FLAT_INCLUDES
+ #include "kerncompat.h"
+-#else
+-#include <btrfs/kerncompat.h>
+-#endif /* BTRFS_FLAT_INCLUDES */
+ 
+ #define RADIX_TREE_MAX_TAGS 2
+ 

pkgs/by-name/co/compsize/package.nix

@@ -2,49 +2,45 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchurl,
   btrfs-progs,
 }:
 
-let
-  # https://github.com/kilobyte/compsize/issues/52
-  btrfs-progs' = btrfs-progs.overrideAttrs (old: rec {
-    pname = "btrfs-progs";
-    version = "6.10";
-    src = fetchurl {
-      url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-      hash = "sha256-M4KoTj/P4f/eoHphqz9OhmZdOPo18fNFSNXfhnQj4N8=";
-    };
-  });
-
-in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "compsize";
-  version = "1.5";
+  version = "1.5-unstable-2023-12-24";
 
   src = fetchFromGitHub {
     owner = "kilobyte";
     repo = "compsize";
-    rev = "v${version}";
-    sha256 = "sha256-OX41ChtHX36lVRL7O2gH21Dfw6GPPEClD+yafR/PFm8=";
+    rev = "d79eacf77abe3b799387bb8a4e07a18f1f1031e8";
+    sha256 = "sha256-pwHFllwTznhgZAGtGsULoLLBZlCllGt1eBmUKoJ/2wk=";
   };
 
-  buildInputs = [ btrfs-progs' ];
+  patches = [
+    ./btrfs-progs-6-10-1.patch
+  ];
+
+  __structuredAttrs = true;
+  strictDeps = true;
+  enableParallelBuilding = true;
+
+  outputs = [
+    "out"
+    "man"
+  ];
+
+  buildInputs = [ btrfs-progs ];
 
   installFlags = [
     "PREFIX=${placeholder "out"}"
   ];
 
-  preInstall = ''
-    mkdir -p $out/share/man/man8
-  '';
-
   meta = {
     description = "Find compression type/ratio on a file or set of files in the Btrfs filesystem";
     mainProgram = "compsize";
     homepage = "https://github.com/kilobyte/compsize";
     license = lib.licenses.gpl2Plus;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ sandarukasa ];
     platforms = lib.platforms.linux;
   };
 }

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

@@ -101,6 +101,7 @@ buildGoModule (finalAttrs: {
     "-X github.com/nezhahq/nezha/service/singleton.Version=${finalAttrs.version}"
   ];
 
+  __darwinAllowLocalNetworking = true; # TestOptionalAuth_PATWithoutScopeIsDenied
   checkFlags = "-skip=^TestSplitDomainSOA$";
 
   postInstall = ''

pkgs/by-name/op/openimageio/package.nix

@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "openimageio";
-  version = "3.1.14.0";
+  version = "3.1.14.1";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "OpenImageIO";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sA4NzGdT+K9uQM+h8Ew1EvjO8TGMGyyLS5KYYMJAToE=";
+    hash = "sha256-gAW9pUK0oPGoeNRBCS7i444PQ3b6f9Pa0UJwhSJV9ss=";
   };
 
   outputs = [

pkgs/by-name/pi/pizauth/package.nix

@@ -4,6 +4,7 @@
   fetchFromGitHub,
   stdenv,
   nix-update-script,
+  enableSystemd ? stdenv.hostPlatform.isLinux,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -19,17 +20,25 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-pxzPcieUXE3VOyGNDaeDHUQPayRDZXpW57VWMejlZ4k=";
 
-  buildFeatures = lib.optionals stdenv.hostPlatform.isLinux [
+  buildFeatures = lib.optionals enableSystemd [
     "systemd"
   ];
 
   preConfigure = ''
     substituteInPlace lib/systemd/user/pizauth.service \
       --replace-fail /usr/bin/ ''${!outputBin}/bin/
+    # Upstream's Makefile uses target/release/pizauth as a Makefile target that
+    # the `install` target depends upon. Nixpkgs' cargoBuildHook defaults to
+    # using the explicit `--target @rustcTargetSpec@` flag, so that the
+    # executable always ends up in
+    # `target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release`. To make the
+    # Makefile not run cargo build again, we use this substitution.
+    substituteInPlace Makefile \
+      --replace-fail target/release target/${stdenv.hostPlatform.rust.rustcTargetSpec}/release
   '';
 
   postInstall = ''
-    make PREFIX=$out install ${lib.optionalString stdenv.hostPlatform.isLinux "install-systemd"}
+    make PREFIX=$out install ${lib.optionalString enableSystemd "install-systemd"}
   '';
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=pizauth-(.*)" ]; };

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

@@ -7,6 +7,7 @@
   accountsservice,
   dbus,
   glib,
+  gst_all_1,
   gtk4,
   pango,
   librsvg,
@@ -37,6 +38,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     dbus
     glib
     gtk4
+    gst_all_1.gstreamer # Used for animated wallpapers or video playback
+    gst_all_1.gst-plugins-good
+    gst_all_1.gst-plugins-base
     pango
     librsvg
   ];

pkgs/by-name/sh/sharefinder/package.nix

@@ -0,0 +1,43 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+  versionCheckHook,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "sharefinder";
+  version = "1.4.0";
+
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "vflame6";
+    repo = "sharefinder";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-82hQPz05Xzvq5ggUht3GFaJ+3yEjES94mfZjQd5a+rA=";
+  };
+
+  vendorHash = "sha256-ABPq6WKYIjyCX5K8iU++6dszUW7s9Ld1Queb2hGdGzs=";
+
+  ldflags = [
+    "-s"
+    "-X=github.com/vflame6/sharefinder/cmd.VERSION=${finalAttrs.version}"
+  ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Active network shares enumeration tool";
+    homepage = "https://github.com/vflame6/sharefinder";
+    changelog = "https://github.com/vflame6/sharefinder/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+    mainProgram = "sharefinder";
+  };
+})

pkgs/by-name/ti/tinty/package.nix

@@ -6,7 +6,7 @@
   nix-update-script,
 }:
 let
-  version = "0.32.2";
+  version = "0.33.0";
 in
 rustPlatform.buildRustPackage {
   pname = "tinty";
@@ -16,10 +16,10 @@ rustPlatform.buildRustPackage {
     owner = "tinted-theming";
     repo = "tinty";
     tag = "v${version}";
-    hash = "sha256-+13iS99bwvIZDy96x1fgOtDyvbu59ieY4nUZk91mK4s=";
+    hash = "sha256-pQ7Aw95evZc8buPLkluUhxs113El2SFFNTltpunPbow=";
   };
 
-  cargoHash = "sha256-gShC4+uzdJVi3KuLc6ImJRvEWvIY4vgKcYT8Aykm0Xc=";
+  cargoHash = "sha256-pJH8ROgwfHZfJQWQI7u+mzqVX6I369/cF3QUM2+D7Y4=";
 
   # Pretty much all tests require internet access
   doCheck = false;

pkgs/by-name/ya/yazi/plugins/mediainfo/default.nix

@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "mediainfo.yazi";
-  version = "0-unstable-2026-06-03";
+  version = "0-unstable-2026-06-06";
 
   src = fetchFromGitHub {
     owner = "boydaihungst";
     repo = "mediainfo.yazi";
-    rev = "ef8105a52b2f2bc59aeef38e02b2c69418131352";
-    hash = "sha256-1qHCeLn6bPdOs3Z176367t6/m9sothyqHe+rqkKqgiI=";
+    rev = "a6d30a1c85faabe9bab215b83efb3c646b4c2924";
+    hash = "sha256-s2/6ljln64oVbKVFTGbRdxB8x9ASCo7FKDvC65eyDWM=";
   };
 
   meta = {

pkgs/by-name/ya/yazi/plugins/starship/default.nix

@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "starship.yazi";
-  version = "0-unstable-2026-03-22";
+  version = "0-unstable-2026-06-14";
 
   src = fetchFromGitHub {
     owner = "Rolv-Apneseth";
     repo = "starship.yazi";
-    rev = "a83710153ab5625a64ef98d55e6ddad480a3756f";
-    hash = "sha256-CPRVJVunBLwFLCoj+XfoIIwrrwHxqoElbskCXZgFraw=";
+    rev = "159eaba5b5052bf78ff6cfbfe4e527b946818c82";
+    hash = "sha256-I21to4cxlszRpsb58cvsmwX7VglQBSJC0rrsFIltzC8=";
   };
 
   meta = {

pkgs/desktops/lomiri/applications/lomiri-terminal-app/default.nix

@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-terminal-app";
-  version = "2.0.5";
+  version = "2.0.6";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/apps/lomiri-terminal-app";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-STL8Km5NVSW3wEjC96sT4Q9z/lTSYKFQ6ku6M+CKM78=";
+    hash = "sha256-F7E8YKNC1wAMYnE2Ct30ZMKbzN/wHIPWv+AAVw86Hm4=";
   };
 
   postPatch = ''

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

@@ -0,0 +1,84 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pythonAtLeast,
+
+  # build system
+  setuptools,
+
+  # optional dependencies
+  crc32c,
+  lz4,
+  pyperf,
+  python-snappy,
+  zstandard,
+
+  # test dependencies
+  pytestCheckHook,
+  pytest-mock,
+  pytest-timeout,
+  xxhash,
+}:
+
+buildPythonPackage (finalAttrs: {
+  pname = "kafka-python";
+  version = "2.3.2";
+  pyproject = true;
+  __structuredAttrs = true;
+
+  disabled = pythonAtLeast "3.14";
+
+  src = fetchFromGitHub {
+    owner = "dpkp";
+    repo = "kafka-python";
+    tag = finalAttrs.version;
+    hash = "sha256-FC5ntcRy2iF2sqYVxWg11EcGA5ncpuUuQHOkBG0paog=";
+  };
+
+  build-system = [ setuptools ];
+
+  optional-dependencies = {
+    benchmarks = [ pyperf ];
+    crc32c = [ crc32c ];
+    lz4 = [ lz4 ];
+    snappy = [ python-snappy ];
+    zstd = [ zstandard ];
+  };
+
+  pythonImportsCheck = [
+    "kafka"
+    "kafka.admin"
+    "kafka.benchmarks"
+    "kafka.cli"
+    "kafka.consumer"
+    "kafka.coordinator"
+    "kafka.metrics"
+    "kafka.partitioner"
+    "kafka.producer"
+    "kafka.protocol"
+    "kafka.record"
+    "kafka.sasl"
+    "kafka.serializer"
+    "kafka.vendor"
+  ];
+
+  nativeCheckInputs = [
+    pytest-mock
+    pytest-timeout
+    pytestCheckHook
+    xxhash
+  ]
+  ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies;
+
+  meta = {
+    changelog = "https://github.com/dpkp/kafka-python/blob/${finalAttrs.src.tag}/CHANGES.md";
+    description = "Pure Python client for Apache Kafka";
+    homepage = "https://github.com/dpkp/kafka-python";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      de11n
+      despsyched
+    ];
+  };
+})

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

@@ -32,6 +32,7 @@
   pydantic-settings,
   pyopengl,
   pyyaml,
+  requests,
   scikit-image,
   scipy,
   superqt,
@@ -105,6 +106,7 @@ buildPythonPackage (finalAttrs: {
     pydantic-settings
     pyopengl
     pyyaml
+    requests
     scikit-image
     scipy
     superqt

pkgs/development/python-modules/pytest-kafka/default.nix

@@ -1,9 +1,13 @@
 {
-  lib,
   buildPythonPackage,
   fetchFromGitLab,
+  lib,
+
+  # build system
   setuptools,
-  kafka-python-ng,
+
+  # dependencies
+  kafka-python,
   port-for,
   pytest,
 }:
@@ -23,7 +27,7 @@ buildPythonPackage rec {
   build-system = [ setuptools ];
 
   dependencies = [
-    kafka-python-ng
+    kafka-python
     port-for
     pytest
   ];

pkgs/development/python-modules/stable-baselines3/default.nix

@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -22,7 +23,7 @@
 }:
 buildPythonPackage (finalAttrs: {
   pname = "stable-baselines3";
-  version = "2.8.0";
+  version = "2.9.0";
   pyproject = true;
   __structuredAttrs = true;
 
@@ -30,7 +31,7 @@ buildPythonPackage (finalAttrs: {
     owner = "DLR-RM";
     repo = "stable-baselines3";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eMtkcPvTtdy0gqedCD8NxlC85rDEB9Dam5fIKujEWp4=";
+    hash = "sha256-vKbILFjQuD2gAkl3J3RA/vEo5UYqWttJ99kZdlEsqkY=";
   };
 
   build-system = [ setuptools ];
@@ -77,6 +78,11 @@ buildPythonPackage (finalAttrs: {
     # Tests that attempt to access the filesystem
     "test_make_atari_env"
     "test_vec_env_monitor_kwargs"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # RuntimeError: *** -[__NSPlaceholderArray initWithObjects:count:]: attempt to insert nil object from objects[1]
+    "test_report_figure_to_tensorboard"
+    "test_unsupported_figure_format"
   ];
 
   meta = {

pkgs/os-specific/linux/amneziawg/default.nix

@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "amneziawg";
-  version = "1.0.20260329-2";
+  version = "1.0.20260611";
 
   src = fetchFromGitHub {
     owner = "amnezia-vpn";
     repo = "amneziawg-linux-kernel-module";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BlWnncTzVKDpCVvtLp8L+bABs81YH/Ce+9JGCoCm1LI=";
+    hash = "sha256-eMApc7VHWB1GL8YWdAS7HyEgkV/nkLjwBMOP+gtuHOE=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src";

pkgs/test/top-level/default.nix

@@ -82,4 +82,18 @@ lib.recurseIntoAttrs {
     assert cross.makeWrapper ? __spliced;
     assert appended.makeWrapper ? __spliced;
     pkgs.emptyFile;
+
+  massRebuildVariantComposition =
+    let
+      variants = [
+        "pkgsChecked"
+        "pkgsParallel"
+        "pkgsStrict"
+        "pkgsStructured"
+      ];
+      all = lib.getAttrFromPath variants pkgs;
+      all-reversed = lib.getAttrFromPath (lib.reverseList variants) pkgs;
+    in
+    assert pkgs.config.allowVariants -> (all.hello == all-reversed.hello);
+    pkgs.emptyFile;
 }

pkgs/top-level/python-aliases.nix

@@ -301,7 +301,6 @@ mapAliases {
   jupyter_core = throw "'jupyter_core' has been renamed to/replaced by 'jupyter-core'"; # Converted to throw 2025-10-29
   jupyter_server = throw "'jupyter_server' has been renamed to/replaced by 'jupyter-server'"; # Converted to throw 2025-10-29
   jupyterlab_server = throw "'jupyterlab_server' has been renamed to/replaced by 'jupyterlab-server'"; # Converted to throw 2025-10-29
-  kafka-python = throw "'kafka-python' has been renamed to/replaced by 'kafka-python-ng'"; # Converted to throw 2025-10-29
   Kajiki = throw "'Kajiki' has been renamed to/replaced by 'kajiki'"; # Converted to throw 2025-10-29
   keepkey-agent = throw "keepkey-agent has been removed because upstream dropped KeepKey support"; # Added 2026-03-11
   keepkey_agent = throw "keepkey-agent has been removed because upstream dropped KeepKey support"; # Added 2026-03-11

pkgs/top-level/python-packages.nix

@@ -8345,6 +8345,8 @@ self: super: with self; {
 
   kaa-metadata = callPackage ../development/python-modules/kaa-metadata { };
 
+  kafka-python = callPackage ../development/python-modules/kafka-python { };
+
   kafka-python-ng = callPackage ../development/python-modules/kafka-python-ng { };
 
   kaggle = callPackage ../development/python-modules/kaggle { };

pkgs/top-level/variants.nix

@@ -173,4 +173,25 @@ self: super: {
     ]
     ++ overlays;
   };
+
+  pkgsChecked = nixpkgsFun {
+    config = super.config // {
+      doCheckByDefault = true;
+    };
+  };
+  pkgsParallel = nixpkgsFun {
+    config = super.config // {
+      enableParallelBuildingByDefault = true;
+    };
+  };
+  pkgsStrict = nixpkgsFun {
+    config = super.config // {
+      strictDepsByDefault = true;
+    };
+  };
+  pkgsStructured = nixpkgsFun {
+    config = super.config // {
+      structuredAttrsByDefault = true;
+    };
+  };
 }