Update river

flake.nix

@@ -8,12 +8,32 @@
     url = "github:janet-lang/spork";
     flake = false;
   };
+  inputs.janet-pkgs = {
+    url = "github:janet-lang/pkgs";
+    flake = false;
+  };
+  inputs.lemongrass = {
+    url = "github:pyrmont/lemongrass";
+    flake = false;
+  };
+  inputs.janet-wayland = {
+    url = "git+https://codeberg.org/ifreund/janet-wayland";
+    flake = false;
+  };
+  inputs.janet-xkbcommon = {
+    url = "git+https://codeberg.org/ifreund/janet-xkbcommon";
+    flake = false;
+  };
 
   outputs = inputs @ {
     self,
     nixpkgs,
     river,
     spork,
+    janet-pkgs,
+    lemongrass,
+    janet-wayland,
+    janet-xkbcommon,
   }: let
     systems = ["x86_64-linux" "aarch64-linux"];
     eachSystem = f:
@@ -29,17 +49,6 @@
       system,
       ...
     }: let
-      libxkbcommon = pkgs.libxkbcommon.overrideAttrs {
-        version = "1.12.0";
-        src = pkgs.fetchFromGitHub {
-          owner = "xkbcommon";
-          repo = "libxkbcommon";
-          tag = "xkbcommon-1.12.0";
-          hash = "sha256-QO3snl7NiyS2ao2MF3eT/lkNmVBjijr3JdTyrPn/2MQ=";
-        };
-        patches = [];
-        doCheck = false;
-      };
       janet-pm = pkgs.stdenv.mkDerivation {
         pname = "janet-pm";
         version = "1.1.1";
@@ -58,7 +67,7 @@
         src = inputs.river;
         deps = pkgs.callPackage ./river.build.zig.zon.nix {};
         zigBuildFlags = ["--system" "${finalAttrs.deps}" "-Dxwayland"];
-        nativeBuildInputs = with pkgs; [pkg-config wayland-scanner xwayland zig_0_15.hook];
+        nativeBuildInputs = with pkgs; [pkg-config wayland-scanner xwayland zig_0_16.hook];
         buildInputs = with pkgs; [
           libGL
           libevdev
@@ -67,12 +76,10 @@
           udev
           wayland
           wayland-protocols
-          wlroots_0_19
+          wlroots_0_20
           libx11
           libxkbcommon
         ];
-
-        dontConfigure = true;
       });
       default = pkgs.stdenv.mkDerivation {
         pname = "censtablo";
@@ -81,50 +88,26 @@
         nativeBuildInputs = [pkgs.pkg-config janet-pm];
         buildInputs = [
           (pkgs.wayland.overrideAttrs (final: prev: {
-            patches =
-              prev.patches
-              ++ [
-                (pkgs.fetchpatch {
-                  url = "https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/485.patch";
-                  hash = "sha256-gd5BRE/ioFMM86Q8HLSzdvuwDDaqws0b3HiInC0nNgQ=";
-                })
-              ];
+            # patches = [
+            #     (pkgs.fetchpatch {
+            #       url = "https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/485.patch";
+            #       hash = "sha256-gd5BRE/ioFMM86Q8HLSzdvuwDDaqws0b3HiInC0nNgQ=";
+            #     })
+            #   ];
           }))
           pkgs.wayland-scanner
           pkgs.wayland-protocols
-          libxkbcommon
+          pkgs.libxkbcommon
           pkgs.janet
         ];
 
         RIVER_PROTOCOLS = "${inputs.river}/protocol/";
         deps = [
-          "${pkgs.fetchFromGitHub {
-            owner = "janet-lang";
-            repo = "pkgs";
-            rev = "master";
-            hash = "sha256-VPzMcRq8oerlHwDegKaqP6MpOMsUprDAAzyqrI7YEY8=";
-          }}:git__https___github.com_janet-lang_pkgs.git"
+          "${janet-pkgs}:git__https___github.com_janet-lang_pkgs.git"
           "${spork}:git__https___github.com_janet-lang_spork"
-          "${pkgs.fetchFromGitHub {
-            owner = "pyrmont";
-            repo = "lemongrass";
-            rev = "master";
-            hash = "sha256-OUqK57EYh6McnxnbvqoPm92eBMYM5iNaPuN6R0yZHA4=";
-          }}:git__https___github.com_pyrmont_lemongrass"
-          "${pkgs.fetchFromGitea {
-            domain = "codeberg.org";
-            owner = "ifreund";
-            repo = "janet-wayland";
-            rev = "189eb3b2e3a87a676b7f682d8cf1764bb6eb457f";
-            hash = "sha256-dIGjPeBL8/enIwwrSMqNdSOtBWnyo1ioHSLcL1VN2uI=";
-          }}:git__https___codeberg.org_ifreund_janet-wayland"
-          "${pkgs.fetchFromGitea {
-            domain = "codeberg.org";
-            owner = "ifreund";
-            repo = "janet-xkbcommon";
-            rev = "main";
-            hash = "sha256-W7X1ABu1v2+sqZ29OICiYYaFixxXo4uclYfsF4OMAPE=";
-          }}:git__https___codeberg.org_ifreund_janet-xkbcommon"
+          "${lemongrass}:git__https___github.com_pyrmont_lemongrass"
+          "${janet-wayland}:git__https___codeberg.org_ifreund_janet-wayland"
+          "${janet-xkbcommon}:git__https___codeberg.org_ifreund_janet-xkbcommon"
         ];
 
         buildPhase = ''
@@ -163,7 +146,7 @@
       default = pkgs.mkShell {
         inputsFrom = [ownPkgs.default];
         inherit (ownPkgs.default) RIVER_PROTOCOLS;
-        packages = [ownPkgs.janet-pm];
+        packages = [ownPkgs.janet-pm ownPkgs.river];
         shellHook = ''
           export JANET_PATH="$PWD/.jpm"
           mkdir -p $JANET_PATH