Merge pull request #247019 from tjni/dvc-app-and-library

python3.pkgs.dvc, dvc, dvc-with-remotes: move to python-modules since dvclive depends on it

2 files changed, 0 insertions, 120 deletions

diff --git a/pkgs/applications/version-management/dvc/default.nix b/pkgs/applications/version-management/dvc/default.nix
deleted file mode 100644
index 1cfa62ea6d47b..0000000000000
--- a/pkgs/applications/version-management/dvc/default.nix
+++ /dev/null
@@ -1,102 +0,0 @@
-{ lib
-, python3
-, fetchFromGitHub
-, fetchpatch
-, enableGoogle ? false
-, enableAWS ? false
-, enableAzure ? false
-, enableSSH ? false
-}:
-
-python3.pkgs.buildPythonApplication rec {
-  pname = "dvc";
-  version = "3.8.1";
-  format = "pyproject";
-
-  src = fetchFromGitHub {
-    owner = "iterative";
-    repo = pname;
-    rev = "refs/tags/${version}";
-    hash = "sha256-ZHB2XAYjPwhCWHqq2Kro4CzDW34YBaknv9xBotCDkOw=";
-  };
-
-  pythonRelaxDeps = [
-    "dvc-data"
-    "platformdirs"
-  ];
-
-  postPatch = ''
-    substituteInPlace dvc/analytics.py --replace 'enabled = not os.getenv(DVC_NO_ANALYTICS)' 'enabled = False'
-    substituteInPlace dvc/daemon.py \
-      --subst-var-by dvc "$out/bin/dcv"
-  '';
-
-  nativeBuildInputs = with python3.pkgs; [
-    pythonRelaxDepsHook
-    setuptools-scm
-  ];
-
-  propagatedBuildInputs = with python3.pkgs; [
-    appdirs
-    colorama
-    configobj
-    distro
-    dpath
-    dvc-data
-    dvc-http
-    dvc-render
-    dvc-studio-client
-    dvc-task
-    flatten-dict
-    flufl_lock
-    funcy
-    grandalf
-    hydra-core
-    iterative-telemetry
-    networkx
-    packaging
-    pathspec
-    platformdirs
-    psutil
-    pydot
-    pygtrie
-    pyparsing
-    requests
-    rich
-    ruamel-yaml
-    scmrepo
-    shortuuid
-    shtab
-    tabulate
-    tomlkit
-    tqdm
-    typing-extensions
-    voluptuous
-    zc_lockfile
-  ] ++ lib.optionals enableGoogle [
-    dvc-gs
-  ] ++ lib.optionals enableAWS [
-    dvc-s3
-  ] ++ lib.optionals enableAzure [
-    dvc-azure
-  ] ++ lib.optionals enableSSH [
-    dvc-ssh
-  ] ++ lib.optionals (pythonOlder "3.8") [
-    importlib-metadata
-  ] ++ lib.optionals (pythonOlder "3.9") [
-    importlib-resources
-  ];
-
-  # Tests require access to real cloud services
-  doCheck = false;
-
-  pythonImportsCheck = [ "dvc" "dvc.api" ];
-
-  meta = with lib; {
-    description = "Version Control System for Machine Learning Projects";
-    homepage = "https://dvc.org";
-    changelog = "https://github.com/iterative/dvc/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ cmcdragonkai fab ];
-  };
-}
diff --git a/pkgs/applications/version-management/dvc/dvc-daemon.patch b/pkgs/applications/version-management/dvc/dvc-daemon.patch
deleted file mode 100644
index 65ba630f3b80d..0000000000000
--- a/pkgs/applications/version-management/dvc/dvc-daemon.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/dvc/daemon.py b/dvc/daemon.py
-index 9854a0e1..fefdd613 100644
---- a/dvc/daemon.py
-+++ b/dvc/daemon.py
-@@ -103,11 +103,8 @@ def daemon(args):
-         logger.debug("skipping launching a new daemon.")
-         return
- 
--    cmd = ["daemon", "-q"] + args
--
--    env = fix_env()
--    file_path = os.path.abspath(inspect.stack()[0][1])
--    env["PYTHONPATH"] = os.path.dirname(os.path.dirname(file_path))
-+    cmd = [ "@dvc@" , "daemon", "-q"] + args
-+    env = os.environ.copy()
-     env[DVC_DAEMON] = "1"
- 
-     _spawn(cmd, env)