From b9599767e8729ffe7309e7724e8cc50c0fd407d3 Mon Sep 17 00:00:00 2001 From: Alexander Rezvov Date: Wed, 1 Dec 2021 23:44:16 +0300 Subject: [PATCH] openipmi: 2.0.31 -> 2.0.32 --- pkgs/tools/system/openipmi/default.nix | 10 ++-------- .../tools/system/openipmi/fix-collectd-assertion.diff | 11 ----------- 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 pkgs/tools/system/openipmi/fix-collectd-assertion.diff diff --git a/pkgs/tools/system/openipmi/default.nix b/pkgs/tools/system/openipmi/default.nix index 06df9afa813..7e54a5549b7 100644 --- a/pkgs/tools/system/openipmi/default.nix +++ b/pkgs/tools/system/openipmi/default.nix @@ -2,19 +2,13 @@ stdenv.mkDerivation rec { pname = "OpenIPMI"; - version = "2.0.31"; + version = "2.0.32"; src = fetchurl { url = "mirror://sourceforge/openipmi/OpenIPMI-${version}.tar.gz"; - sha256 = "05wpkn74nxqp5p6sa2yaf2ajrh8b0gfkb7y4r86lnigz4rvz6lkh"; + sha256 = "sha256-9tD9TAp0sF+AkHIp0LJw9UyiMpS8wRl5+LjRJ2Z4aUU="; }; - patches = [ - # fix assertion when used as a library in collectd - # taken from https://sourceforge.net/p/openipmi/code/ci/d613d279dbce2d5e4594f6fed39653d83af0d99b/ - ./fix-collectd-assertion.diff - ]; - buildInputs = [ ncurses popt python3 readline ]; outputs = [ "out" "lib" "dev" "man" ]; diff --git a/pkgs/tools/system/openipmi/fix-collectd-assertion.diff b/pkgs/tools/system/openipmi/fix-collectd-assertion.diff deleted file mode 100644 index af39fcc0567..00000000000 --- a/pkgs/tools/system/openipmi/fix-collectd-assertion.diff +++ /dev/null @@ -1,11 +0,0 @@ ---- a/unix/posix_thread_os_hnd.c -+++ b/unix/posix_thread_os_hnd.c -@@ -140,8 +140,6 @@ - fd_data->data_ready = data_ready; - fd_data->handler = handler; - fd_data->freed = freed; -- sel_set_fd_write_handler(posix_sel, fd, SEL_FD_HANDLER_DISABLED); -- sel_set_fd_except_handler(posix_sel, fd, SEL_FD_HANDLER_DISABLED); - rv = sel_set_fd_handlers(posix_sel, fd, fd_data, fd_handler, NULL, NULL, - free_fd_data); - if (rv) {