reposurgeon: 3.28 -> 3.44
also switch from cython to pypy as cyreposurgeon was dropped upstream in favor of using pypy
This commit is contained in:
parent
169d5698a9
commit
eca1f53a52
|
@ -1,17 +1,17 @@
|
|||
{ stdenv, fetchurl, makeWrapper, python27Packages, git
|
||||
, docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto
|
||||
, docbook_xml_dtd_412, docbook_xsl, asciidoc, xmlto, pypy
|
||||
, bazaar ? null, cvs ? null, darcs ? null, fossil ? null
|
||||
, mercurial ? null, monotone ? null, rcs ? null
|
||||
, subversion ? null, cvs_fast_export ? null }:
|
||||
|
||||
with stdenv; with lib;
|
||||
let
|
||||
inherit (python27Packages) python cython;
|
||||
inherit (python27Packages) python;
|
||||
in mkDerivation rec {
|
||||
name = "reposurgeon-${meta.version}";
|
||||
meta = {
|
||||
description = "A tool for editing version-control repository history";
|
||||
version = "3.28";
|
||||
version = "3.44";
|
||||
license = licenses.bsd3;
|
||||
homepage = http://www.catb.org/esr/reposurgeon/;
|
||||
maintainers = with maintainers; [ dfoxfranke ];
|
||||
|
@ -19,17 +19,15 @@ in mkDerivation rec {
|
|||
};
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://www.catb.org/~esr/reposurgeon/reposurgeon-3.28.tar.gz";
|
||||
sha256 = "3225b44109b8630310a0ea6fe63a3485d27aa46deaf80e8d07820e01a6f62626";
|
||||
url = "http://www.catb.org/~esr/reposurgeon/reposurgeon-3.44.tar.xz";
|
||||
sha256 = "0il6hwrsm2qgg0vp5fcjh478y2x4zyw3mx2apcwc7svfj86pf7pn";
|
||||
};
|
||||
|
||||
# See https://gitlab.com/esr/reposurgeon/issues/17
|
||||
patches = [ ./fix-preserve-type.patch ];
|
||||
# install fails because the files README.md, NEWS, and TODO were not included in the source distribution
|
||||
patches = [ ./fix-makefile.patch ];
|
||||
|
||||
buildInputs =
|
||||
[ docbook_xml_dtd_412 docbook_xsl asciidoc xmlto makeWrapper ] ++
|
||||
optional (cython != null) cython
|
||||
;
|
||||
[ docbook_xml_dtd_412 docbook_xsl asciidoc xmlto makeWrapper pypy ];
|
||||
|
||||
preBuild = ''
|
||||
makeFlagsArray=(
|
||||
|
@ -40,12 +38,6 @@ in mkDerivation rec {
|
|||
)
|
||||
'';
|
||||
|
||||
buildFlags = "all" + (if cython != null then " cyreposurgeon" else "");
|
||||
|
||||
installTargets =
|
||||
"install" + (if cython != null then " install-cyreposurgeon" else "")
|
||||
;
|
||||
|
||||
postInstall =
|
||||
let
|
||||
binpath = makeBinPath (
|
||||
|
|
|
@ -0,0 +1,12 @@
|
|||
diff -Naur reposurgeon-3.44/Makefile reposurgeon-3.44-new/Makefile
|
||||
--- reposurgeon-3.44/Makefile 2018-04-29 12:27:43.000000000 -0700
|
||||
+++ reposurgeon-3.44-new/Makefile 2018-08-01 17:38:15.582789739 -0700
|
||||
@@ -36,7 +36,7 @@
|
||||
MANPAGES = reposurgeon.1 repotool.1 repodiffer.1 repomapper.1 repocutter.1
|
||||
HTMLFILES = $(MANPAGES:.1=.html) \
|
||||
dvcs-migration-guide.html features.html reporting-bugs.html
|
||||
-SHARED = README.md NEWS TODO reposurgeon-git-aliases $(HTMLFILES)
|
||||
+SHARED = reposurgeon-git-aliases $(HTMLFILES)
|
||||
|
||||
all: $(MANPAGES) $(HTMLFILES)
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
diff -Nru reposurgeon-3.28/reposurgeon reposurgeon-3.28-new/reposurgeon
|
||||
--- reposurgeon-3.28/reposurgeon 2015-07-05 15:17:13.000000000 -0400
|
||||
+++ reposurgeon-3.28-new/reposurgeon 2015-08-25 18:23:11.347591137 -0400
|
||||
@@ -193,7 +193,7 @@
|
||||
importer=b"git fast-import --quiet",
|
||||
checkout=b"git checkout",
|
||||
lister=b"git ls-files",
|
||||
- preserve=(b'.git/config', b'.git/hooks'),
|
||||
+ preserve=set((b'.git/config', b'.git/hooks')),
|
||||
authormap=b".git/cvs-authors",
|
||||
ignorename=b".gitignore",
|
||||
dfltignores=b"", # Has none
|
Loading…
Reference in New Issue
Block a user