Merge pull request #309396 from adamcstephens/s0ix-selftest-tool/fix (5c4ae2d9) · Commits · nix / nixpkgs

pkgs/tools/system/s0ix-selftest-tool/default.nix→pkgs/by-name/s0/s0ix-selftest-tool/package.nix

+28 −35

Original line number	Diff line number	Diff line
		{
		acpica-tools,
		bash,
		bc,
		coreutils,
		fetchFromGitHub,
		@@ -11,64 +10,58 @@
		lib,
		pciutils,
		powertop,
		resholve,
		makeWrapper,
		stdenv,
		unstableGitUpdater,
		util-linux,
		xorg,
		xxd,
		}:
		resholve.mkDerivation {

		let
		deps = [
		acpica-tools
		bc
		coreutils
		gawk
		gnugrep
		gnused
		linuxPackages.turbostat
		pciutils
		powertop
		util-linux
		xorg.xset
		xxd
		];
		in
		stdenv.mkDerivation {
		pname = "s0ix-selftest-tool";
		version = "unstable-2022-11-04";
		version = "0-unstable-2024-02-07";

		src = fetchFromGitHub {
		owner = "intel";
		repo = "S0ixSelftestTool";
		rev = "1b6db3c3470a3a74b052cb728a544199661d18ec";
		hash = "sha256-w97jfdppW8kC8K8XvBntmkfntIctXDQCWmvug+H1hKA=";
		rev = "c12ae3ea611812547e09bb755dd015dd969b664c";
		hash = "sha256-9O72TxlLrkQbt80izWdbLQt9OW/4Aq1p4RuQoD2yQ5E=";
		};

		# don't use the bundled turbostat binary
		postPatch = ''
		substituteInPlace s0ix-selftest-tool.sh --replace '"$DIR"/turbostat' 'turbostat'
		substituteInPlace s0ix-selftest-tool.sh --replace 'sudo ' ""

		'';

		nativeBuildInputs = [ makeWrapper ];
		dontConfigure = true;
		dontBuild = true;

		installPhase = ''
		runHook preInstall
		install -Dm555 s0ix-selftest-tool.sh "$out/bin/s0ix-selftest-tool"
		wrapProgram "$out/bin/s0ix-selftest-tool" --prefix PATH : ${lib.escapeShellArg deps}
		runHook postInstall
		'';

		solutions = {
		default = {
		scripts = ["bin/s0ix-selftest-tool"];
		interpreter = lib.getExe bash;
		inputs = [
		acpica-tools
		bc
		coreutils
		gawk
		gnugrep
		gnused
		linuxPackages.turbostat
		pciutils
		powertop
		util-linux
		xorg.xset
		xxd
		];
		execer = [
		"cannot:${util-linux}/bin/dmesg"
		"cannot:${powertop}/bin/powertop"
		"cannot:${util-linux}/bin/rtcwake"
		"cannot:${linuxPackages.turbostat}/bin/turbostat"
		];
		};
		};
		passthru.updateScript = unstableGitUpdater { };

		meta = with lib; {
		homepage = "https://github.com/intel/S0ixSelftestTool";

pkgs/top-level/all-packages.nix

+0 −2

Original line number	Diff line number	Diff line
		@@ -2021,8 +2021,6 @@ with pkgs;

		ronin = callPackage ../tools/security/ronin { };

		s0ix-selftest-tool = callPackage ../tools/system/s0ix-selftest-tool { };

		scarab = callPackage ../tools/games/scarab { };

		sdbus-cpp = callPackage ../development/libraries/sdbus-cpp { };