pyrox.dev
Merge pull request #166346 from SuperSandro2000/dvc-with-remotes
dvc: 2.9.3 -> 2.9.5
authored by Fabian Affolter and committed by GitHub e09f9b78 78df29df
+25
-11
pkgs/applications/version-management/dvc/default.nix
+25
-11
pkgs/applications/version-management/dvc/default.nix
···
1
1
{ lib
2
2
, python3
3
3
, fetchFromGitHub
4
+
, fetchpatch
4
5
, enableGoogle ? false
5
6
, enableAWS ? false
6
7
, enableAzure ? false
···
9
10
10
11
python3.pkgs.buildPythonApplication rec {
11
12
pname = "dvc";
12
-
version = "2.9.3";
13
+
version = "2.9.5";
13
14
format = "setuptools";
14
15
15
16
src = fetchFromGitHub {
16
17
owner = "iterative";
17
18
repo = pname;
18
19
rev = version;
19
-
hash = "sha256-nRlgo7Wjs7RgTUxoMYQh5YEsqiJtdWH2ex79rhXagAQ=";
20
+
hash = "sha256-MviiA0ja1IaxMPlqu2dhIGBcdEXiEvBYnK9731dihMg=";
20
21
};
22
+
23
+
# make the patch apply
24
+
prePatch = ''
25
+
substituteInPlace setup.cfg \
26
+
--replace "scmrepo==0.0.7" "scmrepo==0.0.10"
27
+
'';
28
+
29
+
patches = [
30
+
./dvc-daemon.patch
31
+
(fetchpatch {
32
+
url = "https://github.com/iterative/dvc/commit/ab54b5bdfcef3576b455a17670b8df27beb504ce.patch";
33
+
sha256 = "sha256-wzMK6Br7/+d3EEGpfPuQ6Trj8IPfehdUvOvX3HZlS+o=";
34
+
})
35
+
];
36
+
37
+
postPatch = ''
38
+
substituteInPlace setup.cfg \
39
+
--replace "grandalf==0.6" "grandalf>=0.6" \
40
+
--replace "scmrepo==0.0.13" "scmrepo"
41
+
substituteInPlace dvc/daemon.py \
42
+
--subst-var-by dvc "$out/bin/dcv"
43
+
'';
21
44
22
45
nativeBuildInputs = with python3.pkgs; [
23
46
setuptools-scm
···
72
95
] ++ lib.optionals (pythonOlder "3.9") [
73
96
importlib-resources
74
97
];
75
-
76
-
patches = [ ./dvc-daemon.patch ];
77
-
78
-
postPatch = ''
79
-
substituteInPlace setup.cfg \
80
-
--replace "grandalf==0.6" "grandalf>=0.6"
81
-
substituteInPlace dvc/daemon.py \
82
-
--subst-var-by dvc "$out/bin/dcv"
83
-
'';
84
98
85
99
# Tests require access to real cloud services
86
100
doCheck = false;