Merge master into staging-next

pkgs/by-name/ar/armagetronad/package.nix

@@ -10,6 +10,7 @@
   python3,
   which,
   boost,
+  curl,
   ftgl,
   freetype,
   glew,
@@ -70,11 +71,11 @@ let
       # https://gitlab.com/armagetronad/armagetronad/-/commits/trunk/?ref_type=heads
       ${unstableVersionMajor} =
         let
-          rev = "813b684ab0de8ee9737c9fc1f9b90ba0543dd418";
-          hash = "sha256-01jWE9rSBJn+JS8p8LTFqIGquOY1avXsAZnfYfo5pPk=";
+          rev = "3675f21cd5be4932a7a168b321576e0b09e64aaf";
+          hash = "sha256-d2vPFAyx6LhEIxtEUdhrlqqYeCY0NnETlq7TVvX5vVo=";
         in
         dedicatedServer: {
-          version = "${unstableVersionMajor}-${builtins.substring 0 8 rev}";
+          version = "${unstableVersionMajor}-${lib.substring 0 8 rev}";
           src = fetchArmagetron rev hash;
           extraBuildInputs = [
             protobuf
@@ -97,11 +98,11 @@ let
       # https://gitlab.com/armagetronad/armagetronad/-/commits/hack-0.2.8-sty+ct+ap/?ref_type=heads
       "${latestVersionMajor}-sty+ct+ap" =
         let
-          rev = "5a17cc9fb6e1e27a358711afbd745ae54d4a8c60";
-          hash = "sha256-111C1j/hSaASGcvYy3//TyHs4Z+3fuiOvCmtcWLdFd4=";
+          rev = "c907ee3efd76f3b1e6eb41257cf7127f3eab280c";
+          hash = "sha256-d5uWBSz07OinbGHoxUQ64go3eOugLu/tWNjeihobQdo=";
         in
         dedicatedServer: {
-          version = "${latestVersionMajor}-sty+ct+ap-${builtins.substring 0 8 rev}";
+          version = "${latestVersionMajor}-sty+ct+ap-${lib.substring 0 8 rev}";
           src = fetchArmagetron rev hash;
           extraBuildInputs = lib.optionals (!dedicatedServer) [
             libGL
@@ -127,13 +128,13 @@ let
 
       # Split the version into the major and minor parts
       versionParts = lib.splitString "-" resolvedParams.version;
-      splitVersion = lib.splitVersion (builtins.elemAt versionParts 0);
-      majorVersion = builtins.concatStringsSep "." (lib.lists.take 2 splitVersion);
+      splitVersion = lib.splitVersion (lib.elemAt versionParts 0);
+      majorVersion = lib.concatStringsSep "." (lib.lists.take 2 splitVersion);
 
       minorVersionPart =
         parts: sep: expectedSize:
-        if builtins.length parts > expectedSize then
-          sep + (builtins.concatStringsSep sep (lib.lists.drop expectedSize parts))
+        if lib.length parts > expectedSize then
+          sep + (lib.concatStringsSep sep (lib.lists.drop expectedSize parts))
         else
           "";
 
@@ -172,8 +173,11 @@ let
       ++ lib.optional dedicatedServer "--enable-dedicated"
       ++ lib.optional (!dedicatedServer) "--enable-music";
 
-      buildInputs =
-        lib.singleton (libxml2.override { enableHttp = true; }) ++ (resolvedParams.extraBuildInputs or [ ]);
+      buildInputs = [
+        (libxml2.override { enableHttp = true; })
+        curl
+      ]
+      ++ (resolvedParams.extraBuildInputs or [ ]);
 
       nativeBuildInputs = [
         autoconf

pkgs/by-name/li/libcava/package.nix

@@ -8,13 +8,13 @@
 cava.overrideAttrs (old: rec {
   pname = "libcava";
   # fork may not be updated when we update upstream
-  version = "0.10.4";
+  version = "0.10.6";
 
   src = fetchFromGitHub {
     owner = "LukashonakV";
     repo = "cava";
     tag = version;
-    hash = "sha256-9eTDqM+O1tA/3bEfd1apm8LbEcR9CVgELTIspSVPMKM=";
+    hash = "sha256-63be1wypMiqhPA6sjMebmFE6yKpTj/bUE53sMWun554=";
   };
 
   nativeBuildInputs = old.nativeBuildInputs ++ [

pkgs/by-name/wa/waybar/package.nix

@@ -14,7 +14,6 @@
   gtkmm3,
   iniparser,
   jsoncpp,
-  libcava,
   libdbusmenu-gtk3,
   libevdev,
   libinotify-kqueue,
@@ -81,9 +80,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-mGiBZjfvtZZkSHrha4UF2l1Ogbij8J//r2h4gcZAJ6w=";
   };
 
+  libcavaSrc = fetchFromGitHub {
+    owner = "LukashonakV";
+    repo = "cava";
+    tag = "0.10.4";
+    hash = "sha256-9eTDqM+O1tA/3bEfd1apm8LbEcR9CVgELTIspSVPMKM=";
+  };
+
   postUnpack = lib.optional cavaSupport ''
     pushd "$sourceRoot"
-    cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.10.4
+    cp -R --no-preserve=mode,ownership ${finalAttrs.libcavaSrc} subprojects/cava-0.10.4
     patchShebangs .
     popd
   '';

pkgs/development/libraries/astal/source.nix

@@ -7,15 +7,15 @@ let
   originalDrv = fetchFromGitHub {
     owner = "Aylur";
     repo = "astal";
-    rev = "71b008e5fb59e0a992724db78d54a5ddcf234515";
-    hash = "sha256-vMhDAwwSrwMd5xWcTiA56fsk7LRz4tHOsKhrt2hXi48=";
+    rev = "189bf73016c26d7d32729a913d6436cd7b1a0885";
+    hash = "sha256-U2r3/DKgr9Fq1yqWLCbKMSqRf8a1JctD0kj/ftBClsg=";
   };
 in
 originalDrv.overrideAttrs (
   final: prev: {
     name = "${final.pname}-${final.version}"; # fetchFromGitHub already defines name
     pname = "astal-source";
-    version = "0-unstable-2025-10-09";
+    version = "0-unstable-2025-10-23";
 
     meta = prev.meta // {
       description = "Building blocks for creating custom desktop shells (source)";

pkgs/development/libraries/wayland/default.nix

@@ -107,7 +107,8 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://wayland.freedesktop.org/";
     license = licenses.mit; # Expat version
     platforms = platforms.unix;
-    broken = stdenv.hostPlatform.isDarwin; # requires more work: https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/481
+    # requires more work: https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/481
+    badPlatforms = lib.platforms.darwin;
     maintainers = with maintainers; [
       codyopel
       qyliss