Merge staging-next-26.05 into staging-26.05

maintainers/github-teams.json

@@ -178,11 +178,12 @@
     "members": {
       "0xMRTT": 105598867,
       "21CSM": 81891917,
+      "4evy": 57304299,
       "Aleksanaa": 42209822,
+      "Br1ght0ne": 12615679,
       "CorbanR": 1918683,
       "Emin017": 99674037,
       "Et7f3": 29592775,
-      "FlameFlag": 57304299,
       "Guanran928": 68757440,
       "LnL7": 689294,
       "Mastermindaxe": 33257997,

pkgs/applications/misc/electrum/default.nix

@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchurl,
-  protobuf,
   wrapQtAppsHook,
   python3,
   zbar,
@@ -21,14 +20,14 @@ let
     else
       "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}";
 in
-python3.pkgs.buildPythonApplication rec {
+python3.pkgs.buildPythonApplication (finalAttrs: {
   pname = "electrum";
-  version = "4.7.2";
+  version = "4.8.0";
   pyproject = true;
 
   src = fetchurl {
-    url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz";
-    hash = "sha256-qzA/HLw+QPTdE6qsg8TNqr0DuOgfMrs8UcEnfp1uBpc=";
+    url = "https://download.electrum.org/${finalAttrs.version}/Electrum-${finalAttrs.version}.tar.gz";
+    hash = "sha256-z14bzs81eJNTMSWSBLTyCmsljDNztG54SVkoTcSqvsM=";
   };
 
   build-system = with python3.pkgs; [
@@ -36,7 +35,6 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   nativeBuildInputs = [
-    protobuf
     python3.pkgs.pythonRelaxDepsHook
   ]
   ++ lib.optionals enableQt [
@@ -101,11 +99,7 @@ python3.pkgs.buildPythonApplication rec {
     "tests/test_qml_types.py"
   ];
 
-  postPatch = ''
-    # Upstream tarball omits regenerated protobuf bindings in some releases.
-    protoc --python_out=. electrum/paymentrequest.proto
-  ''
-  + (
+  postPatch =
     if enableQt then
       ''
         substituteInPlace ./electrum/qrscanner.py \
@@ -114,8 +108,7 @@ python3.pkgs.buildPythonApplication rec {
     else
       ''
         sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt
-      ''
-  );
+      '';
 
   postInstall = lib.optionalString stdenv.hostPlatform.isLinux ''
     substituteInPlace $out/share/applications/electrum.desktop \
@@ -175,4 +168,4 @@ python3.pkgs.buildPythonApplication rec {
     ];
     mainProgram = "electrum";
   };
-}
+})

pkgs/applications/networking/irc/weechat/default.nix

@@ -105,11 +105,11 @@ assert lib.all (p: p.enabled -> !(builtins.elem null p.buildInputs)) plugins;
 
 stdenv.mkDerivation rec {
   pname = "weechat";
-  version = "4.9.1";
+  version = "4.9.2";
 
   src = fetchurl {
     url = "https://weechat.org/files/src/weechat-${version}.tar.xz";
-    hash = "sha256-BJYLVuHdhhJ/Y8+P0Bu/93yBQvQK6KlBrD22QtMQzek=";
+    hash = "sha256-0TianlIb2gxOv6EI4qv4he5sUVDDhSmfXcoBgaQ6CRQ=";
   };
 
   # Why is this needed? https://github.com/weechat/weechat/issues/2031

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

@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-tarpaulin";
-  version = "0.35.5";
+  version = "0.36.0";
 
   src = fetchFromGitHub {
     owner = "xd009642";
     repo = "tarpaulin";
     tag = finalAttrs.version;
-    hash = "sha256-m822/s9HBKIxAfzgQEBOZeHcHU57MPGOumqlTc55Ro8=";
+    hash = "sha256-qd0PmCCUmd9Y4kUei+hZoc+rIYYZMf0s2ml9IoHtXX8=";
   };
 
-  cargoHash = "sha256-Qo06iUy/1ElEe/gkH23JZLw7AKPkBPw6aLXnvx9Hv4g=";
+  cargoHash = "sha256-EJTzITwwLEMVWdLdSE+A9D3Deh501561rxrlsqzmRKs=";
 
   nativeBuildInputs = [
     pkg-config

pkgs/by-name/ex/extism-js-core/package.nix

@@ -79,6 +79,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
   __structuredAttrs = true;
 
   meta = {
+    # Fails to build on darwin due to libiconv linking failure (ld: library not found for -liconv)
+    # See https://github.com/NixOS/nixpkgs/pull/523442 for a (failed) attempt at fixing the issue
+    broken = stdenv.buildPlatform.isDarwin;
     changelog = "https://github.com/extism/js-pdk/releases/tag/${finalAttrs.src.tag}";
     description = "Write Extism plugins in JavaScript & TypeScript (WASM core)";
     homepage = "https://github.com/extism/js-pdk";

pkgs/by-name/fr/frigate/package.nix

@@ -15,14 +15,14 @@
 }:
 
 let
-  version = "0.17.1";
+  version = "0.17.2";
 
   src = fetchFromGitHub {
     name = "frigate-${version}-source";
     owner = "blakeblackshear";
     repo = "frigate";
     tag = "v${version}";
-    hash = "sha256-jQQ54By77dOVSIu08YhJn+EUV0D03j1bcMQRk9404RE=";
+    hash = "sha256-8ujG5rVGqIJxM+IiQKvudrA0xqfz+3Uisl/zXwARPpY=";
   };
 
   frigate-web = callPackage ./web.nix {

pkgs/by-name/go/gopher64/package.nix

@@ -56,6 +56,12 @@ rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: {
 
   cargoHash = "sha256-rmt2b8lk/9ts8v33yguuSFcbFvUX00icg1onmhCbDTQ=";
 
+  # don't use lld on aarch64-linux
+  postPatch = ''
+    substituteInPlace .cargo/config.toml \
+      --replace-fail 'rustflags = ["-C", "link-arg=-fuse-ld=lld"]' ""
+  '';
+
   env = {
     # See pkgs/by-name/ne/neovide/package.nix
     SKIA_SOURCE_DIR =

pkgs/by-name/id/idevicerestore/package.nix

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "idevicerestore";
-  version = "1.0.0-unstable-2025-10-02";
+  version = "1.0.0-unstable-2026-07-26";
 
   src = fetchFromGitHub {
     owner = "libimobiledevice";
     repo = "idevicerestore";
-    rev = "f4d0f7e83105cc362527566315abee07b0840848";
-    hash = "sha256-fqTVAHTxamk2lIllr7ZNHOJ1YTJHM4JpVQylMV33CJI=";
+    rev = "45145e9fdc8458022c61a4b87bd029b866d5bcdc";
+    hash = "sha256-0W0DEnO8eZx2G3JKjp7SilLH8vmpfkiJxrwkudyf5rM=";
   };
 
   nativeBuildInputs = [
@@ -61,7 +61,10 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = lib.licenses.lgpl21Plus;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ nh2 ];
+    maintainers = with lib.maintainers; [
+      flokli
+      nh2
+    ];
     mainProgram = "idevicerestore";
   };
 })

pkgs/by-name/mi/miniz/package.nix

@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "miniz";
-  version = "3.1.1";
+  version = "3.1.2";
 
   src = fetchFromGitHub {
     owner = "richgel999";
     repo = "miniz";
     rev = finalAttrs.version;
-    hash = "sha256-hRB/0TVVQjr4VwjozfRnYKUJfeqO+1PNfdvP/rrOCR4=";
+    hash = "sha256-/MAJWZXZ+pbelFduGE75rK/x9qEzxSFEj8RJWe3JUv0=";
   };
   passthru.updateScript = nix-update-script { };
 

pkgs/by-name/pl/plakar/package.nix

@@ -8,16 +8,19 @@
 }:
 buildGo125Module (finalAttrs: {
   pname = "plakar";
-  version = "1.0.6";
+  version = "1.1.4";
+
+  # to avoid having all the Test(Get|Set|Validate)Service.* tests fail on darwin
+  __darwinAllowLocalNetworking = true;
 
   src = fetchFromGitHub {
     owner = "PlakarKorp";
     repo = "plakar";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-X8m2dXMb+cxWBbKm0MhhY2pNSBTUONyHoPnGlDG9jOg=";
+    hash = "sha256-Urj1BG3XGhSroaa9pl9NGiKj38J1P+H9sA7noGwIhdc=";
   };
 
-  vendorHash = "sha256-6MdwUJTu9QvqZ3iGEg39L5B5mce7JssFTF3ZmoTuH3M=";
+  vendorHash = "sha256-aqHjSTVVxBbaHAZZNQaFbftN0Hbl/+7wgk5uFM664po=";
 
   buildInputs = [
     fuse
@@ -30,8 +33,8 @@ buildGo125Module (finalAttrs: {
   checkFlags =
     let
       skippedTests = [
-        # mount: fusermount: exec: "fusermount": executable file not found in $PATH
-        "TestExecuteCmdMountDefault"
+        # hangs even outside Nix, so probably an upstream issue:
+        "TestRebuildStateVersionMismatch"
       ]
       ++ lib.optionals stdenv.hostPlatform.isDarwin [
         "TestBTreeScanMemory"
@@ -53,6 +56,7 @@ buildGo125Module (finalAttrs: {
     maintainers = with lib.maintainers; [
       heph2
       qbit
+      nadir-ishiguro
     ];
   };
 })

pkgs/by-name/rl/rlottie/package.nix

@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation {
   pname = "rlottie";
-  version = "0.2-unstable-2025-10-01";
+  version = "0.2-unstable-2026-07-03";
 
   src = fetchFromGitHub {
     owner = "Samsung";
     repo = "rlottie";
-    rev = "671c561130ead1c6e44805a7ec1263573a3440fd";
-    hash = "sha256-od3zatv4ZxUIoLkwy0TT8lAsDcjoPS4plci+ZDyz34Y=";
+    rev = "f487eff2f8086b84ae1c7faa0418abec909e874b";
+    hash = "sha256-/Sv5qX1V6VltJN0+bkKU2utaj8Yw1owb0KjJFWv41Js=";
   };
 
   nativeBuildInputs = [

pkgs/by-name/vi/vicinae/package.nix

@@ -21,13 +21,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vicinae";
-  version = "0.21.7";
+  version = "0.22.0";
 
   src = fetchFromGitHub {
     owner = "vicinaehq";
     repo = "vicinae";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-r4BuhKyW4sxin0YG3/EJjed/MiP5NwN7QGiM1ySozjE=";
+    hash = "sha256-f1d88cdqe1PfeuzY90JIRCoHKLV1Uuakc4TpSNvNBKA=";
   };
 
   apiDeps = fetchNpmDeps {

pkgs/development/ocaml-modules/alcobar/default.nix

@@ -0,0 +1,49 @@
+{
+  afl-persistent,
+  alcotest,
+  buildDunePackage,
+  calendar,
+  cmdliner,
+  fetchurl,
+  fpath,
+  lib,
+  ocaml,
+  pprint,
+  uucp,
+  uunf,
+}:
+
+buildDunePackage (finalAttrs: {
+  pname = "alcobar";
+  version = "0.3.1";
+  minimalOCamlVersion = "4.10";
+  __structuredAttrs = true;
+
+  src = fetchurl {
+    url = "https://github.com/samoht/alcobar/releases/download/v${finalAttrs.version}/alcobar-${finalAttrs.version}.tbz";
+    hash = "sha256-V2UnvLrtf+XXkp7uFlrIpxg6+fZqwhCS/J7C3Nw+eVU=";
+  };
+
+  propagatedBuildInputs = [
+    afl-persistent
+    alcotest
+    cmdliner
+  ];
+
+  checkInputs = [
+    calendar
+    fpath
+    pprint
+    uucp
+    uunf
+  ];
+  doCheck = lib.versionAtLeast ocaml.version "5.0";
+
+  meta = {
+    description = "Crowbar with an Alcotest-compatible API";
+    homepage = "https://github.com/samoht/alcobar";
+    changelog = "https://github.com/samoht/alcobar/blob/v${finalAttrs.version}/CHANGES.md";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vog ];
+  };
+})

pkgs/development/ocaml-modules/cascade/default.nix

@@ -0,0 +1,52 @@
+{
+  alcobar,
+  buildDunePackage,
+  dune-build-info,
+  fetchFromGitHub,
+  lambdasoup,
+  lib,
+  logs,
+  mdx,
+  memtrace,
+  psq,
+  uutf,
+}:
+
+buildDunePackage (finalAttrs: {
+  pname = "cascade";
+  version = "0-unstable-2026-06-26";
+  minimalOCamlVersion = "5.2";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "samoht";
+    repo = "cascade";
+    rev = "434c07be7ec1a63213a234946d57937e4d080feb";
+    hash = "sha256-6g8UKsXdR0PxihrOiMVC36q7+bomMByPDbmuISL7h4U=";
+  };
+
+  propagatedBuildInputs = [
+    dune-build-info
+    logs
+    psq
+    uutf
+  ];
+  buildInputs = [
+    lambdasoup
+    memtrace
+  ];
+
+  nativeCheckInputs = [ mdx.bin ];
+  checkInputs = [
+    (mdx.override { inherit logs; })
+    alcobar
+  ];
+  doCheck = true;
+
+  meta = {
+    description = "CSS generation and manipulation library for OCaml";
+    homepage = "https://github.com/samoht/cascade";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vog ];
+  };
+})

pkgs/development/ocaml-modules/tw/default.nix

@@ -0,0 +1,55 @@
+{
+  buildDunePackage,
+  cascade,
+  cmdliner,
+  fetchFromGitHub,
+  fmt,
+  lib,
+  ocaml,
+}:
+
+buildDunePackage (finalAttrs: {
+  pname = "tw";
+  version = "0-unstable-2026-06-23";
+  minimalOCamlVersion = "5.2";
+  __structuredAttrs = true;
+
+  src = fetchFromGitHub {
+    owner = "samoht";
+    repo = "tw";
+    rev = "594d35df46ec2afcfe97632923331badf2940b93";
+    hash = "sha256-vCRq0FCBIxc/AQg+R2Hig7nqwJGxgy2jedLbAsKaIoA=";
+  };
+
+  propagatedBuildInputs = [ cascade ];
+  buildInputs = [
+    cmdliner
+    fmt
+  ];
+
+  # Disabling tests because they check for byte-for-byte identical
+  # output with tailwindcss, so they are tied to a specific
+  # tailwindcss version, and would prevent independent upgrades of tw
+  # and tailwindcss.
+  doCheck = false;
+
+  outputs = [
+    "bin"
+    "lib"
+    "out"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    dune install --prefix=$bin --libdir=$lib/lib/ocaml/${ocaml.version}/site-lib
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Type-safe Tailwind CSS v4 in OCaml";
+    homepage = "https://github.com/samoht/tw";
+    mainProgram = "tw";
+    license = lib.licenses.isc;
+    maintainers = [ lib.maintainers.vog ];
+  };
+})

pkgs/development/python-modules/locust-cloud/default.nix

@@ -58,17 +58,13 @@ buildPythonPackage rec {
     export LOCUSTCLOUD_PASSWORD=dummy
   '';
 
-  disabledTests = [
-    # AssertionError
-    "test_recursive_imports"
-    "test_from_import_file"
-  ];
-
   disabledTestPaths = [
     # Tests require network access
     "tests/web_login_test.py"
     "tests/cloud_test.py"
     "tests/websocket_test.py"
+    # AssertionError
+    "tests/import_finder_test.py"
   ];
 
   meta = {

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

@@ -29,6 +29,9 @@
 }:
 
 let
+
+  sphinxSupported = !sphinx.disabled;
+
   self = buildPythonPackage rec {
     pname = "pip";
     version = "25.3";
@@ -51,9 +54,8 @@ let
       flit-core
       installShellFiles
     ]
-    ++ lib.optionals (pythonAtLeast "3.11") [
+    ++ lib.optionals sphinxSupported [
       # docs
-      # (sphinx requires Python 3.11)
       sphinx
       sphinx-issues
     ];
@@ -61,13 +63,13 @@ let
     outputs = [
       "out"
     ]
-    ++ lib.optionals (pythonAtLeast "3.11") [
+    ++ lib.optionals sphinxSupported [
       "man"
     ];
 
     # pip uses a custom sphinx extension and unusual conf.py location, mimic the internal build rather than attempting
     # to fit sphinxHook see https://github.com/pypa/pip/blob/0778c1c153da7da457b56df55fb77cbba08dfb0c/noxfile.py#L129-L148
-    postBuild = lib.optionalString (pythonAtLeast "3.11") ''
+    postBuild = lib.optionalString sphinxSupported ''
       cd docs
 
       # remove references to sphinx extentions only required for html doc generation

pkgs/os-specific/linux/kernel/kernels-org.json

@@ -1,7 +1,7 @@
 {
     "testing": {
-        "version": "7.2-rc1",
-        "hash": "sha256:1gpwr6n3cc2hqg36gy9g9w4rxawpz3y126j752z4zyls6h80b43v",
+        "version": "7.2-rc2",
+        "hash": "sha256:0fmmgckfjcld0ljwdz3jzc1bpkyfsj0i8q90mzzy92j07s28nffh",
         "lts": false
     },
     "6.1": {

pkgs/tools/misc/coreboot-utils/default.nix

@@ -17,7 +17,7 @@
 }:
 
 let
-  version = "26.03";
+  version = "26.06";
 
   commonMeta = {
     description = "Various coreboot-related tools";
@@ -47,7 +47,7 @@ let
         src = fetchgit {
           url = "https://review.coreboot.org/coreboot";
           rev = finalAttrs.version;
-          hash = "sha256-gaJ9AP7g0KxOzZfg1dyNatC8/pl83pypeq5Lg+Qp1ys=";
+          hash = "sha256-rL9txaDXUzjkC2ioYmunoNq2+9rz9wpEJ7z3GZrqOH4=";
         };
 
         enableParallelBuilding = true;

pkgs/top-level/all-packages.nix

@@ -1292,6 +1292,8 @@ with pkgs;
     )
   );
 
+  tw = ocamlPackages.tw.bin;
+
   wrapRetroArch = retroarch-bare.wrapper;
 
   # Aliases kept here because they are easier to use

pkgs/top-level/ocaml-packages.nix

@@ -22,6 +22,8 @@ let
 
         afl-persistent = callPackage ../development/ocaml-modules/afl-persistent { };
 
+        alcobar = callPackage ../development/ocaml-modules/alcobar { };
+
         alcotest = callPackage ../development/ocaml-modules/alcotest { };
 
         alcotest-lwt = callPackage ../development/ocaml-modules/alcotest/lwt.nix { };
@@ -241,6 +243,8 @@ let
           git-binary = pkgs.git;
         };
 
+        cascade = callPackage ../development/ocaml-modules/cascade { };
+
         cbor = callPackage ../development/ocaml-modules/cbor { };
 
         cfstream = callPackage ../development/ocaml-modules/cfstream { };
@@ -2179,6 +2183,8 @@ let
 
         tuntap = callPackage ../development/ocaml-modules/tuntap { };
 
+        tw = callPackage ../development/ocaml-modules/tw { };
+
         twt = callPackage ../development/ocaml-modules/twt { };
 
         type_eq = callPackage ../development/ocaml-modules/type_eq { };