From 066f101c193f679a924194d24464f18e4dcb9f51 Mon Sep 17 00:00:00 2001 From: etwas Date: Tue, 30 Sep 2025 15:45:42 +0200 Subject: [PATCH 1/4] maintainers: add etwas --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ad373cd39fc5..2d3a61633c3a 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -7925,6 +7925,12 @@ name = "Elis Hirwing"; keys = [ { fingerprint = "67FE 98F2 8C44 CF22 1828 E12F D57E FA62 5C9A 925F"; } ]; }; + etwas = { + email = "ein@etwas.me"; + github = "eetwas"; + githubId = 74488187; + name = "etwas"; + }; eu90h = { email = "stefan@eu90h.com"; github = "eu90h"; From 39d379c9a8bc41348515c6ac2d813113fc9c3a5d Mon Sep 17 00:00:00 2001 From: etwas Date: Tue, 30 Sep 2025 20:29:57 +0200 Subject: [PATCH 2/4] sdbus-cpp{,_2}: add etwas to maintainers --- pkgs/development/libraries/sdbus-cpp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/sdbus-cpp/default.nix b/pkgs/development/libraries/sdbus-cpp/default.nix index 94f56bd914f4..e6ed30dd149a 100644 --- a/pkgs/development/libraries/sdbus-cpp/default.nix +++ b/pkgs/development/libraries/sdbus-cpp/default.nix @@ -52,7 +52,7 @@ let inherent design complexities and limitations. ''; license = lib.licenses.lgpl2Only; - maintainers = [ ]; + maintainers = with lib.maintainers; [ etwas ]; platforms = lib.platforms.linux; mainProgram = "sdbus-c++-xml2cpp"; }; From 558b212024041c84df14b3dd01b7dc26c169ef26 Mon Sep 17 00:00:00 2001 From: etwas Date: Tue, 30 Sep 2025 20:30:13 +0200 Subject: [PATCH 3/4] sdbus-cpp{,_2}: fix cmake flags --- pkgs/development/libraries/sdbus-cpp/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/sdbus-cpp/default.nix b/pkgs/development/libraries/sdbus-cpp/default.nix index e6ed30dd149a..dbafce9ac1cc 100644 --- a/pkgs/development/libraries/sdbus-cpp/default.nix +++ b/pkgs/development/libraries/sdbus-cpp/default.nix @@ -35,7 +35,9 @@ let ]; cmakeFlags = [ - (lib.cmakeBool "BUILD_CODE_GEN" true) + (lib.cmakeBool ( + if lib.versionOlder finalAttrs.version "2.0.0" then "BUILD_CODE_GEN" else "SDBUSCPP_BUILD_CODEGEN" + ) true) ]; meta = { From e572bee1e1ee3e8e85272573eb05d27b493e3f5a Mon Sep 17 00:00:00 2001 From: etwas Date: Tue, 30 Sep 2025 20:30:24 +0200 Subject: [PATCH 4/4] sdbus-cpp_2: 2.0.0 -> 2.1.0 --- pkgs/development/libraries/sdbus-cpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sdbus-cpp/default.nix b/pkgs/development/libraries/sdbus-cpp/default.nix index dbafce9ac1cc..5faa617b441d 100644 --- a/pkgs/development/libraries/sdbus-cpp/default.nix +++ b/pkgs/development/libraries/sdbus-cpp/default.nix @@ -67,7 +67,7 @@ in }; sdbus-cpp_2 = generic { - version = "2.0.0"; - hash = "sha256-W8V5FRhV3jtERMFrZ4gf30OpIQLYoj2yYGpnYOmH2+g="; + version = "2.1.0"; + hash = "sha256-JnjabBr7oELLsUV9a+dAAaRyUzaMIriu90vkaVJg2eY="; }; }