From c1bc3702c8efc0cc5a360611da926c9388eac0c6 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 25 Feb 2024 12:38:16 -0500 Subject: [PATCH 1/3] neatvnc: 0.7.2 -> 0.8.0 Diff: https://github.com/any1/neatvnc/compare/v0.7.2...v0.8.0 Changelog: https://github.com/any1/neatvnc/releases/tag/v0.8.0 --- pkgs/development/libraries/neatvnc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/neatvnc/default.nix b/pkgs/development/libraries/neatvnc/default.nix index 281689c60b67..2680dbd1ae92 100644 --- a/pkgs/development/libraries/neatvnc/default.nix +++ b/pkgs/development/libraries/neatvnc/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "sha256-S2LMD15MYd/t/Z8B1OQ0hVrZQLR6Gf4LB45mhmDwblg="; + hash = "sha256-BArEaQa+CNGzIoENsZSj9seFx9qdCLWiejh6EvpTch8="; }; strictDeps = true; From 336e85aec411e2550315ccfdcc03a36249f6fdd8 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Sun, 25 Feb 2024 12:39:49 -0500 Subject: [PATCH 2/3] wayvnc: 0.7.2 -> 0.8.0 Diff: https://github.com/any1/wayvnc/compare/v0.7.2...v0.8.0 Changelog: https://github.com/any1/wayvnc/releases/tag/v0.8.0 --- pkgs/applications/networking/remote/wayvnc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/wayvnc/default.nix b/pkgs/applications/networking/remote/wayvnc/default.nix index 19d19310591d..0712e68e324b 100644 --- a/pkgs/applications/networking/remote/wayvnc/default.nix +++ b/pkgs/applications/networking/remote/wayvnc/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "wayvnc"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6at0p1Xc25K5l6sq2uMWpaLVvZMNlWC0ybyZyrIw41I="; + hash = "sha256-IGEM212CU91+pT8xq3BzrPrIDUZxZveb2jhatMGJAsw="; }; strictDeps = true; From ba82f247314d304e98e9a08af2b91de23bafe77d Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 12 Mar 2024 16:48:51 -0400 Subject: [PATCH 3/3] weston: raise neatvnc version bound to 0.8.0 --- pkgs/applications/window-managers/weston/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 34532411888c..b4472425324e 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -26,6 +26,13 @@ stdenv.mkDerivation rec { hash = "sha256-Uv8dSqI5Si5BbIWjOLYnzpf6cdQ+t2L9Sq8UXTb8eVo="; }; + postPatch = '' + # raise neatvnc version bound to 0.8.0 + # https://gitlab.freedesktop.org/wayland/weston/-/issues/890 + substituteInPlace libweston/backend-vnc/meson.build \ + --replace-fail "'neatvnc', version: ['>= 0.7.0', '< 0.8.0']" "'neatvnc', version: ['>= 0.7.0', '<= 0.8.0']" + ''; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config python3 wayland-scanner ]; buildInputs = [