🚚 extract bugwarrior to packages

This commit is contained in:
Ingolf Wagner 2024-09-05 09:21:16 +07:00
parent 0e5387dfc0
commit 7f27ccd07c
No known key found for this signature in database
GPG key ID: 76BF5F1928B9618B
3 changed files with 38 additions and 25 deletions

View file

@ -130,7 +130,12 @@
landingpage = landingpage.packages.${system}.plain; landingpage = landingpage.packages.${system}.plain;
kmonad = kmonad.packages.${system}.kmonad; kmonad = kmonad.packages.${system}.kmonad;
tasksh = taskshell.packages.${system}.tasksh; tasksh = taskshell.packages.${system}.tasksh;
inherit (self.packages.${system}) otpmenu taskwarrior-hooks nsxiv; inherit (self.packages.${system})
otpmenu
taskwarrior-hooks
nsxiv
bugwarrior
;
}) })
]; ];
}; };

View file

@ -47,6 +47,7 @@ let
taskwarrior = pkgs.taskwarrior3; taskwarrior = pkgs.taskwarrior3;
in in
{ {
@ -64,25 +65,7 @@ in
home.file.".config/bugwarrior/bugwarrior.toml".source = home.file.".config/bugwarrior/bugwarrior.toml".source =
(pkgs.formats.toml { }).generate "bugwarriorrc.toml" (pkgs.formats.toml { }).generate "bugwarriorrc.toml"
config.bugwarrior.config; config.bugwarrior.config;
# todo : before deleting this, put it in logseq home.packages = [ pkgs.bugwarrior ];
home.packages = [
(pkgs.legacy_2311.python3Packages.bugwarrior.overrideAttrs (old: {
version = "develop";
src = pkgs.fetchFromGitHub {
owner = "ralphbean";
repo = "bugwarrior";
rev = "6554e70c199cc766a2b5e4e4fe22e4e46d64bba1";
sha256 = "sha256-cKhL8FBH7wxCxXrybVRLfCHQTCxursFqtBDl3e1UUXs=";
};
propagatedBuildInputs = old.propagatedBuildInputs ++ [
pkgs.legacy_2311.python3Packages.pydantic
pkgs.legacy_2311.python3Packages.tomli
pkgs.legacy_2311.python3Packages.email-validator
pkgs.legacy_2311.python3Packages.packaging
];
}))
];
}; };
} }
@ -92,15 +75,15 @@ in
home.packages = [ home.packages = [
taskwarrior
taskwarrior-tui
pkgs.timewarrior pkgs.timewarrior
taskwarrior
pkgs.tasksh pkgs.tasksh
pkgs.taskwarrior-hooks pkgs.taskwarrior-hooks
(pkgs.writeShellScriptBin "tsak" ''${taskwarrior}/bin/task "$@"'') (pkgs.writeShellScriptBin "tsak" ''${taskwarrior}/bin/task "$@"'')
pkgs.vit pkgs.vit
taskwarrior-tui
(pkgs.writers.writeBashBin "active" "${taskwarrior-tui}/bin/taskwarrior-tui -r active") (pkgs.writers.writeBashBin "active" "${taskwarrior-tui}/bin/taskwarrior-tui -r active")
(pkgs.writers.writeBashBin "todo" "${taskwarrior-tui}/bin/taskwarrior-tui -r todo") (pkgs.writers.writeBashBin "todo" "${taskwarrior-tui}/bin/taskwarrior-tui -r todo")

View file

@ -1,13 +1,38 @@
_: { { inputs, ... }:
{
perSystem = perSystem =
{ pkgs, ... }: { pkgs, system, ... }:
with pkgs; with pkgs;
let
legacy_2311 = import inputs.nixpkgs-legacy_2311 { inherit system; };
in
{ {
packages.pkl = callPackage ./pkl { }; packages.pkl = callPackage ./pkl { };
packages.otpmenu = callPackage ./otpmenu { }; packages.otpmenu = callPackage ./otpmenu { };
#packages.sononym = callPackage ./sononym { }; #packages.sononym = callPackage ./sononym { };
#packages.sononym-crawler = callPackage ./sononym-crawler { }; #packages.sononym-crawler = callPackage ./sononym-crawler { };
packages.taskwarrior-hooks = callPackage ./taskwarrior-hooks { }; packages.taskwarrior-hooks = callPackage ./taskwarrior-hooks { };
# overrides
# ---------
packages.nsxiv = (pkgs.nsxiv.override { conf = builtins.readFile ./nsxiv/config.def.h; }); packages.nsxiv = (pkgs.nsxiv.override { conf = builtins.readFile ./nsxiv/config.def.h; });
packages.bugwarrior = legacy_2311.python3Packages.bugwarrior.overrideAttrs (old: {
version = "develop";
src = pkgs.fetchFromGitHub {
owner = "ralphbean";
repo = "bugwarrior";
rev = "6554e70c199cc766a2b5e4e4fe22e4e46d64bba1";
sha256 = "sha256-cKhL8FBH7wxCxXrybVRLfCHQTCxursFqtBDl3e1UUXs=";
};
propagatedBuildInputs = old.propagatedBuildInputs ++ [
legacy_2311.python3Packages.pydantic
legacy_2311.python3Packages.tomli
legacy_2311.python3Packages.email-validator
legacy_2311.python3Packages.packaging
];
});
}; };
} }