diff options
| author | Pol Dellaiera <pol.dellaiera@protonmail.com> | 2024-04-21 23:01:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-21 23:01:01 +0200 |
| commit | 193b257c8b4fea34bf837bcfc43aadcb2f3356e2 (patch) | |
| tree | 39a300146f555f52074e90cf83cf59ee20d6cafb /pkgs/os-specific | |
| parent | b4bcfd112787f0eb79bbfd8306302802ec885003 (diff) | |
| parent | e9ea901b5ba0a278602fc6c23578cb153ad4a058 (diff) | |
Merge pull request #303639 from r-vdp/dbus-broker-36
dbus-broker: 35 -> 36
Diffstat (limited to 'pkgs/os-specific')
| -rw-r--r-- | pkgs/os-specific/linux/dbus-broker/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/dbus-broker/disable-test.patch | 23 |
2 files changed, 15 insertions, 12 deletions
diff --git a/pkgs/os-specific/linux/dbus-broker/default.nix b/pkgs/os-specific/linux/dbus-broker/default.nix index 5180917623e93..784024f8754d0 100644 --- a/pkgs/os-specific/linux/dbus-broker/default.nix +++ b/pkgs/os-specific/linux/dbus-broker/default.nix @@ -40,13 +40,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "dbus-broker"; - version = "35"; + version = "36"; src = fetchFromGitHub { owner = "bus1"; repo = "dbus-broker"; rev = "v${finalAttrs.version}"; - hash = "sha256-Qwi9X5jXHiQ3TOWefzv/p7x8/JkQW1QgdYji5SpLej0="; + hash = "sha256-5dAMKjybqrHG57vArbtWEPR/svSj2ION75JrjvnnpVM="; }; patches = [ diff --git a/pkgs/os-specific/linux/dbus-broker/disable-test.patch b/pkgs/os-specific/linux/dbus-broker/disable-test.patch index 487967aea8406..14faf1907cc20 100644 --- a/pkgs/os-specific/linux/dbus-broker/disable-test.patch +++ b/pkgs/os-specific/linux/dbus-broker/disable-test.patch @@ -1,11 +1,14 @@ ---- b/src/meson.build -+++ a/src/meson.build -@@ -196,9 +195,6 @@ - test_fdlist = executable('test-fdlist', ['util/test-fdlist.c'], dependencies: dep_bus) - test('Utility File-Desciptor Lists', test_fdlist) - --test_fs = executable('test-fs', ['util/test-fs.c'], dependencies: dep_bus) --test('File System Helpers', test_fs) +diff --git a/src/meson.build b/src/meson.build +index 4b9bc71..221ed5c 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -202,9 +202,6 @@ test('Error Handling', test_error, suite: 'unit') + test_fdlist = executable('test-fdlist', sources: ['util/test-fdlist.c'], kwargs: test_kwargs) + test('Utility File-Desciptor Lists', test_fdlist, suite: 'unit') + +-test_fs = executable('test-fs', sources: ['util/test-fs.c'], kwargs: test_kwargs) +-test('File System Helpers', test_fs, suite: 'unit') - - test_match = executable('test-match', ['bus/test-match.c'], dependencies: dep_bus) - test('D-Bus Match Handling', test_match) + test_match = executable('test-match', sources: ['bus/test-match.c'], kwargs: test_kwargs) + test('D-Bus Match Handling', test_match, suite: 'unit') + |