taskwarrior2: rename from taskwarrior, with a warning alias
Also remove an outdated link in `taskserver/default.md`.
This commit is contained in:
Doron Behar
@@ -1,11 +1,9 @@
|
||||
# Taskserver {#module-services-taskserver}
|
||||
|
||||
Taskserver is the server component of
|
||||
Taskserver is the server component of the now deprecated version 2 of
|
||||
[Taskwarrior](https://taskwarrior.org/), a free and
|
||||
open source todo list application.
|
||||
|
||||
*Upstream documentation:* <https://taskwarrior.org/docs/#taskd>
|
||||
|
||||
## Configuration {#module-services-taskserver-configuration}
|
||||
|
||||
Taskserver does all of its authentication via TLS using client certificates,
|
||||
@@ -23,7 +21,7 @@ entity.
|
||||
|
||||
With {command}`nixos-taskserver` the client certificate is created
|
||||
along with the UUID of the user, so it handles all of the credentials needed
|
||||
in order to setup the Taskwarrior client to work with a Taskserver.
|
||||
in order to setup the Taskwarrior 2 client to work with a Taskserver.
|
||||
|
||||
## The nixos-taskserver tool {#module-services-taskserver-nixos-taskserver-tool}
|
||||
|
||||
@@ -49,7 +47,7 @@ command, documentation for each subcommand can be shown by using the
|
||||
## Declarative/automatic CA management {#module-services-taskserver-declarative-ca-management}
|
||||
|
||||
Everything is done according to what you specify in the module options,
|
||||
however in order to set up a Taskwarrior client for synchronisation with a
|
||||
however in order to set up a Taskwarrior 2 client for synchronisation with a
|
||||
Taskserver instance, you have to transfer the keys and certificates to the
|
||||
client machine.
|
||||
|
||||
|
||||
@@ -143,7 +143,7 @@ in {
|
||||
description = let
|
||||
url = "https://nixos.org/manual/nixos/stable/index.html#module-services-taskserver";
|
||||
in ''
|
||||
Whether to enable the Taskwarrior server.
|
||||
Whether to enable the Taskwarrior 2 server.
|
||||
|
||||
More instructions about NixOS in conjunction with Taskserver can be
|
||||
found [in the NixOS manual](${url}).
|
||||
@@ -327,7 +327,7 @@ in {
|
||||
Configuration options to pass to Taskserver.
|
||||
|
||||
The options here are the same as described in
|
||||
{manpage}`taskdrc(5)`, but with one difference:
|
||||
{manpage}`taskdrc(5)` from the `taskwarrior2` package, but with one difference:
|
||||
|
||||
The `server` option is
|
||||
`server.listen` here, because the
|
||||
@@ -449,7 +449,7 @@ in {
|
||||
};
|
||||
|
||||
systemd.services.taskserver = {
|
||||
description = "Taskwarrior Server";
|
||||
description = "Taskwarrior 2 Server";
|
||||
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
after = [ "network.target" ];
|
||||
|
||||
@@ -81,7 +81,7 @@ in {
|
||||
};
|
||||
|
||||
client1 = { pkgs, ... }: {
|
||||
environment.systemPackages = [ pkgs.taskwarrior pkgs.gnutls ];
|
||||
environment.systemPackages = [ pkgs.taskwarrior2 pkgs.gnutls ];
|
||||
users.users.alice.isNormalUser = true;
|
||||
users.users.bob.isNormalUser = true;
|
||||
users.users.foo.isNormalUser = true;
|
||||
|
||||
@@ -7,6 +7,10 @@
|
||||
"date": "2021-12-21",
|
||||
"new": "cmp-tmux"
|
||||
},
|
||||
"taskwarrior": {
|
||||
"date": "2024-08-13",
|
||||
"new": "taskwarrior3 or taskwarrior2"
|
||||
},
|
||||
"fern-vim": {
|
||||
"date": "2024-05-28",
|
||||
"new": "vim-fern"
|
||||
|
||||
@@ -46,7 +46,8 @@
|
||||
, statix
|
||||
, stylish-haskell
|
||||
, tabnine
|
||||
, taskwarrior
|
||||
, taskwarrior2
|
||||
, taskwarrior3
|
||||
, tmux
|
||||
, tup
|
||||
, vim
|
||||
@@ -1581,9 +1582,14 @@
|
||||
};
|
||||
};
|
||||
|
||||
taskwarrior = buildVimPlugin {
|
||||
inherit (taskwarrior) version pname;
|
||||
src = "${taskwarrior.src}/scripts/vim";
|
||||
taskwarrior3 = buildVimPlugin {
|
||||
inherit (taskwarrior3) version pname;
|
||||
src = "${taskwarrior3.src}/scripts/vim";
|
||||
};
|
||||
|
||||
taskwarrior2 = buildVimPlugin {
|
||||
inherit (taskwarrior2) version pname;
|
||||
src = "${taskwarrior2.src}/scripts/vim";
|
||||
};
|
||||
|
||||
telescope-cheat-nvim = super.telescope-cheat-nvim.overrideAttrs {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchurl, pkg-config, makeWrapper, gtk3, json_c, taskwarrior }:
|
||||
{ lib, stdenv, fetchurl, pkg-config, makeWrapper, gtk3, json_c, taskwarrior2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ptask";
|
||||
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
|
||||
preFixup = ''
|
||||
wrapProgram "$out/bin/ptask" \
|
||||
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
|
||||
--prefix PATH : "${taskwarrior}/bin"
|
||||
--prefix PATH : "${taskwarrior2}/bin"
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, perl, ncurses5, taskwarrior }:
|
||||
{ lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, perl, ncurses5, taskwarrior2 }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
version = "2020-12-17";
|
||||
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
|
||||
|
||||
DESTDIR=$out PREFIX= MANPREFIX=/share/man make install
|
||||
|
||||
wrapProgram $out/bin/tasknc --prefix PATH : ${taskwarrior}/bin
|
||||
wrapProgram $out/bin/tasknc --prefix PATH : ${taskwarrior2}/bin
|
||||
'';
|
||||
|
||||
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
{ lib
|
||||
, python3Packages
|
||||
, fetchPypi
|
||||
, taskwarrior
|
||||
, taskwarrior2
|
||||
, glibcLocales
|
||||
}:
|
||||
|
||||
@@ -24,7 +24,7 @@ buildPythonApplication rec {
|
||||
|
||||
nativeCheckInputs = [ glibcLocales ];
|
||||
|
||||
makeWrapperArgs = [ "--suffix" "PATH" ":" "${taskwarrior}/bin" ];
|
||||
makeWrapperArgs = [ "--suffix" "PATH" ":" "${taskwarrior2}/bin" ];
|
||||
|
||||
preCheck = ''
|
||||
export TERM=''${TERM-linux}
|
||||
|
||||
+22
-3
@@ -1,4 +1,14 @@
|
||||
{ lib, stdenv, fetchFromGitHub, cmake, libuuid, gnutls, python3, xdg-utils, installShellFiles }:
|
||||
{
|
||||
lib,
|
||||
stdenv,
|
||||
fetchFromGitHub,
|
||||
cmake,
|
||||
libuuid,
|
||||
gnutls,
|
||||
python3,
|
||||
xdg-utils,
|
||||
installShellFiles,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "taskwarrior";
|
||||
@@ -17,7 +27,13 @@ stdenv.mkDerivation rec {
|
||||
--replace "xdg-open" "${lib.getBin xdg-utils}/bin/xdg-open"
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ cmake libuuid gnutls python3 installShellFiles ];
|
||||
nativeBuildInputs = [
|
||||
cmake
|
||||
libuuid
|
||||
gnutls
|
||||
python3
|
||||
installShellFiles
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
preCheck = ''
|
||||
@@ -44,7 +60,10 @@ stdenv.mkDerivation rec {
|
||||
description = "Highly flexible command-line tool to manage TODO lists";
|
||||
homepage = "https://taskwarrior.org";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ marcweber oxalica ];
|
||||
maintainers = with maintainers; [
|
||||
marcweber
|
||||
oxalica
|
||||
];
|
||||
mainProgram = "task";
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
@@ -1,4 +1,4 @@
|
||||
{ lib, stdenv, substituteAll, fetchFromGitHub, taskwarrior, gettext, runtimeShell }:
|
||||
{ lib, stdenv, substituteAll, fetchFromGitHub, taskwarrior2, gettext, runtimeShell }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gnome-shell-extension-taskwhisperer";
|
||||
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
taskwarrior
|
||||
taskwarrior2
|
||||
];
|
||||
|
||||
passthru = {
|
||||
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
|
||||
patches = [
|
||||
(substituteAll {
|
||||
src = ./fix-paths.patch;
|
||||
task = "${taskwarrior}/bin/task";
|
||||
task = "${taskwarrior2}/bin/task";
|
||||
shell = runtimeShell;
|
||||
})
|
||||
];
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
lib,
|
||||
pythonPackages,
|
||||
fetchPypi,
|
||||
taskwarrior,
|
||||
taskwarrior2,
|
||||
writeShellScriptBin,
|
||||
}:
|
||||
|
||||
@@ -29,7 +29,7 @@ buildPythonPackage rec {
|
||||
];
|
||||
|
||||
nativeCheckInputs = [
|
||||
taskwarrior
|
||||
taskwarrior2
|
||||
wsl_stub
|
||||
];
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
python-dateutil,
|
||||
pythonOlder,
|
||||
pytz,
|
||||
taskwarrior,
|
||||
taskwarrior2,
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
@@ -44,7 +44,7 @@ buildPythonPackage rec {
|
||||
pytz
|
||||
];
|
||||
|
||||
checkInputs = [ taskwarrior ];
|
||||
checkInputs = [ taskwarrior2 ];
|
||||
|
||||
# TODO: doesn't pass because `can_use` fails and `task --version` seems not to be answering.
|
||||
# pythonImportsCheck = [ "taskw_ng" ];
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
setuptools,
|
||||
|
||||
# native dependencies
|
||||
pkgs,
|
||||
taskwarrior2,
|
||||
|
||||
# dependencies
|
||||
kitchen,
|
||||
@@ -39,12 +39,12 @@ buildPythonPackage rec {
|
||||
];
|
||||
postPatch = ''
|
||||
substituteInPlace taskw/warrior.py \
|
||||
--replace '@@taskwarrior@@' '${pkgs.taskwarrior}'
|
||||
--replace '@@taskwarrior@@' '${taskwarrior2}'
|
||||
'';
|
||||
|
||||
build-system = [ setuptools ];
|
||||
|
||||
buildInputs = [ pkgs.taskwarrior ];
|
||||
buildInputs = [ taskwarrior2 ];
|
||||
|
||||
dependencies = [
|
||||
kitchen
|
||||
|
||||
@@ -1427,6 +1427,7 @@ mapAliases ({
|
||||
|
||||
tabula = throw "tabula has been removed from nixpkgs, as it was broken"; # Added 2024-07-15
|
||||
tangogps = foxtrotgps; # Added 2020-01-26
|
||||
taskwarrior = lib.warn "taskwarrior was replaced by taskwarrior3, which requires manual transition from taskwarrior 2.6, read upstram's docs: https://taskwarrior.org/docs/upgrade-3/" taskwarrior2;
|
||||
taplo-cli = taplo; # Added 2022-07-30
|
||||
taplo-lsp = taplo; # Added 2022-07-30
|
||||
taro = taproot-assets; # Added 2023-07-04
|
||||
|
||||
@@ -33866,8 +33866,6 @@ with pkgs;
|
||||
|
||||
tasktimer = callPackage ../applications/misc/tasktimer { };
|
||||
|
||||
taskwarrior = callPackage ../applications/misc/taskwarrior { };
|
||||
|
||||
taskwarrior-tui = callPackage ../applications/misc/taskwarrior-tui { };
|
||||
|
||||
dstask = callPackage ../applications/misc/dstask { };
|
||||
|
||||
Reference in New Issue
Block a user