diff options
author | Nick Cao <nickcao@nichi.co> | 2023-05-21 23:54:21 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-21 23:54:21 -0600 |
commit | 73c7d5d337d33aadf1ed78121a9af75b347fab5a (patch) | |
tree | 7ffc4e0638251b6f2768f321f15375cc4604147b /pkgs | |
parent | cf577b1ef8cda395f4f741fb80d8737b3fa7faf3 (diff) | |
parent | 7346aedd84591af616f386dcffdbb74662ee6156 (diff) |
Merge pull request #232809 from raphaelr/fod/dbus-broker
dbus-broker: Fetch dependencies from tags instead of branches
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/os-specific/linux/dbus-broker/default.nix | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index 91ebee7031211..28802d75a7fd2 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -11,14 +11,13 @@ }: let - dep = { pname, version, hash, buildInputs ? [ ] }: + dep = { pname, version, hash, rev ? version, buildInputs ? [ ] }: stdenv.mkDerivation { inherit pname version; src = fetchFromGitHub { owner = "c-util"; repo = pname; - rev = version; - inherit hash; + inherit hash rev; }; nativeBuildInputs = [ meson ninja pkg-config ]; inherit buildInputs; @@ -28,13 +27,14 @@ let # # If that changes, we can always break them out, but they are essentially # part of the dbus-broker project, just in separate repositories. - c-dvar = dep { pname = "c-dvar"; version = "v1"; hash = "sha256-P7y7gUHXQn2eyS6IcV7m7yGy4VGtQ2orgBkS7Y729ZY="; buildInputs = [ c-stdaux c-utf8 ]; }; - c-ini = dep { pname = "c-ini"; version = "v1"; hash = "sha256-VKxoGexMcquakMmiH5IJt0382TjkV1FLncTSyEqf4X0="; buildInputs = [ c-list c-rbtree c-stdaux c-utf8 ]; }; - c-list = dep { pname = "c-list"; version = "v3"; hash = "sha256-fp3EAqcbFCLaT2EstLSzwP2X13pi2EFpFAullhoCtpw="; }; - c-rbtree = dep { pname = "c-rbtree"; version = "v3"; hash = "sha256-ExSPgNqhTjSwRgYfZOAyoaehOpFNHKFqPYkcCfptkrs="; buildInputs = [ c-stdaux ]; }; - c-shquote = dep { pname = "c-shquote"; version = "v1"; hash = "sha256-Ze1enX0VJ6Xi5e4EhWzaiHc7PnuaifrUP+JuJnauv5c="; buildInputs = [ c-stdaux ]; }; - c-stdaux = dep { pname = "c-stdaux"; version = "v1"; hash = "sha256-/D+IFdqn1XHDfdOsDnLMO5IHQ5B4P4ELyMpRcPBg/4s="; }; - c-utf8 = dep { pname = "c-utf8"; version = "v1"; hash = "sha256-QEnjmfQ6kxJdsHfyRgXAlP+oGrKLYQ0m9r+D2L+pizI="; buildInputs = [ c-stdaux ]; }; + c-dvar = dep { pname = "c-dvar"; version = "v1.0.0"; hash = "sha256-P7y7gUHXQn2eyS6IcV7m7yGy4VGtQ2orgBkS7Y729ZY="; buildInputs = [ c-stdaux c-utf8 ]; }; + c-ini = dep { pname = "c-ini"; version = "v1.0.0"; hash = "sha256-VKxoGexMcquakMmiH5IJt0382TjkV1FLncTSyEqf4X0="; buildInputs = [ c-list c-rbtree c-stdaux c-utf8 ]; }; + c-list = dep { pname = "c-list"; version = "v3.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-shquote = dep { pname = "c-shquote"; version = "v1.0.0"; hash = "sha256-Ze1enX0VJ6Xi5e4EhWzaiHc7PnuaifrUP+JuJnauv5c="; buildInputs = [ c-stdaux ]; }; + c-stdaux = dep { pname = "c-stdaux"; version = "v1.2.0"; hash = "sha256-/D+IFdqn1XHDfdOsDnLMO5IHQ5B4P4ELyMpRcPBg/4s="; }; + c-utf8 = dep { pname = "c-utf8"; version = "v1.0.0"; hash = "sha256-QEnjmfQ6kxJdsHfyRgXAlP+oGrKLYQ0m9r+D2L+pizI="; buildInputs = [ c-stdaux ]; }; in stdenv.mkDerivation rec { |