From 668c37f70926e93e93a9262296b38ab87e662d95 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 1 May 2026 16:08:39 -0400 Subject: [PATCH 1/5] aml: 0.3.0 -> 1.0.0 Diff: https://github.com/any1/aml/compare/v0.3.0...v1.0.0 --- pkgs/by-name/am/aml/package.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/am/aml/package.nix b/pkgs/by-name/am/aml/package.nix index c55e9dc25011..b185ffb70378 100644 --- a/pkgs/by-name/am/aml/package.nix +++ b/pkgs/by-name/am/aml/package.nix @@ -3,33 +3,34 @@ stdenv, fetchFromGitHub, meson, - pkg-config, ninja, }: stdenv.mkDerivation (finalAttrs: { pname = "aml"; - version = "0.3.0"; + version = "1.0.0"; src = fetchFromGitHub { owner = "any1"; repo = "aml"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-BX+MRqvnwwLPhz22m0gfJ2EkW31KQEi/YTgOCMcQk2Q="; + hash = "sha256-10gm6YphZrpLShj3NUj/AG24dSVLZAZbbnXr7GiF4DI="; }; nativeBuildInputs = [ meson - pkg-config ninja ]; + strictDeps = true; + + __structuredAttrs = true; + meta = { - description = "Another main loop"; - inherit (finalAttrs.src.meta) homepage; + description = "Andri's Main Loop"; + homepage = "https://github.com/any1/aml"; license = lib.licenses.isc; - platforms = lib.platforms.unix; - maintainers = [ ]; - broken = stdenv.hostPlatform.isDarwin; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ nickcao ]; }; }) From 5b9438fa89e52b663f5188932f8b9472317b6683 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 1 May 2026 16:00:23 -0400 Subject: [PATCH 2/5] neatvnc: 0.9.6 -> 1.0.0 Diff: https://github.com/any1/neatvnc/compare/v0.9.6...v1.0.0 Changelog: https://github.com/any1/neatvnc/releases/tag/v1.0.0 --- pkgs/by-name/ne/neatvnc/package.nix | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ne/neatvnc/package.nix b/pkgs/by-name/ne/neatvnc/package.nix index 4acbb12b429a..4d0730f08e66 100644 --- a/pkgs/by-name/ne/neatvnc/package.nix +++ b/pkgs/by-name/ne/neatvnc/package.nix @@ -8,21 +8,25 @@ aml, ffmpeg, gnutls, + libdrm, libjpeg_turbo, libgbm, + nettle, pixman, zlib, + python3, + openssl, }: stdenv.mkDerivation (finalAttrs: { pname = "neatvnc"; - version = "0.9.6"; + version = "1.0.0"; src = fetchFromGitHub { owner = "any1"; repo = "neatvnc"; rev = "v${finalAttrs.version}"; - hash = "sha256-VStlTsfXbFxTnRGdK1y7MLtCzxbHzraw5GGph3sS/kI="; + hash = "sha256-yEWNiazRxc8G7ToqOcTtCXEuBCgXO64v31Xx1YeOPCM="; }; strictDeps = true; @@ -37,17 +41,26 @@ stdenv.mkDerivation (finalAttrs: { aml ffmpeg gnutls + libdrm libjpeg_turbo libgbm + nettle pixman zlib ]; - mesonFlags = [ - (lib.mesonBool "tests" true) + nativeCheckInputs = [ + python3 + openssl ]; - doCheck = true; + mesonFlags = [ + (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck) + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + __structuredAttrs = true; meta = { description = "VNC server library"; From e7362d22b944e6a6cbf781b1593dd11db02af011 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 1 May 2026 16:20:42 -0400 Subject: [PATCH 3/5] wayvnc: 0.9.1 -> 0.10.0 Diff: https://github.com/any1/wayvnc/compare/v0.9.1...v0.10.0 Changelog: https://github.com/any1/wayvnc/releases/tag/v0.10.0 --- pkgs/by-name/wa/wayvnc/package.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/wa/wayvnc/package.nix b/pkgs/by-name/wa/wayvnc/package.nix index d300c7b36fe7..e9adab82fde4 100644 --- a/pkgs/by-name/wa/wayvnc/package.nix +++ b/pkgs/by-name/wa/wayvnc/package.nix @@ -9,6 +9,7 @@ wayland-scanner, aml, jansson, + libdrm, libxkbcommon, libgbm, neatvnc, @@ -19,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wayvnc"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "any1"; repo = "wayvnc"; rev = "v${finalAttrs.version}"; - hash = "sha256-LINzkC18gitj1a8Giqlt/6LyydOdV+8YXRJmuxT/Nq8="; + hash = "sha256-+CAH2jcIIQqImonWeWxMQyTtEEuuQlaGyl/ajPfClh8="; }; strictDeps = true; @@ -45,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ aml jansson + libdrm libxkbcommon libgbm neatvnc @@ -54,10 +56,12 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ - (lib.mesonBool "tests" true) + (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck) ]; - doCheck = true; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + __structuredAttrs = true; meta = { description = "VNC server for wlroots based Wayland compositors"; @@ -68,11 +72,11 @@ stdenv.mkDerivation (finalAttrs: { headless one, so it is also possible to run wayvnc without a physical display attached. ''; - mainProgram = "wayvnc"; - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/any1/wayvnc"; changelog = "https://github.com/any1/wayvnc/releases/tag/v${finalAttrs.version}"; license = lib.licenses.isc; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ nickcao ]; + mainProgram = "wayvnc"; }; }) From 09d3dec8cb42950e46f6543f07205097325165c7 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 12 May 2026 12:28:37 -0400 Subject: [PATCH 4/5] weston: 15.0.0 -> 15.0.1 Diff: https://gitlab.freedesktop.org/wayland/weston/-/compare/15.0.0...15.0.1 --- pkgs/by-name/we/weston/package.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/we/weston/package.nix b/pkgs/by-name/we/weston/package.nix index 0a552ce1b95c..921656aae6ca 100644 --- a/pkgs/by-name/we/weston/package.nix +++ b/pkgs/by-name/we/weston/package.nix @@ -56,22 +56,23 @@ stdenv.mkDerivation (finalAttrs: { pname = "weston"; - version = "15.0.0"; + version = "15.0.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "wayland"; repo = "weston"; rev = finalAttrs.version; - hash = "sha256-7FbQkXazsf6FkkNbE+Q6ilKACFa/CoOL2Q1oXHuaVX8="; + hash = "sha256-c6h8GQt1S3t2+K+8A4ncxBtWLtaV61EABdYA55o9i4o="; }; - # Backport for https://gitlab.freedesktop.org/wayland/weston/-/issues/1100 patches = [ + # backend-vnc, gitlab-ci: Update to Neat VNC 1.0.0, aml 1.0.0 + # https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/2064 (fetchpatch { - name = "weston-upstream-assertion-fix.patch"; - url = "https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/1993.patch"; - hash = "sha256-705GIM7drTzv0N5Hk5dO18LWBnhhi1VoX8sfITHRYc4="; + url = "https://gitlab.freedesktop.org/wayland/weston/-/commit/8a1c91e771312d1e0d0cd92495ef717402784dae.patch"; + hash = "sha256-9eBONM7OfzHhCuT8Wnq534KS51q2VtUyOOLjYHohEds="; + excludes = [ ".gitlab-ci.yml" ]; }) ]; From 1bbd587ee37deb7069f862053e6d146df655b884 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 12 Jun 2026 14:58:51 -0400 Subject: [PATCH 5/5] wlvncc: 0-unstable-2025-07-07 -> 0-unstable-2026-04-29 Diff: https://github.com/any1/wlvncc/compare/bc6063aeacd4fbe9ac8f58f4ba3c5388b3e1f1f2...cc0abf87c37920540f2439a556e6a480c28f8f46 --- pkgs/by-name/wl/wlvncc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wl/wlvncc/package.nix b/pkgs/by-name/wl/wlvncc/package.nix index 33209a300ed9..b2abde634167 100644 --- a/pkgs/by-name/wl/wlvncc/package.nix +++ b/pkgs/by-name/wl/wlvncc/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation { pname = "wlvncc"; - version = "0-unstable-2025-07-07"; + version = "0-unstable-2026-04-29"; src = fetchFromGitHub { owner = "any1"; repo = "wlvncc"; - rev = "bc6063aeacd4fbe9ac8f58f4ba3c5388b3e1f1f2"; - hash = "sha256-Udu/CtrNBqnlgZCK2cS8VWNTfHJGXdijTnNIWnAW2Nw="; + rev = "cc0abf87c37920540f2439a556e6a480c28f8f46"; + hash = "sha256-VPZJd4/yerWZeLl+NVH1EDtSokeS/XMS6lQUXOn9a7Q="; }; nativeBuildInputs = [