Merge pull request #34684 from flokli/svn-all-fast-export

gitAndTools.svn_all_fast_export: init at 1.0.11
This commit is contained in:
Andreas Rammhold 2018-02-07 23:43:22 +00:00 committed by GitHub
commit 4dd3a2ae38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 44 additions and 29 deletions

View File

@ -117,7 +117,7 @@ rec {
git = gitSVN;
};
svn2git_kde = callPackage ./svn2git-kde { };
svn_all_fast_export = libsForQt5.callPackage ./svn-all-fast-export { };
tig = callPackage ./tig { };

View File

@ -0,0 +1,43 @@
{ stdenv, fetchFromGitHub, fetchpatch, qmake, qtbase, qttools, subversion, apr }:
let
version = "1.0.11";
in
stdenv.mkDerivation {
name = "svn-all-fast-export-${version}";
src = fetchFromGitHub {
owner = "svn-all-fast-export";
repo = "svn2git";
rev = version;
sha256 = "0lhnw8f15j4wkpswhrjd7bp9xkhbk32zmszaxayzfhbdl0g7pzwj";
};
# https://github.com/svn-all-fast-export/svn2git/pull/40
patches = [
(fetchpatch {
name = "pr40.patch";
sha256 = "1qndhk5csf7kddk3giailx7r0cdipq46lj73nkcws43n4n93synk";
url = https://github.com/svn-all-fast-export/svn2git/pull/40.diff;
})
];
nativeBuildInputs = [ qmake qttools ];
buildInputs = [ apr.dev subversion.dev qtbase ];
qmakeFlags = [
"VERSION=${version}"
"APR_INCLUDE=${apr.dev}/include/apr-1"
"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";
license = licenses.gpl3;
platforms = platforms.all;
maintainers = [ maintainers.flokli ];
};
}

View File

@ -1,28 +0,0 @@
{ stdenv, fetchgit, qt4, qmake4Hook, subversion, apr }:
stdenv.mkDerivation rec {
name = "svn2git-kde-1.0.5";
src = fetchgit {
url = http://git.gitorious.org/svn2git/svn2git.git;
rev = "149d6c6e14a1724c96999328683a9264fc508264";
sha256 = "0gjxhnraizlwyidn66rczwc01f6sfx4ndmsj86ssqml3p0d4sl6q";
};
NIX_CFLAGS_COMPILE = [ "-I${apr.dev}/include/apr-1" "-I${subversion.dev}/include/subversion-1" "-DVER=\"${src.rev}\"" ];
patchPhase = ''
sed -i 's|/bin/cat|cat|' ./src/repository.cpp
'';
installPhase = ''
mkdir -p $out/bin
cp svn-all-fast-export $out/bin
'';
buildInputs = [ subversion apr qt4 ];
nativeBuildInputs = [ qmake4Hook ];
meta.broken = true;
}