diff --git a/pkgs/by-name/ri/rivercarro/deps.nix b/pkgs/by-name/ri/rivercarro/deps.nix
index 6a721c78e132..30c943a8314f 100644
--- a/pkgs/by-name/ri/rivercarro/deps.nix
+++ b/pkgs/by-name/ri/rivercarro/deps.nix
@@ -8,10 +8,10 @@
 
 linkFarm "zig-packages" [
   {
-    name = "wayland-0.3.0-lQa1kjPIAQDmhGYpY-zxiRzQJFHQ2VqhJkQLbKKdt5wl";
+    name = "wayland-0.4.0-lQa1khbMAQAsLS2eBR7M5lofyEGPIbu2iFDmoz8lPC27";
     path = fetchzip {
-      url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.3.0.tar.gz";
-      hash = "sha256-ydEavD9z20wRwn9ZVX56ZI2T5i1tnm3LupVxfa30o84=";
+      url = "https://codeberg.org/ifreund/zig-wayland/archive/v0.4.0.tar.gz";
+      hash = "sha256-ulIII5iJpM/W/VJB0HcdktEO2eb9T9J0ln2A1Z94dU4=";
     };
   }
 ]
diff --git a/pkgs/by-name/ri/rivercarro/package.nix b/pkgs/by-name/ri/rivercarro/package.nix
index 3e907f1d0648..4e6cc44df1a0 100644
--- a/pkgs/by-name/ri/rivercarro/package.nix
+++ b/pkgs/by-name/ri/rivercarro/package.nix
@@ -8,22 +8,21 @@
   wayland,
   wayland-protocols,
   wayland-scanner,
-  zig_0_14,
+  zig_0_15,
 }:
 
 let
-  zig = zig_0_14;
+  zig = zig_0_15;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "rivercarro";
-  version = "0.6.0-unstable-2025-03-19";
+  version = "0.6.0";
 
   src = fetchFromSourcehut {
     owner = "~novakane";
     repo = "rivercarro";
-    rev = "199800235645a1771e2551a64d5b4f5e2601888c";
-    fetchSubmodules = true;
-    hash = "sha256-im26hiRi24tLCSvLnIdcnIWml5kTs7YSCAC8o9mcR+M=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-7GXtQEOxFE9PWEeFo6HgNcgs/ySwmJwrskJJ3ZSg0XU=";
   };
 
   nativeBuildInputs = [
@@ -39,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: {
     ln -s ${callPackage ./deps.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://git.sr.ht/~novakane/rivercarro";
     description = "Layout generator for river Wayland compositor, fork of rivertile";
     longDescription = ''
@@ -53,8 +52,8 @@ stdenv.mkDerivation (finalAttrs: {
       - Limit the width of the usable area of the screen.
     '';
     changelog = "https://git.sr.ht/~novakane/rivercarro/refs/v${finalAttrs.version}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ kraem ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ kraem ];
     inherit (zig.meta) platforms;
     mainProgram = "rivercarro";
   };