From 2a9fd371556b4ecf2f7d3816f5ec91269fc91264 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Aug 2025 21:52:00 +0000 Subject: [PATCH 1/2] lyra: 1.6.1 -> 1.7.0 --- pkgs/by-name/ly/lyra/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ly/lyra/package.nix b/pkgs/by-name/ly/lyra/package.nix index a52e8896e9e4..edb94873f5dc 100644 --- a/pkgs/by-name/ly/lyra/package.nix +++ b/pkgs/by-name/ly/lyra/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "lyra"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "bfgroup"; repo = "lyra"; rev = version; - sha256 = "sha256-tS2SPLiKaL8C35AmOXyJPstFUfynkE/A53rurqiySbI="; + sha256 = "sha256-X8wJwSfOo7v2SKYrKJ4RhpEmOdEkS8lPHIqCxP46VF4="; }; nativeBuildInputs = [ From a4cc33007a8ebc2dde9a684ad4cdeea68fc1ad3a Mon Sep 17 00:00:00 2001 From: wrvsrx Date: Thu, 28 Aug 2025 01:11:26 +0800 Subject: [PATCH 2/2] sycl-info: fix its build fix compilation failure caused by bumping lyra from 1.6.1 to 1.7.0 --- pkgs/by-name/sy/sycl-info/fix-lyra-message.patch | 12 ++++++++++++ pkgs/by-name/sy/sycl-info/package.nix | 5 +++++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/by-name/sy/sycl-info/fix-lyra-message.patch diff --git a/pkgs/by-name/sy/sycl-info/fix-lyra-message.patch b/pkgs/by-name/sy/sycl-info/fix-lyra-message.patch new file mode 100644 index 000000000000..de7b1172bd42 --- /dev/null +++ b/pkgs/by-name/sy/sycl-info/fix-lyra-message.patch @@ -0,0 +1,12 @@ +diff '--color=auto' -u -r old/sycl-info/cli_config.hpp new/sycl-info/cli_config.hpp +--- old/sycl-info/cli_config.hpp 2025-08-28 01:01:14.403357414 +0800 ++++ new/sycl-info/cli_config.hpp 2025-08-28 01:02:11.256702715 +0800 +@@ -42,7 +42,7 @@ + auto cli = make_cli(); + auto result = cli.parse(lyra::args(argc, argv)); + if (!result) { +- raise_error(result.errorMessage(), cli); ++ raise_error(result.message(), cli); + } + } + diff --git a/pkgs/by-name/sy/sycl-info/package.nix b/pkgs/by-name/sy/sycl-info/package.nix index d660decefbb8..5393add533ae 100644 --- a/pkgs/by-name/sy/sycl-info/package.nix +++ b/pkgs/by-name/sy/sycl-info/package.nix @@ -23,6 +23,11 @@ stdenv.mkDerivation { sha256 = "0fy0y1rcfb11p3vijd8wym6xkaicav49pv2bv2l18rma929n1m1m"; }; + patches = [ + # fix error caused by upgrading lyra from 1.6.1 to 1.7.0 + ./fix-lyra-message.patch + ]; + buildInputs = [ nlohmann_json ronn