diff --git a/pkgs/os-specific/linux/ell/0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch b/pkgs/os-specific/linux/ell/0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch deleted file mode 100644 index c2d844edecd..00000000000 --- a/pkgs/os-specific/linux/ell/0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 55d499f4cd5667c04c21f7201d7f10484e187907 Mon Sep 17 00:00:00 2001 -From: Florian Klink -Date: Sun, 27 Dec 2020 13:03:12 +0100 -Subject: [PATCH] unit/test-dbus: pick up dbus-daemon from $PATH - -This allows running the unit tests in environments where `dbus-daemon` -isn't in /usr/bin, but in $PATH. - -Signed-off-by: Florian Klink ---- - unit/test-dbus-message-fds.c | 4 ++-- - unit/test-dbus-properties.c | 4 ++-- - unit/test-dbus.c | 4 ++-- - 3 files changed, 6 insertions(+), 6 deletions(-) - -diff --git a/unit/test-dbus-message-fds.c b/unit/test-dbus-message-fds.c -index 6f68bae..4b5662e 100644 ---- a/unit/test-dbus-message-fds.c -+++ b/unit/test-dbus-message-fds.c -@@ -51,7 +51,7 @@ static bool start_dbus_daemon(void) - char *prg_envp[1]; - pid_t pid; - -- prg_argv[0] = "/usr/bin/dbus-daemon"; -+ prg_argv[0] = "dbus-daemon"; - prg_argv[1] = "--nopidfile"; - prg_argv[2] = "--nofork"; - prg_argv[3] = "--config-file=" UNITDIR "dbus.conf"; -@@ -68,7 +68,7 @@ static bool start_dbus_daemon(void) - } - - if (pid == 0) { -- execve(prg_argv[0], prg_argv, prg_envp); -+ execvpe(prg_argv[0], prg_argv, prg_envp); - exit(EXIT_SUCCESS); - } - -diff --git a/unit/test-dbus-properties.c b/unit/test-dbus-properties.c -index b435062..049f0f4 100644 ---- a/unit/test-dbus-properties.c -+++ b/unit/test-dbus-properties.c -@@ -49,7 +49,7 @@ static bool start_dbus_daemon(void) - char *prg_envp[1]; - pid_t pid; - -- prg_argv[0] = "/usr/bin/dbus-daemon"; -+ prg_argv[0] = "dbus-daemon"; - prg_argv[1] = "--nopidfile"; - prg_argv[2] = "--nofork"; - prg_argv[3] = "--config-file=" UNITDIR "dbus.conf"; -@@ -66,7 +66,7 @@ static bool start_dbus_daemon(void) - } - - if (pid == 0) { -- execve(prg_argv[0], prg_argv, prg_envp); -+ execvpe(prg_argv[0], prg_argv, prg_envp); - exit(EXIT_SUCCESS); - } - -diff --git a/unit/test-dbus.c b/unit/test-dbus.c -index 67f0a7b..582847e 100644 ---- a/unit/test-dbus.c -+++ b/unit/test-dbus.c -@@ -45,7 +45,7 @@ static void start_dbus_daemon(void) - char *prg_envp[1]; - pid_t pid; - -- prg_argv[0] = "/usr/bin/dbus-daemon"; -+ prg_argv[0] = "dbus-daemon"; - prg_argv[1] = "--nopidfile"; - prg_argv[2] = "--nofork"; - prg_argv[3] = "--config-file=" UNITDIR "dbus.conf"; -@@ -62,7 +62,7 @@ static void start_dbus_daemon(void) - } - - if (pid == 0) { -- execve(prg_argv[0], prg_argv, prg_envp); -+ execvpe(prg_argv[0], prg_argv, prg_envp); - exit(EXIT_SUCCESS); - } - --- -2.29.2 - diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix index 8c15ce825c0..ced77f3fcc9 100644 --- a/pkgs/os-specific/linux/ell/default.nix +++ b/pkgs/os-specific/linux/ell/default.nix @@ -7,21 +7,16 @@ stdenv.mkDerivation rec { pname = "ell"; - version = "0.35"; + version = "0.36"; outputs = [ "out" "dev" ]; src = fetchgit { url = "https://git.kernel.org/pub/scm/libs/${pname}/${pname}.git"; rev = version; - sha256 = "16z7xwlrpx1bsr2y1rgxxxixzwc84cwn2g557iqxhwsxfzy6q3dk"; + sha256 = "0w7v2hihwwmnqd56bsmbjsiw8yyadr7zbdssjamqxx0pyl3dnrda"; }; - patches = [ - # Sent upstream in https://lists.01.org/hyperkitty/list/ell@lists.01.org/thread/SQEZAIS2LZXSXGTXOW3GTAM5ZPXRLTN4/ - ./0001-unit-test-dbus-pick-up-dbus-daemon-from-PATH.patch - ]; - nativeBuildInputs = [ pkg-config autoreconfHook