From a1d87e58c157cfe68c070f8a7e265fde2599797e Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Wed, 4 Apr 2012 15:30:29 +0000 Subject: [PATCH] re-add overwritten svn2git (used/developed by kde people) svn path=/nixpkgs/trunk/; revision=33567 --- .../git-and-tools/default.nix | 2 ++ .../git-and-tools/svn2git-kde/default.nix | 25 +++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 376e5286b05b..4a0c16b9343c 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -93,6 +93,8 @@ rec { git = gitSVN; }; + svn2git_kde = callPackage ./svn2git-kde { }; + gitSubtree = import ./git-subtree { inherit stdenv fetchurl git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt; }; 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 new file mode 100644 index 000000000000..ae928fa2d4d5 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchgit, qt47, subversion, apr}: + +stdenv.mkDerivation rec { + name = "svn2git"; + + src = fetchgit { + url = http://git.gitorious.org/svn2git/svn2git.git; + rev = "197979b6a641b8b5fa4856c700b1235491c73a41"; + sha256 = "7be1a8f5822aff2d4ea7f415dce0b4fa8c6a82310acf24e628c5f1ada2d2d613"; + }; + + buildPhase = '' + sed -i 's|/bin/cat|cat|' ./src/repository.cpp + qmake + make CXXFLAGS='-I${apr}/include/apr-1 -I${subversion}/include/subversion-1 -DVER="\"${src.rev}\""' + ''; + + installPhase = '' + ensureDir $out/bin + cp svn-all-fast-export $out/bin + ''; + + buildInputs = [subversion apr qt47]; + +}