From f94455c09ae717ccb059b54606e26d0be5fc6190 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 6 Feb 2025 23:23:32 +0100
Subject: [PATCH 1/2] python312Packages.scmrepo: adjust inputs

---
 pkgs/development/python-modules/scmrepo/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix
index c7964b4e0c50..2a7bdf7e8863 100644
--- a/pkgs/development/python-modules/scmrepo/default.nix
+++ b/pkgs/development/python-modules/scmrepo/default.nix
@@ -1,10 +1,9 @@
 {
   lib,
+  aiohttp-retry,
   asyncssh,
   buildPythonPackage,
   dulwich,
-  dvc-http,
-  dvc-objects,
   fetchFromGitHub,
   fsspec,
   funcy,
@@ -15,7 +14,7 @@
   pythonOlder,
   setuptools,
   setuptools-scm,
-  shortuuid,
+  tqdm,
 }:
 
 buildPythonPackage rec {
@@ -38,17 +37,16 @@ buildPythonPackage rec {
   ];
 
   dependencies = [
+    aiohttp-retry
     asyncssh
     dulwich
-    dvc-http
-    dvc-objects
     fsspec
     funcy
     gitpython
     pathspec
     pygit2
     pygtrie
-    shortuuid
+    tqdm
   ];
 
   # Requires a running Docker instance

From f033a8056b39767b123cbdd5eedbe8b149b6c343 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 6 Feb 2025 23:39:24 +0100
Subject: [PATCH 2/2] python312Packages.dvc-data: adjust inputs

---
 .../python-modules/dvc-data/default.nix          | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/dvc-data/default.nix b/pkgs/development/python-modules/dvc-data/default.nix
index 9bc1934d25ed..21ea714eb967 100644
--- a/pkgs/development/python-modules/dvc-data/default.nix
+++ b/pkgs/development/python-modules/dvc-data/default.nix
@@ -1,16 +1,18 @@
 {
   lib,
+  attrs,
   buildPythonPackage,
   dictdiffer,
   diskcache,
   dvc-objects,
   fetchFromGitHub,
-  funcy,
+  fsspec,
+  orjson,
   pygtrie,
   pythonOlder,
   setuptools-scm,
-  shortuuid,
   sqltrie,
+  tqdm,
 }:
 
 buildPythonPackage rec {
@@ -18,7 +20,7 @@ buildPythonPackage rec {
   version = "3.16.9";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.12";
 
   src = fetchFromGitHub {
     owner = "iterative";
@@ -30,13 +32,15 @@ buildPythonPackage rec {
   build-system = [ setuptools-scm ];
 
   dependencies = [
+    attrs
     dictdiffer
     diskcache
     dvc-objects
-    funcy
+    fsspec
+    orjson
     pygtrie
-    shortuuid
     sqltrie
+    tqdm
   ];
 
   # Tests depend on upath which is unmaintained and only available as wheel
@@ -46,10 +50,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "DVC's data management subsystem";
-    mainProgram = "dvc-data";
     homepage = "https://github.com/iterative/dvc-data";
     changelog = "https://github.com/iterative/dvc-data/releases/tag/${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "dvc-data";
   };
 }