From 27dbbf575ff64c3643a7bce5ad3e3d01943c1c18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20B=C3=BCchau?= Date: Fri, 16 May 2025 11:41:01 +0200 Subject: [PATCH 1/2] annextimelog: 0.14.0 -> 0.15.0 and add running tests --- pkgs/by-name/an/annextimelog/package.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/an/annextimelog/package.nix b/pkgs/by-name/an/annextimelog/package.nix index e791ce9f7d8b..27b4c5afe9e2 100644 --- a/pkgs/by-name/an/annextimelog/package.nix +++ b/pkgs/by-name/an/annextimelog/package.nix @@ -18,14 +18,14 @@ let in python3.pkgs.buildPythonApplication rec { pname = "annextimelog"; - version = "0.14.0"; + version = "0.15.0"; format = "pyproject"; src = fetchFromGitLab { owner = "nobodyinperson"; repo = "annextimelog"; rev = "v${version}"; - hash = "sha256-+3PkG33qKckagSVvVdqkypulO7uu5AMOv8fQiP8IUbs="; + hash = "sha256-RfqBtbfArFva3TVJGF4STx0QTio62qxXaM23lsLYLUg="; }; pythonRelaxDeps = [ "rich" ]; @@ -33,12 +33,15 @@ python3.pkgs.buildPythonApplication rec { nativeBuildInputs = with python3.pkgs; [ + unittestCheckHook setuptools wheel poetry-core ] ++ [ tzdata ]; + unittestFlags = [ "-vb" ]; + propagatedBuildInputs = with python3.pkgs; [ rich ]; From 00cfea15d15fba3e4bafcc8be65690a62af8b80f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yann=20B=C3=BCchau?= Date: Fri, 16 May 2025 11:54:19 +0200 Subject: [PATCH 2/2] annextimelog: use nixpkgs' tzdata --- pkgs/by-name/an/annextimelog/package.nix | 27 ++++++------------------ 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/pkgs/by-name/an/annextimelog/package.nix b/pkgs/by-name/an/annextimelog/package.nix index 27b4c5afe9e2..7306ad674574 100644 --- a/pkgs/by-name/an/annextimelog/package.nix +++ b/pkgs/by-name/an/annextimelog/package.nix @@ -5,17 +5,6 @@ fetchPypi, }: -let - tzdata = python3.pkgs.tzdata.overrideAttrs rec { - version = "2023.4"; - - src = fetchPypi { - pname = "tzdata"; - inherit version; - hash = "sha256-3VTJTylHZVIsdzmWSbT+/ZVSJHmmZKDOyH9BvrxhSMk="; - }; - }; -in python3.pkgs.buildPythonApplication rec { pname = "annextimelog"; version = "0.15.0"; @@ -30,15 +19,13 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "rich" ]; - nativeBuildInputs = - with python3.pkgs; - [ - unittestCheckHook - setuptools - wheel - poetry-core - ] - ++ [ tzdata ]; + nativeBuildInputs = with python3.pkgs; [ + unittestCheckHook + setuptools + wheel + poetry-core + tzdata + ]; unittestFlags = [ "-vb" ];