From acefd3eb3e2c45aa78ba6b8f0550d1203346f0be Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Sun, 27 Oct 2024 10:51:44 +0100
Subject: [PATCH 1/4] gortr: adopt package by stv0g

---
 pkgs/servers/gortr/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/gortr/default.nix b/pkgs/servers/gortr/default.nix
index f947e6b9bd370..5c91a6b2ce005 100644
--- a/pkgs/servers/gortr/default.nix
+++ b/pkgs/servers/gortr/default.nix
@@ -26,6 +26,6 @@ buildGoModule rec {
     description = "RPKI-to-Router server used at Cloudflare";
     homepage = "https://github.com/cloudflare/gortr/";
     license = licenses.bsd3;
-    maintainers = [ ];
+    maintainers = with maintainers; [ stv0g ];
   };
 }

From 1b5b01103aa3a88c70e624144aa8c94c4215aa54 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Sun, 27 Oct 2024 10:52:14 +0100
Subject: [PATCH 2/4] gortr: format with nixfmt according to RFC166

---
 pkgs/servers/gortr/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/gortr/default.nix b/pkgs/servers/gortr/default.nix
index 5c91a6b2ce005..205d631b1e5a6 100644
--- a/pkgs/servers/gortr/default.nix
+++ b/pkgs/servers/gortr/default.nix
@@ -1,6 +1,7 @@
-{ lib
-, buildGoModule
-, fetchFromGitHub
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
 }:
 
 buildGoModule rec {

From fbc0b893e64fa55c3373326fdfa129b6b51abfb3 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Sun, 27 Oct 2024 10:55:34 +0100
Subject: [PATCH 3/4] gortr: migrate to by-name

---
 .../gortr/default.nix => by-name/go/gortr/package.nix}      | 6 +++---
 pkgs/top-level/all-packages.nix                             | 2 --
 2 files changed, 3 insertions(+), 5 deletions(-)
 rename pkgs/{servers/gortr/default.nix => by-name/go/gortr/package.nix} (83%)

diff --git a/pkgs/servers/gortr/default.nix b/pkgs/by-name/go/gortr/package.nix
similarity index 83%
rename from pkgs/servers/gortr/default.nix
rename to pkgs/by-name/go/gortr/package.nix
index 205d631b1e5a6..4bdc522e62780 100644
--- a/pkgs/servers/gortr/default.nix
+++ b/pkgs/by-name/go/gortr/package.nix
@@ -23,10 +23,10 @@ buildGoModule rec {
     "-X=main.version=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "RPKI-to-Router server used at Cloudflare";
     homepage = "https://github.com/cloudflare/gortr/";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ stv0g ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ stv0g ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46bc008246332..43205835a6cbb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -38401,8 +38401,6 @@ with pkgs;
 
   sieveshell = with python3.pkgs; toPythonApplication managesieve;
 
-  gortr = callPackage ../servers/gortr { };
-
   stayrtr = callPackage ../servers/stayrtr { };
 
   sunshine = callPackage ../servers/sunshine { };

From 038bdcf50ca4ef0acd69a154c31791c510df2d1d Mon Sep 17 00:00:00 2001
From: Steffen Vogel <post@steffenvogel.de>
Date: Sun, 27 Oct 2024 10:58:25 +0100
Subject: [PATCH 4/4] gortr: use 'hash' instead of 'sha256' attribute

---
 pkgs/by-name/go/gortr/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/go/gortr/package.nix b/pkgs/by-name/go/gortr/package.nix
index 4bdc522e62780..4adada5335756 100644
--- a/pkgs/by-name/go/gortr/package.nix
+++ b/pkgs/by-name/go/gortr/package.nix
@@ -12,7 +12,7 @@ buildGoModule rec {
     owner = "cloudflare";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-W6+zCLPcORGcRJF0F6/LRPap4SNVn/oKGs21T4nSNO0=";
+    hash = "sha256-W6+zCLPcORGcRJF0F6/LRPap4SNVn/oKGs21T4nSNO0=";
   };
 
   vendorHash = null;