Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs

Conflicts:
	nixpkgs/nixos/modules/config/console.nix
	nixpkgs/nixos/modules/services/mail/mailman.nix
	nixpkgs/nixos/modules/services/mail/public-inbox.nix
	nixpkgs/nixos/modules/services/mail/rss2email.nix
	nixpkgs/nixos/modules/services/networking/ssh/sshd.nix
	nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix
	nixpkgs/pkgs/applications/networking/irc/weechat/default.nix
	nixpkgs/pkgs/applications/window-managers/sway/default.nix
	nixpkgs/pkgs/build-support/go/module.nix
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix
	nixpkgs/pkgs/development/interpreters/python/default.nix
	nixpkgs/pkgs/development/node-packages/overrides.nix
	nixpkgs/pkgs/development/tools/b4/default.nix
	nixpkgs/pkgs/servers/dict/dictd-db.nix
	nixpkgs/pkgs/servers/mail/public-inbox/default.nix
	nixpkgs/pkgs/tools/security/pinentry/default.nix
	nixpkgs/pkgs/tools/text/unoconv/default.nix
	nixpkgs/pkgs/top-level/all-packages.nix

1 files changed, 14 insertions, 11 deletions

diff --git a/nixpkgs/pkgs/development/libraries/sdbus-cpp/default.nix b/nixpkgs/pkgs/development/libraries/sdbus-cpp/default.nix
index e354b3141a78..06650fce00ad 100644
--- a/nixpkgs/pkgs/development/libraries/sdbus-cpp/default.nix
+++ b/nixpkgs/pkgs/development/libraries/sdbus-cpp/default.nix
@@ -2,9 +2,9 @@
 , stdenv
 , fetchFromGitHub
 , cmake
+, expat
 , pkg-config
 , systemd
-, expat
 }:
 
 stdenv.mkDerivation rec {
@@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
     owner = "kistler-group";
     repo = "sdbus-cpp";
     rev = "v${version}";
-    sha256 = "sha256-EX/XLgqUwIRosLu3Jgtpp42Yt6Tf22Htj9JULoUL7ao=";
+    hash = "sha256-EX/XLgqUwIRosLu3Jgtpp42Yt6Tf22Htj9JULoUL7ao=";
   };
 
   nativeBuildInputs = [
@@ -24,27 +24,30 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    systemd
     expat
+    systemd
   ];
 
   cmakeFlags = [
     "-DBUILD_CODE_GEN=ON"
   ];
 
-  meta = with lib; {
+  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.
+      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 = [ lib.maintainers.ivar ];
+    platforms = lib.platforms.linux;
     mainProgram = "sdbus-c++-xml2cpp";
-    license = licenses.lgpl2Only;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.ivar ];
   };
 }