From df89f90c4a93518227e610fbcf7af30473dbbfab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 4 Aug 2022 13:44:04 +0200 Subject: [PATCH] dvc: remove setuptools_scm_git_archive pin, mark broken --- .../version-management/dvc/default.nix | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix index 382f08f7afcb..2389cd98d891 100644 --- a/pkgs/applications/version-management/dvc/default.nix +++ b/pkgs/applications/version-management/dvc/default.nix @@ -20,6 +20,17 @@ python3.pkgs.buildPythonApplication rec { hash = "sha256-d1Tjqomr8Lcf+X+LZgi0wHlxXBUqHq/nAzDBbrxHAl4="; }; + 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" + substituteInPlace dvc/daemon.py \ + --subst-var-by dvc "$out/bin/dcv" + ''; + nativeBuildInputs = with python3.pkgs; [ setuptools-scm setuptools-scm-git-archive @@ -82,16 +93,6 @@ python3.pkgs.buildPythonApplication rec { importlib-resources ]; - 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" - substituteInPlace dvc/daemon.py \ - --subst-var-by dvc "$out/bin/dcv" - ''; - # Tests require access to real cloud services doCheck = false; @@ -100,5 +101,7 @@ 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; }; }