From 3fd24c2ee8f9b2b7a78b4c41f41f2b74ebd6fe56 Mon Sep 17 00:00:00 2001
From: Mason Mackaman <masondeanm@aol.com>
Date: Sat, 19 Nov 2022 15:06:14 -0500
Subject: [PATCH 1/2] maintainers: Add ursi

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 33d6bcd382f3..f50910047ecb 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -14271,6 +14271,12 @@
     githubId = 32751441;
     name = "urlordjames";
   };
+  ursi = {
+    email = "masondeanm@aol.com";
+    github = "ursi";
+    githubId = 17836748;
+    name = "Mason Mackaman";
+  };
   uskudnik = {
     email = "urban.skudnik@gmail.com";
     github = "uskudnik";

From cb0fc208b6febd743541206f7d73b1bb47806417 Mon Sep 17 00:00:00 2001
From: Mason Mackaman <masondeanm@aol.com>
Date: Sat, 19 Nov 2022 15:07:56 -0500
Subject: [PATCH 2/2] hexgui: init at unstable-2022-5-30

---
 pkgs/games/hexgui/default.nix   | 36 +++++++++++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix |  2 ++
 2 files changed, 38 insertions(+)
 create mode 100644 pkgs/games/hexgui/default.nix

diff --git a/pkgs/games/hexgui/default.nix b/pkgs/games/hexgui/default.nix
new file mode 100644
index 000000000000..1282f03a0eb4
--- /dev/null
+++ b/pkgs/games/hexgui/default.nix
@@ -0,0 +1,36 @@
+{ ant
+, fetchFromGitHub
+, jdk
+, lib
+, makeWrapper
+, stdenv
+}:
+stdenv.mkDerivation {
+  pname = "hexgui";
+  version = "unstable-2022-5-30";
+
+  src = fetchFromGitHub {
+    owner = "selinger";
+    repo = "hexgui";
+    rev = "d94ce1d35a22dad28d3e7def4d28e6bebd54da9d";
+    hash = "sha256-1MroFH2JSEZHFigcsw1+xyHJWEnHTvHmRPVirUgwM6I=";
+  };
+
+  nativeBuildInputs = [ ant jdk makeWrapper ];
+  buildPhase = ''
+    ant
+  '';
+
+  installPhase = ''
+    mkdir $out
+    mv bin lib $out
+    wrapProgram $out/bin/hexgui --prefix PATH : ${lib.makeBinPath [ jdk ]}
+  '';
+
+  meta = {
+    description = "GUI for the board game Hex (and Y)";
+    homepage = "https://github.com/selinger/hexgui";
+    license = lib.licenses.gpl3;
+    maintainers = [ lib.maintainers.ursi ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24bbf58576b0..4b1e33dc899f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7811,6 +7811,8 @@ with pkgs;
   hexd = callPackage ../tools/misc/hexd { };
   pixd = callPackage ../tools/misc/pixd { };
 
+  hexgui = callPackage ../games/hexgui { };
+
   hey = callPackage ../tools/networking/hey { };
 
   hhpc = callPackage ../tools/misc/hhpc { };