From 7c7f909ee45f4681119b49b503f85b5b02f02f08 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Sun, 21 Jul 2024 19:14:16 +0000
Subject: [PATCH 1/4] hyprlock: 0.4.0 -> 0.4.1

---
 pkgs/by-name/hy/hyprlock/package.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix
index 307475ecb535..5aa4cbb7ca9a 100644
--- a/pkgs/by-name/hy/hyprlock/package.nix
+++ b/pkgs/by-name/hy/hyprlock/package.nix
@@ -23,13 +23,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hyprlock";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprlock";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Dd/DK6FKiwVhr6PygCieEjzn7AFf6xijw6mdhquLnkw=";
+    hash = "sha256-w+AyYuqlZ/uWEimiptlHjtDFECm/JlUOD2ciCw8/+/8=";
   };
 
   strictDeps = true;
@@ -64,9 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ iynaix ];
     mainProgram = "hyprlock";
-    platforms = [
-      "aarch64-linux"
-      "x86_64-linux"
-    ];
+    platforms = lib.platforms.linux;
   };
 })

From 0d40d3a1ff082aa0ea314d8170f46d66f0b82c8b Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Sun, 21 Jul 2024 18:47:17 +0000
Subject: [PATCH 2/4] hyprwayland-scanner: 0.3.10 -> 0.4.0

---
 pkgs/by-name/hy/hyprwayland-scanner/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/hy/hyprwayland-scanner/package.nix b/pkgs/by-name/hy/hyprwayland-scanner/package.nix
index ec295b2d7285..7831921b6555 100644
--- a/pkgs/by-name/hy/hyprwayland-scanner/package.nix
+++ b/pkgs/by-name/hy/hyprwayland-scanner/package.nix
@@ -9,13 +9,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "hyprwayland-scanner";
-  version = "0.3.10";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprwayland-scanner";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-YxmfxHfWed1fosaa7fC1u7XoKp1anEZU+7Lh/ojRKoM=";
+    hash = "sha256-JPdL+Qul+jEueAn8CARfcWP83eJgwkhMejQYfDvrgvU=";
   };
 
   nativeBuildInputs = [

From dcaa3e8792b046829dda024dd601fc144a491879 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Mon, 22 Jul 2024 00:14:12 +0530
Subject: [PATCH 3/4] aquamarine: init at 0.1.1

---
 pkgs/by-name/aq/aquamarine/package.nix | 79 ++++++++++++++++++++++++++
 1 file changed, 79 insertions(+)
 create mode 100644 pkgs/by-name/aq/aquamarine/package.nix

diff --git a/pkgs/by-name/aq/aquamarine/package.nix b/pkgs/by-name/aq/aquamarine/package.nix
new file mode 100644
index 000000000000..a41a84ab6d80
--- /dev/null
+++ b/pkgs/by-name/aq/aquamarine/package.nix
@@ -0,0 +1,79 @@
+{
+  lib,
+  stdenv,
+  cmake,
+  fetchFromGitHub,
+  hwdata,
+  hyprutils,
+  hyprwayland-scanner,
+  libdisplay-info,
+  libdrm,
+  libffi,
+  libGL,
+  libinput,
+  mesa,
+  nix-update-script,
+  pixman,
+  pkg-config,
+  seatd,
+  udev,
+  wayland,
+  wayland-protocols,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "aquamarine";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "hyprwm";
+    repo = "aquamarine";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-rux5XA+ixI0fuiQGSOerLKxsW2D8cfjmP1B7FY24xF8=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    hyprwayland-scanner
+    pkg-config
+  ];
+
+  buildInputs = [
+    hyprutils
+    libdisplay-info
+    libdrm
+    libffi
+    libGL
+    libinput
+    mesa
+    pixman
+    seatd
+    udev
+    wayland
+    wayland-protocols
+  ];
+
+  depsBuildBuild = [ hwdata ];
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  cmakeBuildType = "RelWithDebInfo";
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    changelog = "https://github.com/hyprwm/aquamarine/releases/tag/${finalAttrs.version}";
+    description = "A very light linux rendering backend library";
+    homepage = "https://github.com/hyprwm/aquamarine";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
+      fufexan
+      johnrtitor
+    ];
+    platforms = lib.platforms.linux;
+  };
+})

From 6070d7f93fbf85077f64dd7d7745c56c31dcd7a4 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Mon, 22 Jul 2024 00:47:08 +0530
Subject: [PATCH 4/4] hypr{wayland-scanner,lock}: add johnrtitor as maintainer

---
 pkgs/by-name/hy/hyprlock/package.nix            | 5 ++++-
 pkgs/by-name/hy/hyprwayland-scanner/package.nix | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix
index 5aa4cbb7ca9a..36df8a7ceac5 100644
--- a/pkgs/by-name/hy/hyprlock/package.nix
+++ b/pkgs/by-name/hy/hyprlock/package.nix
@@ -62,7 +62,10 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Hyprland's GPU-accelerated screen locking utility";
     homepage = "https://github.com/hyprwm/hyprlock";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ iynaix ];
+    maintainers = with lib.maintainers; [
+      iynaix
+      johnrtitor
+    ];
     mainProgram = "hyprlock";
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/hy/hyprwayland-scanner/package.nix b/pkgs/by-name/hy/hyprwayland-scanner/package.nix
index 7831921b6555..b0a73bbceff8 100644
--- a/pkgs/by-name/hy/hyprwayland-scanner/package.nix
+++ b/pkgs/by-name/hy/hyprwayland-scanner/package.nix
@@ -36,7 +36,10 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Hyprland version of wayland-scanner in and for C++";
     changelog = "https://github.com/hyprwm/hyprwayland-scanner/releases/tag/${finalAttrs.version}";
     license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [ fufexan ];
+    maintainers = with lib.maintainers; [
+      fufexan
+      johnrtitor
+    ];
     mainProgram = "hyprwayland-scanner";
     platforms = lib.platforms.linux;
   };