hyprlock: 0.4.1 -> 0.5.0; sdbus-cpp_2: init at 2.0.0 (#350391)

pkgs/by-name/hy/hyprlock/package.nix

@@ -9,6 +9,8 @@
   hyprlang,
   hyprutils,
   pam,
+  sdbus-cpp_2,
+  systemdLibs,
   wayland,
   wayland-protocols,
   wayland-scanner,
@@ -24,13 +26,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hyprlock";
-  version = "0.4.1";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprlock";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-w+AyYuqlZ/uWEimiptlHjtDFECm/JlUOD2ciCw8/+/8=";
+    hash = "sha256-sUIsjWpZLplSJXWyJcDZdvDweksXLH5r9GSkwg0kgBw=";
   };
 
   strictDeps = true;
@@ -54,6 +56,8 @@ stdenv.mkDerivation (finalAttrs: {
     mesa
     pam
     pango
+    sdbus-cpp_2
+    systemdLibs
     wayland
     wayland-protocols
   ];

pkgs/development/libraries/sdbus-cpp/default.nix

@@ -1,53 +1,71 @@
-{ lib
+{
-, stdenv
+  lib,
-, fetchFromGitHub
+  stdenv,
-, cmake
+  fetchFromGitHub,
-, expat
+  cmake,
-, pkg-config
+  expat,
-, systemd
+  pkg-config,
+  systemdLibs,
 }:
+let
+  generic =
+    {
+      version,
+      rev ? "v${version}",
+      hash,
+    }:
+    stdenv.mkDerivation (finalAttrs: {
+      pname = "sdbus-cpp";
+      inherit version;
 
-stdenv.mkDerivation rec {
+      src = fetchFromGitHub {
-  pname = "sdbus-cpp";
+        owner = "kistler-group";
-  version = "1.5.0";
+        repo = "sdbus-cpp";
+        inherit rev hash;
+      };
 
-  src = fetchFromGitHub {
+      nativeBuildInputs = [
-    owner = "kistler-group";
+        cmake
-    repo = "sdbus-cpp";
+        pkg-config
-    rev = "v${version}";
+      ];
+
+      buildInputs = [
+        expat
+        systemdLibs
+      ];
+
+      cmakeFlags = [
+        (lib.cmakeBool "BUILD_CODE_GEN" true)
+      ];
+
+      meta = {
+        homepage = "https://github.com/Kistler-Group/sdbus-cpp";
+        changelog = "https://github.com/Kistler-Group/sdbus-cpp/blob/v${version}/ChangeLog";
+        description = "High-level C++ D-Bus library designed to provide easy-to-use yet powerful API";
+        longDescription = ''
+          sdbus-c++ is a high-level C++ D-Bus library for Linux designed to provide
+          expressive, easy-to-use API in modern C++.
+          It adds another layer of abstraction on top of sd-bus, a nice, fresh C
+          D-Bus implementation by systemd.
+          It's been written primarily as a replacement of dbus-c++, which currently
+          suffers from a number of (unresolved) bugs, concurrency issues and
+          inherent design complexities and limitations.
+        '';
+        license = lib.licenses.lgpl2Only;
+        maintainers = [ ];
+        platforms = lib.platforms.linux;
+        mainProgram = "sdbus-c++-xml2cpp";
+      };
+    });
+in
+{
+  sdbus-cpp = generic {
+    version = "1.5.0";
     hash = "sha256-oO8QNffwNI245AEPdutOGqxj4qyusZYK3bZWLh2Lcag=";
   };
 
-  nativeBuildInputs = [
+  sdbus-cpp_2 = generic {
-    cmake
+    version = "2.0.0";
-    pkg-config
+    hash = "sha256-W8V5FRhV3jtERMFrZ4gf30OpIQLYoj2yYGpnYOmH2+g=";
-  ];
-
-  buildInputs = [
-    expat
-    systemd
-  ];
-
-  cmakeFlags = [
-    "-DBUILD_CODE_GEN=ON"
-  ];
-
-  meta = {
-    homepage = "https://github.com/Kistler-Group/sdbus-cpp";
-    changelog = "https://github.com/Kistler-Group/sdbus-cpp/blob/v${version}/ChangeLog";
-    description = "High-level C++ D-Bus library designed to provide easy-to-use yet powerful API";
-    longDescription = ''
-      sdbus-c++ is a high-level C++ D-Bus library for Linux designed to provide
-      expressive, easy-to-use API in modern C++.
-      It adds another layer of abstraction on top of sd-bus, a nice, fresh C
-      D-Bus implementation by systemd.
-      It's been written primarily as a replacement of dbus-c++, which currently
-      suffers from a number of (unresolved) bugs, concurrency issues and
-      inherent design complexities and limitations.
-    '';
-    license = lib.licenses.lgpl2Only;
-    maintainers = [ ];
-    platforms = lib.platforms.linux;
-    mainProgram = "sdbus-c++-xml2cpp";
   };
 }

pkgs/top-level/all-packages.nix

@@ -1912,7 +1912,7 @@ with pkgs;
 
   scarab = callPackage ../tools/games/scarab { };
 
-  sdbus-cpp = callPackage ../development/libraries/sdbus-cpp { };
+  inherit (callPackage ../development/libraries/sdbus-cpp { }) sdbus-cpp sdbus-cpp_2;
 
   sdlookup = callPackage ../tools/security/sdlookup { };