diff options
author | Peter Simons <simons@cryp.to> | 2011-09-18 14:56:46 +0000 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2011-09-18 14:56:46 +0000 |
commit | 19769280f68f48fd541f3a3e345810959982765b (patch) | |
tree | 8283129886fda546d0e1dfbd88cc13ae29f416fd /pkgs/applications/version-management | |
parent | 595d141a3097eb5dcacecdcd797e6b2a7eb896e8 (diff) | |
download | nixpkgs-19769280f68f48fd541f3a3e345810959982765b.tar nixpkgs-19769280f68f48fd541f3a3e345810959982765b.tar.gz nixpkgs-19769280f68f48fd541f3a3e345810959982765b.tar.bz2 nixpkgs-19769280f68f48fd541f3a3e345810959982765b.tar.lz nixpkgs-19769280f68f48fd541f3a3e345810959982765b.tar.xz nixpkgs-19769280f68f48fd541f3a3e345810959982765b.tar.zst nixpkgs-19769280f68f48fd541f3a3e345810959982765b.zip |
git-subtree: updated to version 0.4-2-g2793ee6
svn path=/nixpkgs/trunk/; revision=29333
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/default.nix | 21 | ||||
-rw-r--r-- | pkgs/applications/version-management/git-and-tools/git-subtree/default.nix | 27 |
2 files changed, 29 insertions, 19 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 52ff83317d1..7513a7adbc7 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -104,24 +104,7 @@ rec { inherit stdenv fetchgit qt47 subversion apr; }; - gitSubtree = stdenv.mkDerivation { - name = "git-subtree-0.4"; - src = fetchurl { - url = "http://github.com/apenwarr/git-subtree/tarball/v0.4"; -# sha256 = "0y57lpbcc2142jgrr4lflyb9xgzs9x33r7g4b919ncn3alb95vdr"; - sha256 = "19s8352igwh7x1nqgdfs7rgxahw9cnfv7zmpzpd63m1r3l2945d4"; - }; - unpackCmd = "gzip -d < $curSrc | tar xvf -"; - buildInputs = [ git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt ]; - configurePhase = "export prefix=$out"; - buildPhase = "true"; - installPhase = '' - make install prefix=$out gitdir=$out/bin #work around to deal with a wrong makefile - ''; - meta= { - description = "An experimental alternative to the git-submodule command"; - homepage = http://github.com/apenwarr/git-subtree; - license = "GPLv2"; - }; + 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/git-subtree/default.nix b/pkgs/applications/version-management/git-and-tools/git-subtree/default.nix new file mode 100644 index 00000000000..dd00572b150 --- /dev/null +++ b/pkgs/applications/version-management/git-and-tools/git-subtree/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl, git, asciidoc, xmlto, docbook_xsl, docbook_xml_dtd_45, libxslt }: + +stdenv.mkDerivation { + name = "git-subtree-0.4-2-g2793ee6"; + + src = fetchurl { + url = "http://github.com/apenwarr/git-subtree/tarball/2793ee6ba6da57d97e9c313741041f7eb2e88974"; + sha256 = "33fdba315cf8846f45dff7622c1099c386db960c7b43d5d8fbb382fd4d1acff6"; + name = "git-subtree-0.4-2-g2793ee6.tar.gz"; + }; + + buildInputs = [ git asciidoc xmlto docbook_xsl docbook_xml_dtd_45 libxslt ]; + + configurePhase = "export prefix=$out"; + + buildPhase = "true"; + + installPhase = "make install prefix=$out gitdir=$out/bin"; + + meta= { + description = "experimental alternative to the git-submodule command"; + homepage = http://github.com/apenwarr/git-subtree; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.gnu; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} |