From 3f060303eb6cc079b6692dfd7081d7d9bcfde6b2 Mon Sep 17 00:00:00 2001
From: Casey Avila <casey@theavilas.org>
Date: Fri, 1 May 2026 19:03:21 -0700
Subject: [PATCH 1/2] maintainers: add caseyavila

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b072a318e2b1..2c4b0a83a394 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4512,6 +4512,12 @@
     githubId = 1945;
     name = "Casey Rodarmor";
   };
+  caseyavila = {
+    email = "casey@theavilas.org";
+    github = "caseyavila";
+    githubId = 53847249;
+    name = "Casey Avila";
+  };
   catap = {
     email = "kirill@korins.ky";
     github = "catap";

From dc500a283afc8fbba954494c2c517254aab15507 Mon Sep 17 00:00:00 2001
From: Casey Avila <casey@theavilas.org>
Date: Fri, 1 May 2026 19:20:15 -0700
Subject: [PATCH 2/2] wahjam: init at 1.3.1-unstable-2023-05-30

---
 pkgs/by-name/wa/wahjam/package.nix | 76 ++++++++++++++++++++++++++++++
 1 file changed, 76 insertions(+)
 create mode 100644 pkgs/by-name/wa/wahjam/package.nix

diff --git a/pkgs/by-name/wa/wahjam/package.nix b/pkgs/by-name/wa/wahjam/package.nix
new file mode 100644
index 000000000000..e821cb7e62dd
--- /dev/null
+++ b/pkgs/by-name/wa/wahjam/package.nix
@@ -0,0 +1,76 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  makeDesktopItem,
+  copyDesktopItems,
+  pkg-config,
+  libsForQt5,
+  libogg,
+  libvorbis,
+  libresample,
+  portaudio,
+  portmidi,
+}:
+
+stdenv.mkDerivation {
+  pname = "wahjam";
+  version = "1.3.1-unstable-2023-05-30";
+
+  src = fetchFromGitHub {
+    owner = "wahjam";
+    repo = "wahjam";
+    rev = "4fde74da3be1fa53cdc2d3bc4b577b40951d6809";
+    hash = "sha256-WYfLQxToyjAE+R2eaBKpDJGfkvrOTza8a6JbN9AL3aE=";
+  };
+
+  strictDeps = true;
+  __structuredAttrs = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
+    copyDesktopItems
+  ];
+
+  buildInputs = [
+    libsForQt5.qtbase
+    libsForQt5.qtkeychain
+    libogg
+    libvorbis
+    libresample
+    portaudio
+    portmidi
+  ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "wahjam";
+      desktopName = "Wahjam";
+      icon = "net.jammr.jammr";
+      exec = "wahjam";
+      comment = "Play with musicians over the internet";
+      categories = [ "AudioVideo" ];
+    })
+  ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    mkdir -p $out/share/icons/hicolor/scalable/apps
+
+    cp qtclient/wahjam $out/bin/wahjam
+    cp qtclient/net.jammr.jammr.svg $out/share/icons/hicolor/scalable/apps
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Software for musicians to play together over the internet";
+    mainProgram = "wahjam";
+    homepage = "https://github.com/wahjam/wahjam";
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ caseyavila ];
+  };
+}