pyrox.dev
reposurgeon: 3.28 -> 3.44
also switch from cython to pypy as cyreposurgeon was dropped upstream in
favor of using pypy
+8
-16
pkgs/applications/version-management/reposurgeon/default.nix
+8
-16
pkgs/applications/version-management/reposurgeon/default.nix
···
1
1
{ stdenv, fetchurl, makeWrapper, python27Packages, git
2
-
, docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto
2
+
, docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto, pypy
3
3
, bazaar ? null, cvs ? null, darcs ? null, fossil ? null
4
4
, mercurial ? null, monotone ? null, rcs ? null
5
5
, subversion ? null, cvs_fast_export ? null }:
6
6
7
7
with stdenv; with lib;
8
8
let
9
-
inherit (python27Packages) python cython;
9
+
inherit (python27Packages) python;
10
10
in mkDerivation rec {
11
11
name = "reposurgeon-${meta.version}";
12
12
meta = {
13
13
description = "A tool for editing version-control repository history";
14
-
version = "3.28";
14
+
version = "3.44";
15
15
license = licenses.bsd3;
16
16
homepage = http://www.catb.org/esr/reposurgeon/;
17
17
maintainers = with maintainers; [ dfoxfranke ];
···
19
19
};
20
20
21
21
src = fetchurl {
22
-
url = "http://www.catb.org/~esr/reposurgeon/reposurgeon-3.28.tar.gz";
23
-
sha256 = "3225b44109b8630310a0ea6fe63a3485d27aa46deaf80e8d07820e01a6f62626";
22
+
url = "http://www.catb.org/~esr/reposurgeon/reposurgeon-3.44.tar.xz";
23
+
sha256 = "0il6hwrsm2qgg0vp5fcjh478y2x4zyw3mx2apcwc7svfj86pf7pn";
24
24
};
25
25
26
-
# See https://gitlab.com/esr/reposurgeon/issues/17
27
-
patches = [ ./fix-preserve-type.patch ];
26
+
# install fails because the files README.md, NEWS, and TODO were not included in the source distribution
27
+
patches = [ ./fix-makefile.patch ];
28
28
29
29
buildInputs =
30
-
[ docbook_xml_dtd_412 docbook_xsl asciidoc xmlto makeWrapper ] ++
31
-
optional (cython != null) cython
32
-
;
30
+
[ docbook_xml_dtd_412 docbook_xsl asciidoc xmlto makeWrapper pypy ];
33
31
34
32
preBuild = ''
35
33
makeFlagsArray=(
···
39
37
pylib="-L${python}/lib -lpython2.7"
40
38
)
41
39
'';
42
-
43
-
buildFlags = "all" + (if cython != null then " cyreposurgeon" else "");
44
-
45
-
installTargets =
46
-
"install" + (if cython != null then " install-cyreposurgeon" else "")
47
-
;
48
40
49
41
postInstall =
50
42
let
+12
pkgs/applications/version-management/reposurgeon/fix-makefile.patch
+12
pkgs/applications/version-management/reposurgeon/fix-makefile.patch
···
1
+
diff -Naur reposurgeon-3.44/Makefile reposurgeon-3.44-new/Makefile
2
+
--- reposurgeon-3.44/Makefile 2018-04-29 12:27:43.000000000 -0700
3
+
+++ reposurgeon-3.44-new/Makefile 2018-08-01 17:38:15.582789739 -0700
4
+
@@ -36,7 +36,7 @@
5
+
MANPAGES = reposurgeon.1 repotool.1 repodiffer.1 repomapper.1 repocutter.1
6
+
HTMLFILES = $(MANPAGES:.1=.html) \
7
+
dvcs-migration-guide.html features.html reporting-bugs.html
8
+
-SHARED = README.md NEWS TODO reposurgeon-git-aliases $(HTMLFILES)
9
+
+SHARED = reposurgeon-git-aliases $(HTMLFILES)
10
+
11
+
all: $(MANPAGES) $(HTMLFILES)
12
+
-12
pkgs/applications/version-management/reposurgeon/fix-preserve-type.patch
-12
pkgs/applications/version-management/reposurgeon/fix-preserve-type.patch
···
1
-
diff -Nru reposurgeon-3.28/reposurgeon reposurgeon-3.28-new/reposurgeon
2
-
--- reposurgeon-3.28/reposurgeon 2015-07-05 15:17:13.000000000 -0400
3
-
+++ reposurgeon-3.28-new/reposurgeon 2015-08-25 18:23:11.347591137 -0400
4
-
@@ -193,7 +193,7 @@
5
-
importer=b"git fast-import --quiet",
6
-
checkout=b"git checkout",
7
-
lister=b"git ls-files",
8
-
- preserve=(b'.git/config', b'.git/hooks'),
9
-
+ preserve=set((b'.git/config', b'.git/hooks')),
10
-
authormap=b".git/cvs-authors",
11
-
ignorename=b".gitignore",
12
-
dfltignores=b"", # Has none