From 7bed4525edbd243ad1203900fccfd1a95a7ab747 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Thu, 21 May 2026 17:17:42 -0600
Subject: [PATCH 1/2] git-annex-remote-dbx: switch to pyproject

---
 .../git-annex-remote-dbx/default.nix          | 21 ++++++++++++-------
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/version-management/git-annex-remote-dbx/default.nix b/pkgs/applications/version-management/git-annex-remote-dbx/default.nix
index 7744598f1566..01467e9e713c 100644
--- a/pkgs/applications/version-management/git-annex-remote-dbx/default.nix
+++ b/pkgs/applications/version-management/git-annex-remote-dbx/default.nix
@@ -1,23 +1,28 @@
 {
   lib,
   buildPythonApplication,
-  fetchPypi,
+  fetchFromGitHub,
+  setuptools,
   dropbox,
   annexremote,
   humanfriendly,
 }:
 
-buildPythonApplication rec {
+buildPythonApplication (finalAttrs: {
   pname = "git-annex-remote-dbx";
   version = "1.0.3";
-  format = "setuptools";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "5b6f8025ed1e9877f06882ddbd81f701a8e094647ab97595e2afc09016835a7c";
+  src = fetchFromGitHub {
+    owner = "montag451";
+    repo = "git-annex-remote-dbx";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-a1mCLFd9fykzX3BxQBsOe6oPUzQjAzyfxExFlXCOAvQ=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     dropbox
     annexremote
     humanfriendly
@@ -30,4 +35,4 @@ buildPythonApplication rec {
     mainProgram = "git-annex-remote-dbx";
     maintainers = with lib.maintainers; [ matthiasbeyer ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 830b0307bcb4..e68ebfb65b8a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1156,6 +1156,7 @@ with pkgs;
   git-annex-remote-dbx = callPackage ../applications/version-management/git-annex-remote-dbx {
     inherit (python3Packages)
       buildPythonApplication
+      setuptools
       dropbox
       annexremote
       humanfriendly

From feeefe497dd14208f8fd87128e05bc3921819605 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Fri, 22 May 2026 15:16:11 -0600
Subject: [PATCH 2/2] git-annex-remote-dbx: move to by-name

---
 .../gi/git-annex-remote-dbx/package.nix}             | 12 ++++--------
 pkgs/top-level/all-packages.nix                      | 10 ----------
 2 files changed, 4 insertions(+), 18 deletions(-)
 rename pkgs/{applications/version-management/git-annex-remote-dbx/default.nix => by-name/gi/git-annex-remote-dbx/package.nix} (78%)

diff --git a/pkgs/applications/version-management/git-annex-remote-dbx/default.nix b/pkgs/by-name/gi/git-annex-remote-dbx/package.nix
similarity index 78%
rename from pkgs/applications/version-management/git-annex-remote-dbx/default.nix
rename to pkgs/by-name/gi/git-annex-remote-dbx/package.nix
index 01467e9e713c..60870c18602a 100644
--- a/pkgs/applications/version-management/git-annex-remote-dbx/default.nix
+++ b/pkgs/by-name/gi/git-annex-remote-dbx/package.nix
@@ -1,14 +1,10 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitHub,
-  setuptools,
-  dropbox,
-  annexremote,
-  humanfriendly,
 }:
 
-buildPythonApplication (finalAttrs: {
+python3Packages.buildPythonApplication (finalAttrs: {
   pname = "git-annex-remote-dbx";
   version = "1.0.3";
   pyproject = true;
@@ -20,9 +16,9 @@ buildPythonApplication (finalAttrs: {
     hash = "sha256-a1mCLFd9fykzX3BxQBsOe6oPUzQjAzyfxExFlXCOAvQ=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [ python3Packages.setuptools ];
 
-  dependencies = [
+  dependencies = with python3Packages; [
     dropbox
     annexremote
     humanfriendly
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e68ebfb65b8a..cd2da847d47d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1153,16 +1153,6 @@ with pkgs;
 
   github-cli = gh;
 
-  git-annex-remote-dbx = callPackage ../applications/version-management/git-annex-remote-dbx {
-    inherit (python3Packages)
-      buildPythonApplication
-      setuptools
-      dropbox
-      annexremote
-      humanfriendly
-      ;
-  };
-
   git-credential-manager = callPackage ../applications/version-management/git-credential-manager { };
 
   git-credential-aol = callPackage ../by-name/gi/git-credential-email/git-credential-aol { };