From 4b2b11063035f6e9facee545214b9923536961d5 Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Thu, 27 Mar 2025 22:05:16 -0400 Subject: [PATCH] trying to package chained-recurrence --- hosts/eddie/configuration.nix | 15 ++++++++++++++ modules/home/taskwarrior.nix | 4 ++-- packages/chained-recurrence.nix | 35 --------------------------------- 3 files changed, 17 insertions(+), 37 deletions(-) delete mode 100644 packages/chained-recurrence.nix diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index 2dba453..d5a7ba4 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -31,6 +31,21 @@ inputs.nix-rice.overlays.default inputs.nh.overlays.default inputs.emacs-lsp-booster.overlays.default + + (final: prev: { + takwarrior-chained = let + pname = "chained-recurrence"; + version = "0.0.13"; + in + pkgs.python312Packages.buildPythonPackage { + format = "pyproject"; + inherit pname version; + src = pkgs.fetchPypi { + inherit pname version; + sha256 = "sha256-PMxZFB82XkvHMCLVvbiW0L8AVQFiYpzXTFpxIUyDqIY="; + }; + }; + }) (final: prev: { wineWowPackages.stagingFull = pkgs-stable.wineWowPackages.stagingFull.overrideAttrs diff --git a/modules/home/taskwarrior.nix b/modules/home/taskwarrior.nix index a7f112c..0d38977 100644 --- a/modules/home/taskwarrior.nix +++ b/modules/home/taskwarrior.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ nix-config, pkgs, ... }: { @@ -7,7 +7,7 @@ tasksh taskwarrior-tui taskopen - # chained-recurrence + taskwarrior-chained # syncall ]; diff --git a/packages/chained-recurrence.nix b/packages/chained-recurrence.nix deleted file mode 100644 index 1e250bc..0000000 --- a/packages/chained-recurrence.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - stdenv, - pkgs, - pyprojectHook, - resolveBuildSystem, - lib, - ... -}: -let - pname = "chained-recurrence"; - version = "0.0.13"; -in -stdenv.mkDerivation { - inherit pname version; - - src = pkgs.fetchPypi { - inherit pname version; - sha256 = "sha256-PMxZFB82XkvHMCLVvbiW0L8AVQFiYpzXTFpxIUyDqIY="; - }; - - nativeBuildInputs = - [ - # Add hook responsible for configuring, building & installing. - pyprojectHook - ] - # Build systems needs to be resolved since we don't propagate dependencies. - # Otherwise dependencies of our build-system will be missing. - ++ resolveBuildSystem; - - meta = with lib; { - homepage = "https://codeberg.org/Dokana/Taskwarrior-Chained"; - description = "chained tasks"; - platforms = platforms.linux; - }; -}