From abc07527e04ad8f7f80f22180f07825173d5ba98 Mon Sep 17 00:00:00 2001 From: MidAutumnMoon Date: Sun, 11 Jun 2023 20:22:51 +0800 Subject: [PATCH] dbus-broker: v32 -> v33 Release: https://github.com/bus1/dbus-broker/releases/tag/v33 Diff: https://github.com/bus1/dbus-broker/compare/v32...v33 dbus-broker: adopt finalAttrs pattern --- pkgs/os-specific/linux/dbus-broker/default.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index c8c437a968a4..847f76a528ce 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -11,6 +11,7 @@ }: let + dep = { pname, version, hash, rev ? "v${version}", buildInputs ? [ ] }: stdenv.mkDerivation { inherit pname version; @@ -30,22 +31,22 @@ let c-dvar = dep { pname = "c-dvar"; version = "1.0.0"; hash = "sha256-P7y7gUHXQn2eyS6IcV7m7yGy4VGtQ2orgBkS7Y729ZY="; buildInputs = [ c-stdaux c-utf8 ]; }; c-ini = dep { pname = "c-ini"; version = "1.0.0"; hash = "sha256-VKxoGexMcquakMmiH5IJt0382TjkV1FLncTSyEqf4X0="; buildInputs = [ c-list c-rbtree c-stdaux c-utf8 ]; }; c-list = dep { pname = "c-list"; version = "3.1.0"; hash = "sha256-fp3EAqcbFCLaT2EstLSzwP2X13pi2EFpFAullhoCtpw="; }; - # TODO: Fetch c-rbtree from a tag after its next release - c-rbtree = dep { pname = "c-rbtree"; version = "unstable-2022-07-07"; rev = "431a4746705223673e43940ca1ad9b5f52473a4b"; hash = "sha256-ExSPgNqhTjSwRgYfZOAyoaehOpFNHKFqPYkcCfptkrs="; buildInputs = [ c-stdaux ]; }; + c-rbtree = dep { pname = "c-rbtree"; version = "3.1.0"; hash = "sha256-ozVzL6FllAn8eHbso0RZc/+PGWwEp6r/R1MR+r4Bi/4="; buildInputs = [ c-stdaux ]; }; c-shquote = dep { pname = "c-shquote"; version = "1.0.0"; hash = "sha256-Ze1enX0VJ6Xi5e4EhWzaiHc7PnuaifrUP+JuJnauv5c="; buildInputs = [ c-stdaux ]; }; - c-stdaux = dep { pname = "c-stdaux"; version = "1.2.0"; hash = "sha256-/D+IFdqn1XHDfdOsDnLMO5IHQ5B4P4ELyMpRcPBg/4s="; }; + c-stdaux = dep { pname = "c-stdaux"; version = "1.4.0"; hash = "sha256-gEqXVBAUE0dHD03ina9QbEP26NU12cHKRpuD7GoPmDs="; }; c-utf8 = dep { pname = "c-utf8"; version = "1.0.0"; hash = "sha256-QEnjmfQ6kxJdsHfyRgXAlP+oGrKLYQ0m9r+D2L+pizI="; buildInputs = [ c-stdaux ]; }; in -stdenv.mkDerivation rec { + +stdenv.mkDerivation ( finalAttrs: { pname = "dbus-broker"; - version = "32"; + version = "33"; src = fetchFromGitHub { owner = "bus1"; repo = "dbus-broker"; - rev = "v${version}"; - hash = "sha256-PVdRyg/t6D3HjSHeap5L8AiEm39iSO5qXohLw2UAUYY="; + rev = "v${finalAttrs.version}"; + hash = "sha256-c5kEUB2k9CCuno9d4QOUUp1wbQfsvraGDLN6Yaa7T2w="; }; patches = [ ./paths.patch ]; @@ -92,4 +93,4 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; }; -} +} )