From 6c489f09f9f12aeecbe2ce2b23f90ca24bd05ee5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 12 Dec 2021 01:50:00 +0000 Subject: [PATCH 1/2] acpid: 2.0.32 -> 2.0.33 --- pkgs/os-specific/linux/acpid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix index 2b8dac0c8e43..41ed180ee5a2 100644 --- a/pkgs/os-specific/linux/acpid/default.nix +++ b/pkgs/os-specific/linux/acpid/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "acpid"; - version = "2.0.32"; + version = "2.0.33"; src = fetchurl { url = "mirror://sourceforge/acpid2/acpid-${version}.tar.xz"; - sha256 = "0zhmxnhnhg4v1viw82yjr22kram6k5k1ixznhayk8cnw7q5x7lpj"; + sha256 = "sha256-CFb3Gz6zShtmPQqOY2Pfy8UZ5j2EczBJiJhljily2+g="; }; nativeBuildInputs = [ autoreconfHook ]; From e6c459f5260ca081c1a397dc603e6f60a142cabd Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 24 Dec 2021 15:07:14 +0800 Subject: [PATCH 2/2] acpid: drop unneeded substituteInPlace --- pkgs/os-specific/linux/acpid/default.nix | 8 -------- 1 file changed, 8 deletions(-) diff --git a/pkgs/os-specific/linux/acpid/default.nix b/pkgs/os-specific/linux/acpid/default.nix index 41ed180ee5a2..b766739aaafa 100644 --- a/pkgs/os-specific/linux/acpid/default.nix +++ b/pkgs/os-specific/linux/acpid/default.nix @@ -11,14 +11,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; - # remove when https://sourceforge.net/p/acpid2/code/merge-requests/1/ is merged - postPatch = '' - substituteInPlace configure.ac \ - --replace "AC_FUNC_MALLOC" "" \ - --replace "AC_FUNC_REALLOC" "" \ - --replace "strrchr strtol" "strrchr strtol malloc realloc" - ''; - meta = with lib; { homepage = "https://sourceforge.net/projects/acpid2/"; description = "A daemon for delivering ACPI events to userspace programs";