tangled
alpha
login
or
join now
pyrox.dev
/
nixpkgs
lol
0
fork
atom
overview
issues
pulls
pipelines
rdiff-backup: 1.3.3 -> 2.0.5
Peter Hoeg
4 years ago
aab4b6b4
0a5d4261
+25
-32
2 changed files
expand all
collapse all
unified
split
pkgs
tools
backup
rdiff-backup
default.nix
fix-librsync-rs_default_strong_len.patch
+25
-12
pkgs/tools/backup/rdiff-backup/default.nix
···
1
1
-
{lib, fetchurl, python2Packages, librsync, gnused }:
1
1
+
{ lib, python3Packages, librsync }:
2
2
3
3
-
python2Packages.buildPythonApplication {
4
4
-
name = "rdiff-backup-1.3.3";
3
3
+
let
4
4
+
pypkgs = python3Packages;
5
5
+
6
6
+
in
7
7
+
pypkgs.buildPythonApplication rec {
8
8
+
pname = "rdiff-backup";
9
9
+
version = "2.0.5";
5
10
6
6
-
src = fetchurl {
7
7
-
url = "mirror://savannah/rdiff-backup/rdiff-backup-1.3.3.tar.gz";
8
8
-
sha256 = "01hcwf5rgqi303fa4kdjkbpa7n8mvvh7h9gpgh2b23nz73k0q0zf";
11
11
+
src = pypkgs.fetchPypi {
12
12
+
inherit pname version;
13
13
+
sha256 = "sha256-VNFgOOYgFO2RbHHIMDsH0vphpqaAOMoYn8LTFTSw84s=";
9
14
};
10
15
11
11
-
patches = [ ./fix-librsync-rs_default_strong_len.patch ];
16
16
+
# pkg_resources fails to find the version and then falls back to "DEV"
17
17
+
postPatch = ''
18
18
+
substituteInPlace src/rdiff_backup/Globals.py \
19
19
+
--replace 'version = "DEV"' 'version = "${version}"'
20
20
+
'';
21
21
+
22
22
+
buildInputs = [ librsync ];
12
23
13
13
-
buildInputs = [ librsync gnused ];
24
24
+
nativeBuildInputs = with pypkgs; [ setuptools-scm ];
14
25
26
26
+
# no tests from pypi
15
27
doCheck = false;
16
28
17
17
-
meta = {
29
29
+
meta = with lib; {
18
30
description = "Backup system trying to combine best a mirror and an incremental backup system";
19
19
-
homepage = "http://rdiff-backup.nongnu.org/";
20
20
-
license = lib.licenses.gpl2;
21
21
-
platforms = lib.platforms.all;
31
31
+
homepage = "https://rdiff-backup.net";
32
32
+
license = licenses.gpl2Only;
33
33
+
maintainers = with maintainers; [ peterhoeg ];
34
34
+
platforms = platforms.all;
22
35
};
23
36
}
-20
pkgs/tools/backup/rdiff-backup/fix-librsync-rs_default_strong_len.patch
···
1
1
-
Patch by Roman Tereshonkov and Kari Hautio for rdiff-backup <= 1.2.8 to avoid a build failure with
2
2
-
librsync >= 1.0.0 (which is a security bugfix release). The discussion and solution finding can be
3
3
-
found at https://bugs.launchpad.net/duplicity/+bug/1416344 (for duplicity).
4
4
-
5
5
-
--- rdiff-backup-1.2.8/_librsyncmodule.c 2009-03-16 15:36:21.000000000 +0100
6
6
-
+++ rdiff-backup-1.2.8/_librsyncmodule.c.librsync-1.0.0 2015-03-02 00:54:24.000000000 +0100
7
7
-
@@ -59,8 +59,13 @@
8
8
-
if (sm == NULL) return NULL;
9
9
-
sm->x_attr = NULL;
10
10
-
11
11
-
+#ifdef RS_DEFAULT_STRONG_LEN
12
12
-
sm->sig_job = rs_sig_begin((size_t)blocklen,
13
13
-
(size_t)RS_DEFAULT_STRONG_LEN);
14
14
-
+#else
15
15
-
+ sm->sig_job = rs_sig_begin((size_t)blocklen,
16
16
-
+ (size_t)8, RS_MD4_SIG_MAGIC);
17
17
-
+#endif
18
18
-
return (PyObject*)sm;
19
19
-
}
20
20
-