From 16934a90e6a85762bb1be20c1ecf8405ee84627f Mon Sep 17 00:00:00 2001
From: Justin Rubek <25621857+justinrubek@users.noreply.github.com>
Date: Sat, 17 Aug 2024 15:37:26 -0500
Subject: [PATCH 1/4] maintainers: add justinrubek

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4e3ac4dd33a4..099b85814add 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10365,6 +10365,11 @@
     githubId = 7183441;
     name = "Justin Lovinger";
   };
+  justinrubek = {
+    github = "justinrubek";
+    githubId = 25621857;
+    name = "Justin Rubek";
+  };
   justinwoo = {
     email = "moomoowoo@gmail.com";
     github = "justinwoo";

From ce97cf12501e420538ea15e758c6f6d086e6aeff Mon Sep 17 00:00:00 2001
From: Justin Rubek <25621857+justinrubek@users.noreply.github.com>
Date: Sat, 17 Aug 2024 15:25:16 -0500
Subject: [PATCH 2/4] rain-bittorrent: init at 1.30.0

---
 pkgs/by-name/ra/rain-bittorrent/package.nix | 27 +++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 pkgs/by-name/ra/rain-bittorrent/package.nix

diff --git a/pkgs/by-name/ra/rain-bittorrent/package.nix b/pkgs/by-name/ra/rain-bittorrent/package.nix
new file mode 100644
index 000000000000..469fe096db0f
--- /dev/null
+++ b/pkgs/by-name/ra/rain-bittorrent/package.nix
@@ -0,0 +1,27 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule {
+  pname = "rain";
+  version = "1.30.0";
+
+  src = fetchFromGitHub {
+    owner = "cenkalti";
+    repo = "rain";
+    rev = "v1.13.0";
+    sha256 = "sha256-pz20vhr3idXja7wYIdVr1dosSpqYiQfeho66rqd718I=";
+  };
+
+  vendorHash = "sha256-40DK0D9TRJDfrMbBJNpcNzvjKb/uXN/Yz5Bb7oXBh+E=";
+
+  meta = with lib; {
+    description = "BitTorrent client and library in Go";
+    homepage = "https://github.com/cenkalti/rain";
+    license = licenses.mit;
+    maintainers = with maintainers; [ justinrubek ];
+    mainProgram = "rain";
+  };
+}

From 2afd26d8d1bda96b338c8dc2af2f4208b1879f49 Mon Sep 17 00:00:00 2001
From: Matthew Dargan <matthewdargan57@gmail.com>
Date: Mon, 9 Dec 2024 23:35:45 -0600
Subject: [PATCH 3/4] maintainers: add matthewdargan

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 099b85814add..3ef426b58022 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -12764,6 +12764,12 @@
     githubId = 26458780;
     name = "Matthew Croughan";
   };
+  matthewdargan = {
+    email = "matthewdargan57@gmail.com";
+    githubId = 18505904;
+    github = "matthewdargan";
+    name = "Matthew Dargan";
+  };
   matthew-levan = {
     email = "matthew@coeli.network";
     github = "matthew-levan";

From 28b62e18cd634b2c5b875e0f0c0a294264b61a5a Mon Sep 17 00:00:00 2001
From: Matthew Dargan <matthewdargan57@gmail.com>
Date: Mon, 9 Dec 2024 23:44:30 -0600
Subject: [PATCH 4/4] rain-bittorrent: set version to 1.13.0

---
 pkgs/by-name/ra/rain-bittorrent/package.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ra/rain-bittorrent/package.nix b/pkgs/by-name/ra/rain-bittorrent/package.nix
index 469fe096db0f..977f38399642 100644
--- a/pkgs/by-name/ra/rain-bittorrent/package.nix
+++ b/pkgs/by-name/ra/rain-bittorrent/package.nix
@@ -4,24 +4,27 @@
   fetchFromGitHub,
 }:
 
-buildGoModule {
+buildGoModule rec {
   pname = "rain";
-  version = "1.30.0";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "cenkalti";
     repo = "rain";
-    rev = "v1.13.0";
-    sha256 = "sha256-pz20vhr3idXja7wYIdVr1dosSpqYiQfeho66rqd718I=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-pz20vhr3idXja7wYIdVr1dosSpqYiQfeho66rqd718I=";
   };
 
   vendorHash = "sha256-40DK0D9TRJDfrMbBJNpcNzvjKb/uXN/Yz5Bb7oXBh+E=";
 
-  meta = with lib; {
+  meta = {
     description = "BitTorrent client and library in Go";
     homepage = "https://github.com/cenkalti/rain";
-    license = licenses.mit;
-    maintainers = with maintainers; [ justinrubek ];
+    license = lib.licenses.mit;
     mainProgram = "rain";
+    maintainers = with lib.maintainers; [
+      justinrubek
+      matthewdargan
+    ];
   };
 }