diff options
| author | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2025-04-04 18:14:29 +0200 |
|---|---|---|
| committer | Benedikt Peetz <benedikt.peetz@b-peetz.de> | 2025-04-04 18:14:29 +0200 |
| commit | 6cb74a26b10088c8c2d9c72076d3d25f72a163f7 (patch) | |
| tree | 3c96a0c41f9abe479f8e0eb7b8db81945c1094ea /modules/by-name | |
| parent | fix(pkgs/tskm): Specify dependencies (diff) | |
| download | nixos-config-6cb74a26b10088c8c2d9c72076d3d25f72a163f7.zip | |
fix(treewide): Migrate to taskwarrior version 3
Diffstat (limited to '')
| -rw-r--r-- | modules/by-name/ta/taskwarrior/module.nix | 4 | ||||
| -rw-r--r-- | modules/by-name/ti/timewarrior/module.nix | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/modules/by-name/ta/taskwarrior/module.nix b/modules/by-name/ta/taskwarrior/module.nix index 3d53706c..cad3f05e 100644 --- a/modules/by-name/ta/taskwarrior/module.nix +++ b/modules/by-name/ta/taskwarrior/module.nix @@ -23,7 +23,7 @@ executable = pkgs.writeShellApplication { name = "add-hook-${builtins.baseNameOf path}"; - runtimeInputs = [pkgs.taskwarrior pkgs.coreutils] ++ deps; + runtimeInputs = [pkgs.taskwarrior3 pkgs.coreutils] ++ deps; inheritPath = false; text = # bash @@ -91,7 +91,7 @@ in { config = { lib.taskwarrior = { - mkHook = mkHook; + inherit mkHook; }; home-manager.users.soispha = lib.mkIf cfg.enable { diff --git a/modules/by-name/ti/timewarrior/module.nix b/modules/by-name/ti/timewarrior/module.nix index d6b4dc32..d262fbe6 100644 --- a/modules/by-name/ti/timewarrior/module.nix +++ b/modules/by-name/ti/timewarrior/module.nix @@ -13,7 +13,7 @@ ]; buildInputs = [ pkgs.timewarrior - pkgs.taskwarrior + pkgs.taskwarrior3 # TODO: Use a `taskw` package, that actually supports newer python variants <2024-07-13> (pkgs.python311.withPackages (pythonPackages: with pythonPackages; [ @@ -24,7 +24,7 @@ installPhase = '' install -Dm755 ${./taskwarirror_hooks/on-modify_track-timewarrior.py} $out/bin/bin wrapProgram $out/bin/bin \ - --prefix PATH : ${lib.makeBinPath [pkgs.taskwarrior pkgs.timewarrior]} + --prefix PATH : ${lib.makeBinPath [pkgs.taskwarrior3 pkgs.timewarrior]} ''; meta.mainProgram = "bin"; @@ -35,7 +35,7 @@ pkgs.makeWrapper ]; buildInputs = [ - pkgs.taskwarrior + pkgs.taskwarrior3 # TODO: Use a `taskw` package, that actually supports newer python variants <2024-07-13> (pkgs.python311.withPackages (pythonPackages: with pythonPackages; [ @@ -46,7 +46,7 @@ installPhase = '' install -Dm755 ${./taskwarirror_hooks/on-modify_track-total-active-time.py} $out/bin/bin wrapProgram $out/bin/bin \ - --prefix PATH : ${lib.makeBinPath [pkgs.taskwarrior]} + --prefix PATH : ${lib.makeBinPath [pkgs.taskwarrior3]} ''; meta.mainProgram = "bin"; |