From 5756220adab4ee628a75a74bd846042d3c0cb5d1 Mon Sep 17 00:00:00 2001
From: Anthony Roussel <anthony@roussel.dev>
Date: Mon, 8 Aug 2022 21:41:35 +0200
Subject: [PATCH] dvc: 2.12.0 -> 2.17.0

---
 .../version-management/dvc/default.nix           | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix
index 2389cd98d891..633aee668f41 100644
--- a/pkgs/applications/version-management/dvc/default.nix
+++ b/pkgs/applications/version-management/dvc/default.nix
@@ -10,30 +10,26 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "dvc";
-  version = "2.12.0";
+  version = "2.17.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "iterative";
     repo = pname;
     rev = version;
-    hash = "sha256-d1Tjqomr8Lcf+X+LZgi0wHlxXBUqHq/nAzDBbrxHAl4=";
+    hash = "sha256-2h+fy4KMxFrVtKJBtA1RmJDZv0OVm1BxO1akZzAw95Y=";
   };
 
   postPatch = ''
     substituteInPlace setup.cfg \
       --replace "grandalf==0.6" "grandalf" \
-      --replace "scmrepo==0.0.25" "scmrepo" \
-      --replace "dvc-data==0.0.16" "dvc-data" \
-      --replace "dvc-render==0.0.6" "dvc-render" \
-      --replace "setuptools_scm_git_archive==1.1" "setuptools_scm_git_archive"
+      --replace "scmrepo==0.0.25" "scmrepo"
     substituteInPlace dvc/daemon.py \
       --subst-var-by dvc "$out/bin/dcv"
   '';
 
   nativeBuildInputs = with python3.pkgs; [
     setuptools-scm
-    setuptools-scm-git-archive
   ];
 
   propagatedBuildInputs = with python3.pkgs; [
@@ -41,7 +37,6 @@ python3.pkgs.buildPythonApplication rec {
     appdirs
     colorama
     configobj
-    configobj
     dictdiffer
     diskcache
     distro
@@ -49,6 +44,7 @@ python3.pkgs.buildPythonApplication rec {
     dvclive
     dvc-data
     dvc-render
+    dvc-task
     flatten-dict
     flufl_lock
     funcy
@@ -70,7 +66,7 @@ python3.pkgs.buildPythonApplication rec {
     shortuuid
     shtab
     tabulate
-    toml
+    tomlkit
     tqdm
     typing-extensions
     voluptuous
@@ -101,7 +97,5 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://dvc.org";
     license = licenses.asl20;
     maintainers = with maintainers; [ cmcdragonkai fab ];
-    # ImportError: cannot import name 'GDriveAuthError' from 'dvc_objects.fs.implementations.gdrive'
-    broken = true;
   };
 }