From 42ea09fbab79289e509230fdd37696db1368d1df Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 31 Oct 2022 11:08:27 +0100 Subject: [PATCH] hyfetch: modernize - add pythonImportsCheck --- pkgs/tools/misc/hyfetch/default.nix | 23 +++++++++++++++++------ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/hyfetch/default.nix b/pkgs/tools/misc/hyfetch/default.nix index 906181cf2c6c..adbe7b4adf34 100644 --- a/pkgs/tools/misc/hyfetch/default.nix +++ b/pkgs/tools/misc/hyfetch/default.nix @@ -1,21 +1,32 @@ -{ lib, buildPythonPackage, fetchFromGitHub, typing-extensions, setuptools }: +{ lib +, fetchFromGitHub +, python3 +}: -buildPythonPackage rec { - pname = "HyFetch"; +python3.pkgs.buildPythonApplication rec { + pname = "hyfetch"; version = "1.4.3"; + format = "setuptools"; src = fetchFromGitHub { - repo = "hyfetch"; owner = "hykilpikonna"; + repo = "hyfetch"; rev = "refs/tags/${version}"; - sha256 = "sha256-ScdcV1ojtVz/OdR7k+y7Wj4VAne++8LY9Vz+wO3CJGI="; + hash = "sha256-ScdcV1ojtVz/OdR7k+y7Wj4VAne++8LY9Vz+wO3CJGI="; }; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ typing-extensions setuptools ]; + # No test available + doCheck = false; + + pythonImportsCheck = [ + "hyfetch" + ]; + meta = with lib; { description = "neofetch with pride flags <3"; longDescription = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4d8f4e25fbe1..415e3dc55de0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -36428,7 +36428,7 @@ with pkgs; hplipWithPlugin = hplip.override { withPlugin = true; }; - hyfetch = python3Packages.callPackage ../tools/misc/hyfetch { }; + hyfetch = callPackage ../tools/misc/hyfetch { }; hyperfine = callPackage ../tools/misc/hyperfine { inherit (darwin.apple_sdk.frameworks) Security;