From 9fc93d921b32edce1afbbabf9be3f9907fe49865 Mon Sep 17 00:00:00 2001
From: cafkafk <christina@cafkafk.com>
Date: Sun, 18 Sep 2022 17:00:15 +0200
Subject: [PATCH 1/4] maintainer-list.nix: update cafkafk entry

---
 maintainers/maintainer-list.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index db656032f8e1..4c6d613f021e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -15186,13 +15186,18 @@
     }];
   };
   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";
+      }
+    ];
   };
 }

From 441730b4e8b1693d1fd38cca7a7363685ada84da Mon Sep 17 00:00:00 2001
From: cafkafk <christina@cafkafk.com>
Date: Sun, 18 Sep 2022 17:01:01 +0200
Subject: [PATCH 2/4] grb: init at 2022-07-02

---
 pkgs/applications/misc/grb/default.nix | 24 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix        |  2 ++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/misc/grb/default.nix

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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c17bc68750d4..31e814a0e612 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2726,6 +2726,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;

From 10d8a4a9d540b4dbceae81a8d7a2cc2c4137ac77 Mon Sep 17 00:00:00 2001
From: cafkafk <christina@cafkafk.com>
Date: Sun, 18 Sep 2022 17:01:27 +0200
Subject: [PATCH 3/4] vul: 2020-02-15 -> 2022-07-02

---
 pkgs/applications/misc/vul/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 ];
   };
 }

From 4052994ad8f43f095f8756fffac4b439e9cca714 Mon Sep 17 00:00:00 2001
From: cafkafk <christina@cafkafk.com>
Date: Sun, 18 Sep 2022 17:01:46 +0200
Subject: [PATCH 4/4] kjv: add cafkafk as maintainer

---
 pkgs/applications/misc/kjv/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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";
   };
 }