Unverified Commit e09f9b78 authored by Fabian Affolter's avatar Fabian Affolter Committed by GitHub
Browse files

Merge pull request #166346 from SuperSandro2000/dvc-with-remotes 

dvc: 2.9.3 -> 2.9.5
parents 78df29df 40ded161

pkgs/applications/version-management/dvc/default.nix

+25 −11
Original line number Diff line number Diff line 
{ lib

, python3

, fetchFromGitHub

, fetchpatch

, enableGoogle ? false

, enableAWS ? false

, enableAzure ? false
@@ -9,16 +10,38 @@ 


python3.pkgs.buildPythonApplication rec {

  pname = "dvc";

  version = "2.9.3";

  version = "2.9.5";

  format = "setuptools";



  src = fetchFromGitHub {

    owner = "iterative";

    repo = pname;

    rev = version;

    hash = "sha256-nRlgo7Wjs7RgTUxoMYQh5YEsqiJtdWH2ex79rhXagAQ=";

    hash = "sha256-MviiA0ja1IaxMPlqu2dhIGBcdEXiEvBYnK9731dihMg=";

  };



  # make the patch apply

  prePatch = ''

    substituteInPlace setup.cfg \

      --replace "scmrepo==0.0.7" "scmrepo==0.0.10"

  '';



  patches = [

    ./dvc-daemon.patch

    (fetchpatch {

      url = "https://github.com/iterative/dvc/commit/ab54b5bdfcef3576b455a17670b8df27beb504ce.patch";

      sha256 = "sha256-wzMK6Br7/+d3EEGpfPuQ6Trj8IPfehdUvOvX3HZlS+o=";

    })

  ];



  postPatch = ''

    substituteInPlace setup.cfg \

      --replace "grandalf==0.6" "grandalf>=0.6" \

      --replace "scmrepo==0.0.13" "scmrepo"

    substituteInPlace dvc/daemon.py \

      --subst-var-by dvc "$out/bin/dcv"

  '';



  nativeBuildInputs = with python3.pkgs; [

    setuptools-scm

    setuptools-scm-git-archive
@@ -73,15 +96,6 @@ python3.pkgs.buildPythonApplication rec { 
    importlib-resources

  ];



  patches = [ ./dvc-daemon.patch ];



  postPatch = ''

    substituteInPlace setup.cfg \

      --replace "grandalf==0.6" "grandalf>=0.6"

    substituteInPlace dvc/daemon.py \

      --subst-var-by dvc "$out/bin/dcv"

  '';



  # Tests require access to real cloud services

  doCheck = false;