Merge pull request #185703 from anthonyroussel/dvc

dvc: 2.12.0 -> 2.17.0

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
@@ -100,8 +96,6 @@ python3.pkgs.buildPythonApplication rec {
     description = "Version Control System for Machine Learning Projects";
     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;
+    maintainers = with maintainers; [ cmcdragonkai fab anthonyroussel ];
   };
 }