From 927d6ef9a6414ca6532c5dcafb7e1f9f73c92a12 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Sun, 5 Apr 2026 21:37:47 +0200
Subject: [PATCH] drone{,-oss}: migrate to `pkgs/by-name`

---
 pkgs/by-name/dr/drone-oss/package.nix                     | 5 +++++
 .../drone/default.nix => by-name/dr/drone/package.nix}    | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 5 -----
 3 files changed, 9 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/by-name/dr/drone-oss/package.nix
 rename pkgs/{development/tools/continuous-integration/drone/default.nix => by-name/dr/drone/package.nix} (84%)

diff --git a/pkgs/by-name/dr/drone-oss/package.nix b/pkgs/by-name/dr/drone-oss/package.nix
new file mode 100644
index 000000000000..18bce8666292
--- /dev/null
+++ b/pkgs/by-name/dr/drone-oss/package.nix
@@ -0,0 +1,5 @@
+{
+  drone,
+}:
+
+drone.override { enableUnfree = false; }
diff --git a/pkgs/development/tools/continuous-integration/drone/default.nix b/pkgs/by-name/dr/drone/package.nix
similarity index 84%
rename from pkgs/development/tools/continuous-integration/drone/default.nix
rename to pkgs/by-name/dr/drone/package.nix
index 777859cedb1f..289b868acd76 100644
--- a/pkgs/development/tools/continuous-integration/drone/default.nix
+++ b/pkgs/by-name/dr/drone/package.nix
@@ -5,15 +5,15 @@
   enableUnfree ? true,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "drone.io${lib.optionalString (!enableUnfree) "-oss"}";
   version = "2.28.1";
 
   src = fetchFromGitHub {
     owner = "harness";
     repo = "drone";
-    rev = "v${version}";
-    sha256 = "sha256-p4fsQu46HX8Gc2W/RCvvjI1KZGcN2S/3ZOLty0MHmfg=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-p4fsQu46HX8Gc2W/RCvvjI1KZGcN2S/3ZOLty0MHmfg=";
   };
 
   vendorHash = "sha256-6a4Xdp8lcPq+GPewQmEPzr9hXjSrqHR7kqw7pqHzjXE=";
@@ -35,4 +35,4 @@ buildGoModule rec {
     ];
     license = with lib.licenses; if enableUnfree then unfreeRedistributable else asl20;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6fee0170889a..0c6306892b86 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2246,11 +2246,6 @@ with pkgs;
 
   diffutils = callPackage ../tools/text/diffutils { };
 
-  drone = callPackage ../development/tools/continuous-integration/drone { };
-  drone-oss = callPackage ../development/tools/continuous-integration/drone {
-    enableUnfree = false;
-  };
-
   dsview = libsForQt5.callPackage ../applications/science/electronics/dsview { };
 
   inherit (import ../build-support/dlang/dub-support.nix { inherit callPackage; })