commit 54698e8db6571687e09c33763572d7894bcb86b4 · pyrox.dev/nixpkgs

+3 -5

nixos/modules/services/misc/taskserver/default.md

···

       1
       1
        
       # Taskserver {#module-services-taskserver}

     

       2
       2
        
       

     

       3
       3
       -
       Taskserver is the server component of

     

       3
       3
       +
       Taskserver is the server component of the now deprecated version 2 of

     

       4
       4
        
       [Taskwarrior](https://taskwarrior.org/), a free and

     

       5
       5
        
       open source todo list application.

     

       6
       6
       -
       

     

       7
       7
       -
       *Upstream documentation:* <https://taskwarrior.org/docs/#taskd>

     

       8
       6
        
       

     

       9
       7
        
       ## Configuration {#module-services-taskserver-configuration}

     

       10
       8
        
       

     
···

       23
       21
        
       

     

       24
       22
        
       With {command}`nixos-taskserver` the client certificate is created

     

       25
       23
        
       along with the UUID of the user, so it handles all of the credentials needed

     

       26
       26
       -
       in order to setup the Taskwarrior client to work with a Taskserver.

     

       24
       24
       +
       in order to setup the Taskwarrior 2 client to work with a Taskserver.

     

       27
       25
        
       

     

       28
       26
        
       ## The nixos-taskserver tool {#module-services-taskserver-nixos-taskserver-tool}

     

       29
       27
        
       

     
···

       49
       47
        
       ## Declarative/automatic CA management {#module-services-taskserver-declarative-ca-management}

     

       50
       48
        
       

     

       51
       49
        
       Everything is done according to what you specify in the module options,

     

       52
       52
       -
       however in order to set up a Taskwarrior client for synchronisation with a

     

       50
       50
       +
       however in order to set up a Taskwarrior 2 client for synchronisation with a

     

       53
       51
        
       Taskserver instance, you have to transfer the keys and certificates to the

     

       54
       52
        
       client machine.

     

       55
       53

+3 -3

nixos/modules/services/misc/taskserver/default.nix

···

       143
       143
        
               description = let

     

       144
       144
        
                 url = "https://nixos.org/manual/nixos/stable/index.html#module-services-taskserver";

     

       145
       145
        
               in ''

     

       146
       146
       -
                 Whether to enable the Taskwarrior server.

     

       146
       146
       +
                 Whether to enable the Taskwarrior 2 server.

     

       147
       147
        
       

     

       148
       148
        
                 More instructions about NixOS in conjunction with Taskserver can be

     

       149
       149
        
                 found [in the NixOS manual](${url}).

     
···

       327
       327
        
                 Configuration options to pass to Taskserver.

     

       328
       328
        
       

     

       329
       329
        
                 The options here are the same as described in

     

       330
       330
       -
                 {manpage}`taskdrc(5)`, but with one difference:

     

       330
       330
       +
                 {manpage}`taskdrc(5)` from the `taskwarrior2` package, but with one difference:

     

       331
       331
        
       

     

       332
       332
        
                 The `server` option is

     

       333
       333
        
                 `server.listen` here, because the

     
···

       449
       449
        
             };

     

       450
       450
        
       

     

       451
       451
        
             systemd.services.taskserver = {

     

       452
       452
       -
               description = "Taskwarrior Server";

     

       452
       452
       +
               description = "Taskwarrior 2 Server";

     

       453
       453
        
       

     

       454
       454
        
               wantedBy = [ "multi-user.target" ];

     

       455
       455
        
               after = [ "network.target" ];

+1 -1

nixos/tests/taskserver.nix

···

       81
       81
        
           };

     

       82
       82
        
       

     

       83
       83
        
           client1 = { pkgs, ... }: {

     

       84
       84
       -
             environment.systemPackages = [ pkgs.taskwarrior pkgs.gnutls ];

     

       84
       84
       +
             environment.systemPackages = [ pkgs.taskwarrior2 pkgs.gnutls ];

     

       85
       85
        
             users.users.alice.isNormalUser = true;

     

       86
       86
        
             users.users.bob.isNormalUser = true;

     

       87
       87
        
             users.users.foo.isNormalUser = true;

+4

pkgs/applications/editors/vim/plugins/deprecated.json

···

       7
       7
        
               "date": "2021-12-21",

     

       8
       8
        
               "new": "cmp-tmux"

     

       9
       9
        
           },

     

       10
       10
       +
           "taskwarrior": {

     

       11
       11
       +
               "date": "2024-08-13",

     

       12
       12
       +
               "new": "taskwarrior3 or taskwarrior2"

     

       13
       13
       +
           },

     

       10
       14
        
           "fern-vim": {

     

       11
       15
        
               "date": "2024-05-28",

     

       12
       16
        
               "new": "vim-fern"

+10 -4

pkgs/applications/editors/vim/plugins/overrides.nix

···

       46
       46
        
       , statix

     

       47
       47
        
       , stylish-haskell

     

       48
       48
        
       , tabnine

     

       49
       49
       -
       , taskwarrior

     

       49
       49
       +
       , taskwarrior2

     

       50
       50
       +
       , taskwarrior3

     

       50
       51
        
       , tmux

     

       51
       52
        
       , tup

     

       52
       53
        
       , vim

     
···

       1581
       1582
        
             };

     

       1582
       1583
        
           };

     

       1583
       1584
        
       

     

       1584
       1584
       -
         taskwarrior = buildVimPlugin {

     

       1585
       1585
       -
           inherit (taskwarrior) version pname;

     

       1586
       1586
       -
           src = "${taskwarrior.src}/scripts/vim";

     

       1585
       1585
       +
         taskwarrior3 = buildVimPlugin {

     

       1586
       1586
       +
           inherit (taskwarrior3) version pname;

     

       1587
       1587
       +
           src = "${taskwarrior3.src}/scripts/vim";

     

       1588
       1588
       +
         };

     

       1589
       1589
       +
       

     

       1590
       1590
       +
         taskwarrior2 = buildVimPlugin {

     

       1591
       1591
       +
           inherit (taskwarrior2) version pname;

     

       1592
       1592
       +
           src = "${taskwarrior2.src}/scripts/vim";

     

       1587
       1593
        
         };

     

       1588
       1594
        
       

     

       1589
       1595
        
         telescope-cheat-nvim = super.telescope-cheat-nvim.overrideAttrs {

+2 -2

pkgs/applications/misc/ptask/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchurl, pkg-config, makeWrapper, gtk3, json_c, taskwarrior }:

     

       1
       1
       +
       { lib, stdenv, fetchurl, pkg-config, makeWrapper, gtk3, json_c, taskwarrior2 }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "ptask";

     
···

       18
       18
        
         preFixup = ''

     

       19
       19
        
           wrapProgram "$out/bin/ptask" \

     

       20
       20
        
             --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \

     

       21
       21
       -
             --prefix PATH : "${taskwarrior}/bin"

     

       21
       21
       +
             --prefix PATH : "${taskwarrior2}/bin"

     

       22
       22
        
         '';

     

       23
       23
        
       

     

       24
       24
        
         meta = with lib; {

+2 -2

pkgs/applications/misc/tasknc/default.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, perl, ncurses5, taskwarrior }:

     

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, fetchpatch, makeWrapper, perl, ncurses5, taskwarrior2 }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         version = "2020-12-17";

     
···

       39
       39
        
       

     

       40
       40
        
           DESTDIR=$out PREFIX= MANPREFIX=/share/man make install

     

       41
       41
        
       

     

       42
       42
       -
           wrapProgram $out/bin/tasknc --prefix PATH : ${taskwarrior}/bin

     

       42
       42
       +
           wrapProgram $out/bin/tasknc --prefix PATH : ${taskwarrior2}/bin

     

       43
       43
        
         '';

     

       44
       44
        
       

     

       45
       45

+22 -3

pkgs/applications/misc/taskwarrior/default.nix pkgs/by-name/ta/taskwarrior2/package.nix

···

       1
       1
       -
       { lib, stdenv, fetchFromGitHub, cmake, libuuid, gnutls, python3, xdg-utils, installShellFiles }:

     

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         cmake,

     

       6
       6
       +
         libuuid,

     

       7
       7
       +
         gnutls,

     

       8
       8
       +
         python3,

     

       9
       9
       +
         xdg-utils,

     

       10
       10
       +
         installShellFiles,

     

       11
       11
       +
       }:

     

       2
       12
        
       

     

       3
       13
        
       stdenv.mkDerivation rec {

     

       4
       14
        
         pname = "taskwarrior";

     
···

       17
       27
        
             --replace "xdg-open" "${lib.getBin xdg-utils}/bin/xdg-open"

     

       18
       28
        
         '';

     

       19
       29
        
       

     

       20
       20
       -
         nativeBuildInputs = [ cmake libuuid gnutls python3 installShellFiles ];

     

       30
       30
       +
         nativeBuildInputs = [

     

       31
       31
       +
           cmake

     

       32
       32
       +
           libuuid

     

       33
       33
       +
           gnutls

     

       34
       34
       +
           python3

     

       35
       35
       +
           installShellFiles

     

       36
       36
       +
         ];

     

       21
       37
        
       

     

       22
       38
        
         doCheck = true;

     

       23
       39
        
         preCheck = ''

     
···

       44
       60
        
           description = "Highly flexible command-line tool to manage TODO lists";

     

       45
       61
        
           homepage = "https://taskwarrior.org";

     

       46
       62
        
           license = licenses.mit;

     

       47
       47
       -
           maintainers = with maintainers; [ marcweber oxalica ];

     

       63
       63
       +
           maintainers = with maintainers; [

     

       64
       64
       +
             marcweber

     

       65
       65
       +
             oxalica

     

       66
       66
       +
           ];

     

       48
       67
        
           mainProgram = "task";

     

       49
       68
        
           platforms = platforms.unix;

     

       50
       69
        
         };

+2 -2

pkgs/applications/misc/vit/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , python3Packages

     

       3
       3
        
       , fetchPypi

     

       4
       4
       -
       , taskwarrior

     

       4
       4
       +
       , taskwarrior2

     

       5
       5
        
       , glibcLocales

     

       6
       6
        
       }:

     

       7
       7
        
       

     
···

       24
       24
        
       

     

       25
       25
        
         nativeCheckInputs = [ glibcLocales ];

     

       26
       26
        
       

     

       27
       27
       -
         makeWrapperArgs = [ "--suffix" "PATH" ":" "${taskwarrior}/bin" ];

     

       27
       27
       +
         makeWrapperArgs = [ "--suffix" "PATH" ":" "${taskwarrior2}/bin" ];

     

       28
       28
        
       

     

       29
       29
        
         preCheck = ''

     

       30
       30
        
           export TERM=''${TERM-linux}

+3 -3

pkgs/desktops/gnome/extensions/taskwhisperer/default.nix

···

       1
       1
       -
       { lib, stdenv, substituteAll, fetchFromGitHub, taskwarrior, gettext, runtimeShell }:

     

       1
       1
       +
       { lib, stdenv, substituteAll, fetchFromGitHub, taskwarrior2, gettext, runtimeShell }:

     

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "gnome-shell-extension-taskwhisperer";

     
···

       16
       16
        
         ];

     

       17
       17
        
       

     

       18
       18
        
         buildInputs = [

     

       19
       19
       -
           taskwarrior

     

       19
       19
       +
           taskwarrior2

     

       20
       20
        
         ];

     

       21
       21
        
       

     

       22
       22
        
         passthru = {

     
···

       31
       31
        
         patches = [

     

       32
       32
        
           (substituteAll {

     

       33
       33
        
             src = ./fix-paths.patch;

     

       34
       34
       -
             task = "${taskwarrior}/bin/task";

     

       34
       34
       +
             task = "${taskwarrior2}/bin/task";

     

       35
       35
        
             shell = runtimeShell;

     

       36
       36
        
           })

     

       37
       37
        
         ];

+2 -2

pkgs/development/python-modules/tasklib/default.nix

···

       2
       2
        
         lib,

     

       3
       3
        
         pythonPackages,

     

       4
       4
        
         fetchPypi,

     

       5
       5
       -
         taskwarrior,

     

       5
       5
       +
         taskwarrior2,

     

       6
       6
        
         writeShellScriptBin,

     

       7
       7
        
       }:

     

       8
       8
        
       

     
···

       29
       29
        
         ];

     

       30
       30
        
       

     

       31
       31
        
         nativeCheckInputs = [

     

       32
       32
       -
           taskwarrior

     

       32
       32
       +
           taskwarrior2

     

       33
       33
        
           wsl_stub

     

       34
       34
        
         ];

     

       35
       35

+2 -2

pkgs/development/python-modules/taskw-ng/default.nix

···

       9
       9
        
         python-dateutil,

     

       10
       10
        
         pythonOlder,

     

       11
       11
        
         pytz,

     

       12
       12
       -
         taskwarrior,

     

       12
       12
       +
         taskwarrior2,

     

       13
       13
        
       }:

     

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     
···

       44
       44
        
           pytz

     

       45
       45
        
         ];

     

       46
       46
        
       

     

       47
       47
       -
         checkInputs = [ taskwarrior ];

     

       47
       47
       +
         checkInputs = [ taskwarrior2 ];

     

       48
       48
        
       

     

       49
       49
        
         # TODO: doesn't pass because `can_use` fails and `task --version` seems not to be answering.

     

       50
       50
        
         # pythonImportsCheck = [ "taskw_ng" ];

+3 -3

pkgs/development/python-modules/taskw/default.nix

···

       8
       8
        
         setuptools,

     

       9
       9
        
       

     

       10
       10
        
         # native dependencies

     

       11
       11
       -
         pkgs,

     

       11
       11
       +
         taskwarrior2,

     

       12
       12
        
       

     

       13
       13
        
         # dependencies

     

       14
       14
        
         kitchen,

     
···

       39
       39
        
         ];

     

       40
       40
        
         postPatch = ''

     

       41
       41
        
           substituteInPlace taskw/warrior.py \

     

       42
       42
       -
             --replace '@@taskwarrior@@' '${pkgs.taskwarrior}'

     

       42
       42
       +
             --replace '@@taskwarrior@@' '${taskwarrior2}'

     

       43
       43
        
         '';

     

       44
       44
        
       

     

       45
       45
        
         build-system = [ setuptools ];

     

       46
       46
        
       

     

       47
       47
       -
         buildInputs = [ pkgs.taskwarrior ];

     

       47
       47
       +
         buildInputs = [ taskwarrior2 ];

     

       48
       48
        
       

     

       49
       49
        
         dependencies = [

     

       50
       50
        
           kitchen

+1

pkgs/top-level/aliases.nix

···

       1427
       1427
        
       

     

       1428
       1428
        
         tabula = throw "tabula has been removed from nixpkgs, as it was broken"; # Added 2024-07-15

     

       1429
       1429
        
         tangogps = foxtrotgps; # Added 2020-01-26

     

       1430
       1430
       +
         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;

     

       1430
       1431
        
         taplo-cli = taplo; # Added 2022-07-30

     

       1431
       1432
        
         taplo-lsp = taplo; # Added 2022-07-30

     

       1432
       1433
        
         taro = taproot-assets; # Added 2023-07-04

-2

pkgs/top-level/all-packages.nix

···

       33866
       33866
        
       

     

       33867
       33867
        
         tasktimer = callPackage ../applications/misc/tasktimer { };

     

       33868
       33868
        
       

     

       33869
       33869
       -
         taskwarrior = callPackage ../applications/misc/taskwarrior { };

     

       33870
       33870
       -
       

     

       33871
       33869
        
         taskwarrior-tui = callPackage ../applications/misc/taskwarrior-tui { };

     

       33872
       33870
        
       

     

       33873
       33871
        
         dstask = callPackage ../applications/misc/dstask { };