diff --git a/flake.lock b/flake.lock index 3019992..d3f77ea 100644 --- a/flake.lock +++ b/flake.lock @@ -3,11 +3,11 @@ "janet-pkgs": { "flake": false, "locked": { - "lastModified": 1768783276, - "narHash": "sha256-VPzMcRq8oerlHwDegKaqP6MpOMsUprDAAzyqrI7YEY8=", + "lastModified": 1786619609, + "narHash": "sha256-fCA+/CcS9jMPz6WXY6UmPEOU0vHVaA1+S52QMV669Bk=", "owner": "janet-lang", "repo": "pkgs", - "rev": "36e69933328cc7ac98ac8d59fca315906cd82384", + "rev": "1fcf04ec3abdff869232a38930fb357052189d45", "type": "github" }, "original": { @@ -51,11 +51,11 @@ "lemongrass": { "flake": false, "locked": { - "lastModified": 1765024507, - "narHash": "sha256-OUqK57EYh6McnxnbvqoPm92eBMYM5iNaPuN6R0yZHA4=", + "lastModified": 1786160845, + "narHash": "sha256-YMK+vYsXlujH5HyYKKPgiF3+2vpvGXIAEhsh0IHe1no=", "owner": "pyrmont", "repo": "lemongrass", - "rev": "906974b82ba06ed421e0c8cd9a56c6ddc4ca6820", + "rev": "494e2835138b23f75bc8ffb3e0940491ca45696f", "type": "github" }, "original": { @@ -66,11 +66,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1780750590, - "narHash": "sha256-1TMOErEkQatevyUn4Y/wpriZuj+8a8GFdqITzDuWDMw=", + "lastModified": 1788453257, + "narHash": "sha256-ifjnnUKt0L1EDCOPfKnmuhGYieiMU7kTMoEs7ilaR7A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4bb2f933a726f6164c2c7066ca03f5684de94f2a", + "rev": "1a662c3d6251125fd069fecc30faeea85dff4c20", "type": "github" }, "original": { @@ -82,11 +82,11 @@ "river": { "flake": false, "locked": { - "lastModified": 1780581500, - "narHash": "sha256-ufnhCOsVa8QGZGsmTrYRdC9fN+Z5ma7j5Cjxvn9Dhik=", + "lastModified": 1788442116, + "narHash": "sha256-rHWlDaEtO0NzZPbd5swLYTxkBTRK6Vt4tRKWf1U7wNo=", "ref": "main", - "rev": "76b9f619c74a1ddebfad3c798b189b5458b06009", - "revCount": 1721, + "rev": "ce0922c1848bf341db325609be5809e08e6e82b8", + "revCount": 1757, "type": "git", "url": "https://codeberg.org/river/river.git" }, @@ -110,11 +110,11 @@ "spork": { "flake": false, "locked": { - "lastModified": 1776515126, - "narHash": "sha256-4oKmRjwDMRwlnntHOh3k2XG3pNxQ239Hgvw7zlokoCQ=", + "lastModified": 1788443601, + "narHash": "sha256-gAt1lH1hE7RETlmBCPT98kUuDSkaztRBU1+QcN+A9Eg=", "owner": "janet-lang", "repo": "spork", - "rev": "993887a8dbc9387af3b037418f02ef8e2b42b275", + "rev": "e4b4db5d2c1b29563e8cf203738283dd7149dcc0", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 44ad031..edb1a79 100644 --- a/flake.nix +++ b/flake.nix @@ -87,14 +87,7 @@ src = ./.; nativeBuildInputs = [pkgs.pkg-config janet-pm]; buildInputs = [ - (pkgs.wayland.overrideAttrs (final: prev: { - # patches = [ - # (pkgs.fetchpatch { - # url = "https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/485.patch"; - # hash = "sha256-gd5BRE/ioFMM86Q8HLSzdvuwDDaqws0b3HiInC0nNgQ="; - # }) - # ]; - })) + pkgs.wayland pkgs.wayland-scanner pkgs.wayland-protocols pkgs.libxkbcommon diff --git a/river.build.zig.zon.nix b/river.build.zig.zon.nix index e8f714b..7d15459 100644 --- a/river.build.zig.zon.nix +++ b/river.build.zig.zon.nix @@ -4,11 +4,10 @@ linkFarm "zig-packages" [ { - name = "aro-0.0.0-JSD1Qi7QNgDnfcrdEJf82v3o6MhZySjYVrtdfEf3E4Se"; - path = fetchgit { - url = "https://github.com/Vexu/arocc"; - rev = "5f5a050569a95ecc40a426f0c3666ae7ef987ede"; - hash = "sha256-f8Z0SXWx5Uia2TCMB5SUpcO8+xUnaWk32Oknva7xcxw="; + name = "aro-0.0.0-JSD1QmbSNgDrBkBPRoDPwy1rN1ABGBa7B1NzC-lqnGxw"; + path = fetchzip { + url = "https://codeberg.org/ifreund/arocc/archive/0.16.x.tar.gz"; + hash = "sha256-UjLpDXeD5supXFUpa4+q9Uc9aTVglZrIp6pM1qyv1+A="; }; } { @@ -19,11 +18,11 @@ linkFarm "zig-packages" [ }; } { - name = "translate_c-0.0.0-Q_BUWlX1BgCD1wo6uo97prlp9VJ4gxAjwN_vZ7nsSjGN"; + name = "translate_c-0.0.0-Q_BUWlL1BgD7PmL27vTsccyNCOvKb-B65O5Ki1ZKm-ED"; path = fetchgit { - url = "https://codeberg.org/ziglang/translate-c/"; - rev = "57c559cf581b1fcad90494eda219f98abeb155ce"; - hash = "sha256-7OlW2f5tRc1UZySDcEQERsLGChSxIcJAiVWdvuFUvvY="; + url = "https://codeberg.org/ifreund/translate-c/"; + rev = "64570104eeed461dc221e77574cd3f1c5b7eb974"; + hash = "sha256-ZQnT0XeVxcs5Px1Y8pNvqUOXzj0UnVC+Ijnr5ePvF/M="; }; } { @@ -40,13 +39,6 @@ linkFarm "zig-packages" [ hash = "sha256-cfzHJ2ziiCkMyNlIo6I9o/NjaZGrsv22hq41WYwCnpk="; }; } - { - name = "xkbcommon-0.3.0-VDqIe3K9AQB2fG5ZeRcMC9i7kfrp5m2rWgLrmdNn9azr"; - path = fetchzip { - url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.3.0.tar.gz"; - hash = "sha256-e5bPEfxl4SQf0cqccLt/py1KOW1+Q1+kWZUEXBbh9oQ="; - }; - } { name = "xkbcommon-0.4.0-VDqIe0i2AgDRsok2GpMFYJ8SVhQS10_PI2M_CnHXsJJZ"; path = fetchzip {