From c5bfda47e760cd9b091d2c7d9d09db16c470f7fc Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 May 2022 12:19:14 +0000 Subject: [PATCH 1/2] linuxPackages.zenpower: 0.1.13 -> unstable-2022-04-13 Fixes build with Linux 5.18. --- pkgs/os-specific/linux/zenpower/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/zenpower/default.nix b/pkgs/os-specific/linux/zenpower/default.nix index f3f6e420a2a..f8403c5658e 100644 --- a/pkgs/os-specific/linux/zenpower/default.nix +++ b/pkgs/os-specific/linux/zenpower/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "zenpower"; - version = "0.1.13"; + version = "unstable-2022-04-13"; src = fetchFromGitHub { owner = "Ta180m"; repo = "zenpower3"; - rev = "v${version}"; - sha256 = "sha256-2QScHDwOKN3Psui0M2s2p6D97jjbfe3Us5Nkn2srKC0="; + rev = "c36a86c64b802e9b90b5166caee6a8e8eddaeb56"; + sha256 = "1i9ap7xgab421f3c68mcmad25xs4h8pfz0g0f9yzg7hxpmb0npxi"; }; hardeningDisable = [ "pic" ]; From 0795cb72d313d15c1721bbd633fbf550961dc77e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 23 May 2022 12:19:33 +0000 Subject: [PATCH 2/2] linuxPackages.zenpower: clarify license https://github.com/Ta180m/zenpower3/blob/c36a86c64b802e9b90b5166caee6a8e8eddaeb56/zenpower.c#L8 --- pkgs/os-specific/linux/zenpower/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/zenpower/default.nix b/pkgs/os-specific/linux/zenpower/default.nix index f8403c5658e..1ba01a1c88f 100644 --- a/pkgs/os-specific/linux/zenpower/default.nix +++ b/pkgs/os-specific/linux/zenpower/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Linux kernel driver for reading temperature, voltage(SVI2), current(SVI2) and power(SVI2) for AMD Zen family CPUs."; homepage = "https://github.com/Ta180m/zenpower3"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ alexbakker artturin ]; platforms = [ "x86_64-linux" ]; broken = versionOlder kernel.version "4.14";