From ecc992b7b198edba5ff50ed969f2cc1ab856c13d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 26 Jan 2010 21:26:01 +0000 Subject: [PATCH] topgit: Get a genuine source tarball; install `README'. svn path=/nixpkgs/trunk/; revision=19693 --- .../git-and-tools/default.nix | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 3a43e4ad812..27b700a5f53 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -55,22 +55,28 @@ rec { inherit fetchurl stdenv python git; }; - topGit = stdenv.mkDerivation { - name = "TopGit-git"; # official release 0.8 - # REGION AUTO UPDATE: { name = "topGit"; type="git"; url="http://repo.or.cz/w/topgit.git"; } - src= sourceFromHead "topGit-341a3713f5c399f97c5c68a74772b12bb3d2ca57.tar.gz" - (fetchurl { url = "http://mawercer.de/~nix/repos/topGit-341a3713f5c399f97c5c68a74772b12bb3d2ca57.tar.gz"; sha256 = "4d53343ed9ba735fb598d6576b20f2641d5a8374a5a11b21fcbcdc6da885e872"; }); - # END - phases="unpackPhase patchPhase installPhase"; + topGit = stdenv.mkDerivation rec { + name = "topgit-0.8"; + + src = fetchurl { + # Snapshot for the `topgit-0.8' tag. + url = "http://repo.or.cz/w/topgit.git/snapshot/f59e4f9e87e5f485fdaee0af002edd2105fa298a.tar.gz"; + sha256 = "0bz3anrzjcnywslh9679mhg7n5bdr1dmsbb5x3ywvkp3mma9b4xk"; + }; + installPhase = '' + mkdir -p "$out/share/doc/${name}" + cp -v README "$out/share/doc/${name}" + mkdir -p $out/etc/bash_completion.d make prefix=$out \ install mv contrib/tg-completion.bash $out/etc/bash_completion.d ''; + meta = { description = "TopGit aims to make handling of large amount of interdependent topic branches easier"; - maintainers = [lib.maintainers.marcweber]; + maintainers = [ lib.maintainers.marcweber lib.maintainers.ludo ]; homepage = http://repo.or.cz/w/topgit.git; # maybe there is also another one, I haven't checked license = "GPLv2"; };