diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 409405868e1d..3bef0191f498 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15369,14 +15369,19 @@ githubId = 31394095; }; cafkafk = { - email = "cafkafk@cafkafk.com"; + email = "christina@cafkafk.com"; matrix = "@cafkafk:matrix.cafkafk.com"; name = "Christina Sørensen"; github = "cafkafk"; githubId = 89321978; - keys = [{ - fingerprint = "7B9E E848 D074 AE03 7A0C 651A 8ED4 DEF7 375A 30C8"; - }]; + keys = [ + { + fingerprint = "7B9E E848 D074 AE03 7A0C 651A 8ED4 DEF7 375A 30C8"; + } + { + fingerprint = "208A 2A66 8A2F CDE7 B5D3 8F64 CDDC 792F 6552 51ED"; + } + ]; }; rb = { email = "maintainers@cloudposse.com"; diff --git a/pkgs/applications/misc/grb/default.nix b/pkgs/applications/misc/grb/default.nix new file mode 100644 index 000000000000..0a3d3dfd83b9 --- /dev/null +++ b/pkgs/applications/misc/grb/default.nix @@ -0,0 +1,24 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "grb"; + version = "unstable-2022-07-02"; + + src = fetchFromGitHub { + owner = "LukeSmithxyz"; + repo = pname; + rev = "35a5353ab147b930c39e1ccd369791cc4c27f0df"; + sha256 = "sha256-hQ21DXnkBJVCgGXQKDR+DjaDC3RXS2pNmSLDoHvHA4E="; + }; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + meta = with lib; { + description = "A cli-accessible Greek Bible with the Septuagint, SBL and Apocrypha"; + homepage = "https://github.com/LukeSmithxyz/grb"; + license = licenses.publicDomain; + maintainers = [ maintainers.cafkafk ]; + }; +} diff --git a/pkgs/applications/misc/kjv/default.nix b/pkgs/applications/misc/kjv/default.nix index ee599fd3b6cc..dca694bf2979 100644 --- a/pkgs/applications/misc/kjv/default.nix +++ b/pkgs/applications/misc/kjv/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation { description = "The Bible, King James Version"; homepage = "https://github.com/bontibon/kjv"; license = licenses.unlicense; - maintainers = with maintainers; [ jtobin ]; + maintainers = with maintainers; [ jtobin cafkafk ]; mainProgram = "kjv"; }; } diff --git a/pkgs/applications/misc/vul/default.nix b/pkgs/applications/misc/vul/default.nix index 9acefa939427..21a9e1f12b9e 100644 --- a/pkgs/applications/misc/vul/default.nix +++ b/pkgs/applications/misc/vul/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vul"; - version = "unstable-2020-02-15"; + version = "unstable-2022-07-02"; src = fetchFromGitHub { owner = "LukeSmithxyz"; repo = pname; - rev = "f6ebd8f6b6fb8a111e7b59470d6748fcbe71c559"; - sha256 = "aUl4f82sGOWkEvTDNILDszj5hztDRvYpHVovFl4oOCc="; + rev = "97efaedb79c9de62b6a19b04649fd8c00b85973f"; + sha256 = "sha256-NwRUx7WVvexrCdPtckq4Szf5ISy7NVBHX8uAsRtbE+0="; }; makeFlags = [ @@ -19,6 +19,6 @@ stdenv.mkDerivation rec { description = "Latin Vulgate Bible on the Command Line"; homepage = "https://github.com/LukeSmithxyz/vul"; license = licenses.publicDomain; - maintainers = [ maintainers.j0hax ]; + maintainers = [ maintainers.j0hax maintainers.cafkafk ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b104897a0f1b..6f4556b2c48b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2754,6 +2754,8 @@ with pkgs; goku = callPackage ../os-specific/darwin/goku { }; + grb = callPackage ../applications/misc/grb { }; + kerf = kerf_1; /* kerf2 is WIP */ kerf_1 = callPackage ../development/interpreters/kerf { stdenv = clangStdenv;