From b78661a7c167ecd30799f32367eaeba5ea88b6cd Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Sat, 15 Jun 2024 00:43:12 -0300 Subject: [PATCH 1/2] zenergy: init at 0-unstable-2024-10-10 --- pkgs/os-specific/linux/zenergy/default.nix | 45 ++++++++++++++++++++++ pkgs/top-level/linux-kernels.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/os-specific/linux/zenergy/default.nix diff --git a/pkgs/os-specific/linux/zenergy/default.nix b/pkgs/os-specific/linux/zenergy/default.nix new file mode 100644 index 000000000000..cfdb63d2a135 --- /dev/null +++ b/pkgs/os-specific/linux/zenergy/default.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + kernel, + kmod, +}: + +let + kernelDirectory = "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; +in +stdenv.mkDerivation { + pname = "zenergy"; + version = "0-unstable-2024-10-10"; + + src = fetchFromGitHub { + owner = "BoukeHaarsma23"; + repo = "zenergy"; + rev = "7c4e83d5e2f887f4c31edaf92e5f94e9448e9764"; + hash = "sha256-5fYelEr4IYnuXrly15IcyicFrF0tYjs7OBqIhUYQXZ0="; + }; + + nativeBuildInputs = [ kmod ] ++ kernel.moduleBuildDependencies; + + hardeningDisable = [ + "format" + "pic" + ]; + + makeFlags = kernel.makeFlags ++ [ "KDIR=${kernelDirectory}" ]; + + installTargets = [ "modules_install" ]; + + preBuild = '' + substituteInPlace Makefile --replace-fail "PWD modules_install" "PWD INSTALL_MOD_PATH=$out modules_install" + ''; + + meta = with lib; { + description = "Based on AMD_ENERGY driver, but with some jiffies added so non-root users can read it safely."; + homepage = "https://github.com/BoukeHaarsma23/zenergy"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ wizardlink ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix index b9225acdb2b7..f83e88993450 100644 --- a/pkgs/top-level/linux-kernels.nix +++ b/pkgs/top-level/linux-kernels.nix @@ -407,6 +407,8 @@ in { new-lg4ff = callPackage ../os-specific/linux/new-lg4ff { }; + zenergy = callPackage ../os-specific/linux/zenergy { }; + nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; nvidiaPackages = dontRecurseIntoAttrs (lib.makeExtensible (_: callPackage ../os-specific/linux/nvidia-x11 { })); From 2f3919ecc92132335ba3e5fc1ac485844c81f474 Mon Sep 17 00:00:00 2001 From: "Alexandre Cavalheiro S. Tiago da Silva" Date: Sat, 15 Jun 2024 00:43:34 -0300 Subject: [PATCH 2/2] maintainers: adding wizardlink --- maintainers/maintainer-list.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f44254be32e4..fed81e98a0ff 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -23179,6 +23179,17 @@ githubId = 36118348; keys = [ { fingerprint = "69C9 876B 5797 1B2E 11C5 7C39 80A1 F76F C9F9 54AE"; } ]; }; + wizardlink = { + name = "wizardlink"; + email = "contact@thewizard.link"; + github = "wizardlink"; + githubId = 26727907; + keys = [ + { + fingerprint = "A1D3 A2B4 E14B D7C0 445B B749 A576 7B54 367C FBDF"; + } + ]; + }; wizeman = { email = "rcorreia@wizy.org"; github = "wizeman";