diff options
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/dbus')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/dbus/default.nix | 5 | ||||
-rw-r--r-- | nixpkgs/pkgs/development/libraries/dbus/make-dbus-conf.nix | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/nixpkgs/pkgs/development/libraries/dbus/default.nix b/nixpkgs/pkgs/development/libraries/dbus/default.nix index 52928e1005ff..d8c3309acb9f 100644 --- a/nixpkgs/pkgs/development/libraries/dbus/default.nix +++ b/nixpkgs/pkgs/development/libraries/dbus/default.nix @@ -19,11 +19,11 @@ stdenv.mkDerivation rec { pname = "dbus"; - version = "1.14.6"; + version = "1.14.8"; src = fetchurl { url = "https://dbus.freedesktop.org/releases/dbus/dbus-${version}.tar.xz"; - sha256 = "sha256-/SvfG7idw2WkZTG/9jFTbyKw0cbVzixcXlm1UmWz1ms="; + sha256 = "sha256-pr1brFzxnww8WUva4lZaCVaWmApoOg7zfLYhLgk73jU="; }; patches = lib.optional stdenv.isSunOS ./implement-getgrouplist.patch; @@ -115,6 +115,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Simple interprocess messaging system"; homepage = "http://www.freedesktop.org/wiki/Software/dbus/"; + changelog = "https://gitlab.freedesktop.org/dbus/dbus/-/blob/dbus-${version}/NEWS"; license = licenses.gpl2Plus; # most is also under AFL-2.1 maintainers = teams.freedesktop.members ++ (with maintainers; [ ]); platforms = platforms.unix; diff --git a/nixpkgs/pkgs/development/libraries/dbus/make-dbus-conf.nix b/nixpkgs/pkgs/development/libraries/dbus/make-dbus-conf.nix index 125da383c8d1..0a8b630d073b 100644 --- a/nixpkgs/pkgs/development/libraries/dbus/make-dbus-conf.nix +++ b/nixpkgs/pkgs/development/libraries/dbus/make-dbus-conf.nix @@ -42,4 +42,8 @@ runCommand "dbus-1" --stringparam apparmor "$apparmor" \ ${./make-session-conf.xsl} ${dbus}/share/dbus-1/session.conf \ > $out/session.conf + + # check if files are empty or only contain space characters + grep -q '[^[:space:]]' "$out/system.conf" || (echo "\"$out/system.conf\" was generated incorrectly and is empty, try building again." && exit 1) + grep -q '[^[:space:]]' "$out/session.conf" || (echo "\"$out/session.conf\" was generated incorrectly and is empty, try building again." && exit 1) '' |