diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index bf2f2ccd4b8af..1062c8f8e65d7 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -15126,6 +15126,12 @@
     githubId = 29493551;
     name = "Josh Peters";
   };
+  petertrotman = {
+    email = "petertrotman@gmail.com";
+    github = "petertrotman";
+    githubId = 8298307;
+    name = "Peter Trotman";
+  };
   peterwilli = {
     email = "peter@codebuffet.co";
     github = "peterwilli";
diff --git a/pkgs/by-name/di/diagon/package.nix b/pkgs/by-name/di/diagon/package.nix
new file mode 100644
index 0000000000000..5c8a46443216d
--- /dev/null
+++ b/pkgs/by-name/di/diagon/package.nix
@@ -0,0 +1,72 @@
+{ lib, stdenv, fetchFromGitHub, fetchurl
+, boost184
+, cmake
+, jdk
+}:
+
+let
+
+  antlr = fetchFromGitHub {
+    owner = "antlr";
+    repo = "antlr4";
+    rev = "1cb4669f84cea5b59661fd44b0f80509fdacd3f9";
+    hash = "sha256-Wm9tdoxM/kXVMEx6c5DwRooF4MUG14ykF7WNGjHfSIQ=";
+    deepClone = true;
+  };
+
+  antlr-jar = fetchurl {
+    url = "http://www.antlr.org/download/antlr-4.11.1-complete.jar";
+    hash = "sha256-YpdeGStK8mIrcrXwExVT7jy86X923CpBYy3MVeJUc+E=";
+  };
+
+  json = fetchFromGitHub {
+    owner = "ArthurSonzogni";
+    repo = "nlohmann_json_cmake_fetchcontent";
+    rev = "v3.9.1";
+    hash = "sha256-5A18zFqbgDc99pqQUPcpwHi89WXb8YVR9VEwO18jH2I=";
+  };
+
+  kgt = fetchFromGitHub {
+    owner = "ArthurSonzogni";
+    repo = "kgt";
+    rev = "56c3f46cf286051096d9295118c048219fe0d776";
+    hash = "sha256-xH0htDZd2UihLn7PHKLjEYETzcBSeJFOMNredTqlCW8=";
+  };
+
+in stdenv.mkDerivation rec {
+  pname = "diagon";
+  version = "1.1.158";
+
+  src = fetchFromGitHub {
+    owner = "ArthurSonzogni";
+    repo = "Diagon";
+    rev = "v${version}";
+    hash = "sha256-Qxk3+1T0IPmvB5v3jaqvBnESpss6L8bvoW+R1l5RXdQ=";
+  };
+
+  nativeBuildInputs = [
+    boost184
+    cmake
+    jdk
+  ];
+
+  cmakeBuildDir = "build";
+  preConfigure = ''
+    mkdir -p $cmakeBuildDir
+    ln -s ${antlr-jar} $cmakeBuildDir/antlr.jar
+  '';
+
+  cmakeFlags = [
+    "-DFETCHCONTENT_SOURCE_DIR_JSON=${json}"
+    "-DFETCHCONTENT_SOURCE_DIR_ANTLR=${antlr}"
+    "-DFETCHCONTENT_SOURCE_DIR_KGT=${kgt}"
+    "-DFETCHCONTENT_FULLY_DISCONNECTED=true"
+  ];
+
+  meta = src.meta // {
+    description = "An interactive interpreter that transforms markdown-style expression into an ascii-art representation";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.petertrotman ];
+    mainProgram = "diagon";
+  };
+}