diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ce292e764ae2..0b0b09bb6fb4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -14883,6 +14883,13 @@ name = "legendofmiracles"; keys = [ { fingerprint = "CC50 F82C 985D 2679 0703 AF15 19B0 82B3 DEFE 5451"; } ]; }; + lomenzel = { + name = "Leonard-Orlando Menzel"; + email = "leonard.menzel@tutanota.com"; + matrix = "@leonard:menzel.lol"; + github = "lomenzel"; + githubId = 79226837; + }; lonerOrz = { email = "2788892716@qq.com"; name = "lonerOrz"; diff --git a/pkgs/games/anki/addons/anki-utils.nix b/pkgs/games/anki/addons/anki-utils.nix index 56096cf0f4c0..f27d4f511c57 100644 --- a/pkgs/games/anki/addons/anki-utils.nix +++ b/pkgs/games/anki/addons/anki-utils.nix @@ -54,7 +54,7 @@ installPhase = '' runHook preInstall - mkdir -p "$out/$installPrefix" + mkdir -p "$out/$installPrefix/user_files" find . -mindepth 1 -maxdepth 1 | xargs -d'\n' mv -t "$out/$installPrefix/" runHook postInstall @@ -89,7 +89,6 @@ rm -f meta.json ln -s ${addonMetaConfig} meta.json - mkdir -p user_files ${ if (userFiles != null) then '' diff --git a/pkgs/games/anki/addons/default.nix b/pkgs/games/anki/addons/default.nix index 89adf8c5401d..d0ca4190fc44 100644 --- a/pkgs/games/anki/addons/default.nix +++ b/pkgs/games/anki/addons/default.nix @@ -12,6 +12,8 @@ passfail2 = callPackage ./passfail2 { }; + puppy-reinforcement = callPackage ./puppy-reinforcement { }; + recolor = callPackage ./recolor { }; reviewer-refocus-card = callPackage ./reviewer-refocus-card { }; diff --git a/pkgs/games/anki/addons/puppy-reinforcement/default.nix b/pkgs/games/anki/addons/puppy-reinforcement/default.nix new file mode 100644 index 000000000000..f4550d60bec8 --- /dev/null +++ b/pkgs/games/anki/addons/puppy-reinforcement/default.nix @@ -0,0 +1,39 @@ +{ + lib, + anki-utils, + fetchFromGitHub, + nix-update-script, +}: +anki-utils.buildAnkiAddon (finalAttrs: { + pname = "puppy-reinforcement"; + version = "1.1.1"; + src = fetchFromGitHub { + owner = "glutanimate"; + repo = "puppy-reinforcement"; + tag = "v${finalAttrs.version}"; + hash = "sha256-y52AjmYrFTcTwd4QAcJzK5R9wwxUSlvnN3C2O/r5cHk="; + }; + sourceRoot = "${finalAttrs.src.name}/src/puppy_reinforcement"; + passthru.updateScript = nix-update-script { }; + meta = { + description = "Encourage learners with pictures of cute puppies"; + longDescription = '' + The options to configure this add-on can be found [here](https://github.com/glutanimate/puppy-reinforcement/blob/v${finalAttrs.version}/src/puppy_reinforcement/config.md). + Extra images can also be added with `userFiles`. + + Example: + + ```nix + pkgs.ankiAddons.puppy-reinforcement.withConfig { + config = { + encourage_every = 5; + }; + userFiles = ./my-folder-of-the-most-cute-dogos; + } + ``` + ''; + homepage = "https://ankiweb.net/shared/info/1722658993"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ lomenzel ]; + }; +})