From 26d4beff0be641aa0f1e52f4b00d16d2064ef12c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 12 May 2026 13:16:21 -0700 Subject: [PATCH 1/3] termdown: 1.18.0 -> 2.0.0 Diff: https://github.com/trehn/termdown/compare/1.18.0...2.0.0 Changelog: https://github.com/trehn/termdown/blob/2.0.0/CHANGELOG.md --- pkgs/applications/misc/termdown/default.nix | 26 ++++++++++----------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/misc/termdown/default.nix b/pkgs/applications/misc/termdown/default.nix index 6e1a4172bd27..f1737d98970e 100644 --- a/pkgs/applications/misc/termdown/default.nix +++ b/pkgs/applications/misc/termdown/default.nix @@ -1,33 +1,33 @@ { lib, fetchFromGitHub, - buildPythonApplication, - click, - pyfiglet, - python-dateutil, - setuptools, + python3Packages, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "termdown"; - version = "1.18.0"; - format = "setuptools"; + version = "2.0.0"; + pyproject = true; src = fetchFromGitHub { owner = "trehn"; repo = "termdown"; tag = version; - hash = "sha256-Hnk/MOYdbOl14fI0EFbIq7Hmc7TyhcZWGEg2/jmNJ5Y="; + hash = "sha256-G2YOAC+b++oQUicZcY28qVDy2XqW2SuzhXcVqeSQkh8="; }; - dependencies = [ + build-system = with python3Packages; [ + hatchling + ]; + + dependencies = with python3Packages; [ + art + pillow python-dateutil - click - pyfiglet - setuptools ]; meta = { + changelog = "https://github.com/trehn/termdown/blob/${src.tag}/CHANGELOG.md"; description = "Starts a countdown to or from TIMESPEC"; mainProgram = "termdown"; longDescription = "Countdown timer and stopwatch in your terminal"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5675f04cf75c..ab6fd24cad2a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10308,7 +10308,7 @@ with pkgs; stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_19.stdenv else stdenv; }; - termdown = python3Packages.callPackage ../applications/misc/termdown { }; + termdown = callPackage ../applications/misc/termdown { }; terminaltexteffects = with python3Packages; toPythonApplication terminaltexteffects; From ce2a6ef3b2ebf439793cff261f62a65da07cfb0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 12 May 2026 13:23:23 -0700 Subject: [PATCH 2/3] termdown: use finalAttrs --- pkgs/applications/misc/termdown/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/termdown/default.nix b/pkgs/applications/misc/termdown/default.nix index f1737d98970e..c3466e3fb20b 100644 --- a/pkgs/applications/misc/termdown/default.nix +++ b/pkgs/applications/misc/termdown/default.nix @@ -4,7 +4,7 @@ python3Packages, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "termdown"; version = "2.0.0"; pyproject = true; @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "trehn"; repo = "termdown"; - tag = version; + tag = finalAttrs.version; hash = "sha256-G2YOAC+b++oQUicZcY28qVDy2XqW2SuzhXcVqeSQkh8="; }; @@ -27,11 +27,11 @@ python3Packages.buildPythonApplication rec { ]; meta = { - changelog = "https://github.com/trehn/termdown/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/trehn/termdown/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "Starts a countdown to or from TIMESPEC"; mainProgram = "termdown"; longDescription = "Countdown timer and stopwatch in your terminal"; homepage = "https://github.com/trehn/termdown"; license = lib.licenses.gpl3; }; -} +}) From eaf4196783d416f6d07a960bf0c3ca5e322aec60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 12 May 2026 13:25:45 -0700 Subject: [PATCH 3/3] termdown: move to pkgs/by-name --- .../termdown/default.nix => by-name/te/termdown/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/misc/termdown/default.nix => by-name/te/termdown/package.nix} (100%) diff --git a/pkgs/applications/misc/termdown/default.nix b/pkgs/by-name/te/termdown/package.nix similarity index 100% rename from pkgs/applications/misc/termdown/default.nix rename to pkgs/by-name/te/termdown/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab6fd24cad2a..258fd9ed823b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10308,8 +10308,6 @@ with pkgs; stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_19.stdenv else stdenv; }; - termdown = callPackage ../applications/misc/termdown { }; - terminaltexteffects = with python3Packages; toPythonApplication terminaltexteffects; inherit