Author: rob Date: Wed Apr 4 15:30:29 2012 New Revision: 33567 URL: https://nixos.org/websvn/nix/?rev=33567&sc=1
Log: re-add overwritten svn2git (used/developed by kde people) Added: nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/svn2git-kde/ nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix Modified: nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix Modified: nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix ============================================================================== --- nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix Wed Apr 4 14:46:17 2012 (r33566) +++ nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix Wed Apr 4 15:30:29 2012 (r33567) @@ -93,6 +93,8 @@ git = gitSVN; }; + svn2git_kde = callPackage ./svn2git-kde { }; + gitSubtree = import ./git-subtree { inherit stdenv fetchurl git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt; }; Added: nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/svn2git-kde/default.nix Wed Apr 4 15:30:29 2012 (r33567) @@ -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]; + +} _______________________________________________ nix-commits mailing list nix-comm...@lists.science.uu.nl http://lists.science.uu.nl/mailman/listinfo/nix-commits