Merge pull request #37951 from Mic92/svn-all-fast-export

svn-all-fast-export: update patch
This commit is contained in:
Jörg Thalheim 2018-04-04 08:23:48 +01:00 committed by GitHub
commit dae67d6524
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions

View File

@ -117,11 +117,14 @@ rec {
git = gitSVN;
};
svn_all_fast_export = libsForQt5.callPackage ./svn-all-fast-export { };
svn-all-fast-export = libsForQt5.callPackage ./svn-all-fast-export { };
tig = callPackage ./tig { };
topGit = callPackage ./topgit { };
transcrypt = callPackage ./transcrypt { };
# aliases
svn_all_fast_export = svn-all-fast-export;
}

View File

@ -17,8 +17,8 @@ stdenv.mkDerivation {
patches = [
(fetchpatch {
name = "pr40.patch";
sha256 = "1qndhk5csf7kddk3giailx7r0cdipq46lj73nkcws43n4n93synk";
url = https://github.com/svn-all-fast-export/svn2git/pull/40.diff;
sha256 = "0mwncklzncsifql9zlxlbj3clsif5p2v1xs8nmxrw44mqvaysjw3";
url = https://github.com/svn-all-fast-export/svn2git/compare/f00d5a5...flokli:nixos-20180326.patch;
})
];
@ -31,8 +31,6 @@ stdenv.mkDerivation {
"SVN_INCLUDE=${subversion.dev}/include/subversion-1"
];
installPhase = "make install INSTALL_ROOT=$out";
meta = with stdenv.lib; {
homepage = https://github.com/svn-all-fast-export/svn2git;
description = "A fast-import based converter for an svn repo to git repos";