diff options
author | Andreas Rammhold <andreas@rammhold.de> | 2018-02-07 23:43:22 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-07 23:43:22 +0000 |
commit | 4dd3a2ae38e8c1fdf774c3e87dccb63a337dddd9 (patch) | |
tree | 3dea2a9ede3567a8956cb4297aca3d11694c075a /pkgs/applications/version-management | |
parent | 24ab5d9ca75cc271002c8ad98ae24272229086a9 (diff) | |
parent | 469d49718ed128d520e36cc7ec682f0eb74b6049 (diff) | |
download | nixlib-4dd3a2ae38e8c1fdf774c3e87dccb63a337dddd9.tar nixlib-4dd3a2ae38e8c1fdf774c3e87dccb63a337dddd9.tar.gz nixlib-4dd3a2ae38e8c1fdf774c3e87dccb63a337dddd9.tar.bz2 nixlib-4dd3a2ae38e8c1fdf774c3e87dccb63a337dddd9.tar.lz nixlib-4dd3a2ae38e8c1fdf774c3e87dccb63a337dddd9.tar.xz nixlib-4dd3a2ae38e8c1fdf774c3e87dccb63a337dddd9.tar.zst nixlib-4dd3a2ae38e8c1fdf774c3e87dccb63a337dddd9.zip |
Merge pull request #34684 from flokli/svn-all-fast-export
gitAndTools.svn_all_fast_export: init at 1.0.11
Diffstat (limited to 'pkgs/applications/version-management')
3 files changed, 44 insertions, 29 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 96e2220f5827..e5e36e998ace 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -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 { }; diff --git a/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix new file mode 100644 index 000000000000..fbafc5257d7b --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/svn-all-fast-export/default.nix @@ -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 ]; + }; +} diff --git a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix deleted file mode 100644 index e52fdb6375bf..000000000000 --- a/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix +++ /dev/null @@ -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; -} |