From 9af0a6c3a6da61012a0562efea198d7af34a88be Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Wed, 27 Nov 2024 08:18:17 +0800 Subject: [PATCH 1/2] acpica-tools: nixfmt --- pkgs/by-name/ac/acpica-tools/package.nix | 27 +++++++++++++++++------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ac/acpica-tools/package.nix b/pkgs/by-name/ac/acpica-tools/package.nix index 11e6f1f454c7..50e377399cc5 100644 --- a/pkgs/by-name/ac/acpica-tools/package.nix +++ b/pkgs/by-name/ac/acpica-tools/package.nix @@ -1,8 +1,9 @@ -{ lib -, stdenv -, fetchFromGitHub -, bison -, flex +{ + lib, + stdenv, + fetchFromGitHub, + bison, + flex, }: stdenv.mkDerivation rec { @@ -16,7 +17,10 @@ stdenv.mkDerivation rec { hash = "sha256-RlhKBvydesUdBaFUHk3sSM6SRIZ7q5IqnibX+hps+Tc="; }; - nativeBuildInputs = [ bison flex ]; + nativeBuildInputs = [ + bison + flex + ]; buildFlags = [ "acpibin" @@ -49,8 +53,15 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.acpica.org/"; description = "ACPICA Tools"; - license = with licenses; [ iasl gpl2Only bsd3 ]; - maintainers = with maintainers; [ tadfisher felixsinger ]; + license = with licenses; [ + iasl + gpl2Only + bsd3 + ]; + maintainers = with maintainers; [ + tadfisher + felixsinger + ]; platforms = platforms.linux ++ platforms.darwin; }; } From 752355049b4551fe57651601338eb49abd596091 Mon Sep 17 00:00:00 2001 From: wxt <3264117476@qq.com> Date: Tue, 26 Nov 2024 20:40:05 +0800 Subject: [PATCH 2/2] acpica-tools: 20240827 -> R09_27_24 --- pkgs/by-name/ac/acpica-tools/package.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ac/acpica-tools/package.nix b/pkgs/by-name/ac/acpica-tools/package.nix index 50e377399cc5..9ded739e9245 100644 --- a/pkgs/by-name/ac/acpica-tools/package.nix +++ b/pkgs/by-name/ac/acpica-tools/package.nix @@ -4,17 +4,18 @@ fetchFromGitHub, bison, flex, + nix-update-script, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "acpica-tools"; - version = "20240827"; + version = "R09_27_24"; src = fetchFromGitHub { owner = "acpica"; repo = "acpica"; - rev = "refs/tags/version-${version}"; - hash = "sha256-RlhKBvydesUdBaFUHk3sSM6SRIZ7q5IqnibX+hps+Tc="; + rev = "refs/tags/${finalAttrs.version}"; + hash = "sha256-kjdSCGa/2mmODX0gsY9JzSx9PJqYoKjtJTn8y4uduIQ="; }; nativeBuildInputs = [ @@ -50,18 +51,20 @@ stdenv.mkDerivation rec { installFlags = [ "PREFIX=${placeholder "out"}" ]; - meta = with lib; { + passthru.updateScript = nix-update-script { }; + + meta = { homepage = "https://www.acpica.org/"; description = "ACPICA Tools"; - license = with licenses; [ + license = with lib.licenses; [ iasl gpl2Only bsd3 ]; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ tadfisher felixsinger ]; - platforms = platforms.linux ++ platforms.darwin; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; -} +})