From ab4228f5008f6dbc94c96f82512591f6c5b0dd62 Mon Sep 17 00:00:00 2001 From: NullCube Date: Sun, 5 Jan 2025 04:01:52 -0800 Subject: [PATCH 1/2] hyfetch: add nullcube to maintainers --- pkgs/by-name/hy/hyfetch/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/hy/hyfetch/package.nix b/pkgs/by-name/hy/hyfetch/package.nix index b35d874fea04..2786d41bf30e 100644 --- a/pkgs/by-name/hy/hyfetch/package.nix +++ b/pkgs/by-name/hy/hyfetch/package.nix @@ -53,6 +53,7 @@ python3Packages.buildPythonApplication rec { maintainers = with lib.maintainers; [ yisuidenghua isabelroses + nullcube ]; }; } From 595fc886d6b905fffe12109d43efbe6ddf85178a Mon Sep 17 00:00:00 2001 From: NullCube Date: Sun, 5 Jan 2025 02:42:24 -0800 Subject: [PATCH 2/2] hyfetch: install man pages --- pkgs/by-name/hy/hyfetch/package.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/by-name/hy/hyfetch/package.nix b/pkgs/by-name/hy/hyfetch/package.nix index 2786d41bf30e..6e11e1c0d7ea 100644 --- a/pkgs/by-name/hy/hyfetch/package.nix +++ b/pkgs/by-name/hy/hyfetch/package.nix @@ -3,12 +3,18 @@ fetchFromGitHub, python3Packages, pciutils, + installShellFiles, }: python3Packages.buildPythonApplication rec { pname = "hyfetch"; version = "1.99.0"; pyproject = true; + outputs = [ + "out" + "man" + ]; + src = fetchFromGitHub { owner = "hykilpikonna"; repo = "hyfetch"; @@ -24,6 +30,10 @@ python3Packages.buildPythonApplication rec { python3Packages.typing-extensions ]; + nativeBuildInputs = [ + installShellFiles + ]; + # No test available doCheck = false; @@ -31,6 +41,15 @@ python3Packages.buildPythonApplication rec { "hyfetch" ]; + # NOTE: The HyFetch project maintains an updated version of neofetch renamed + # to "neowofetch" which is included in this package. However, the man page + # included is still named "neofetch", so to prevent conflicts and confusion + # we rename the file to "neowofetch" before installing it: + postInstall = '' + mv ./docs/neofetch.1 ./docs/neowofetch.1 + installManPage ./docs/hyfetch.1 ./docs/neowofetch.1 + ''; + postFixup = '' wrapProgram $out/bin/neowofetch \ --prefix PATH : ${lib.makeBinPath [ pciutils ]}