public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Git: Fix more impurities. 

svn path=/nixpkgs/trunk/; revision=11373
This commit is contained in:
Ludovic Courtès 2008-03-30 22:19:20 +00:00
parent 1a64758585
commit 2d5d545818
3 changed files with 37 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/applications/version-management/git/default.nix
View File

@ -1,4 +1,4 @@
{ fetchurl, stdenv, curl, openssl, zlib, expat, perl, gettext, emacs { fetchurl, stdenv, curl, openssl, zlib, expat, perl, gettext, emacs, cpio
, asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_42 , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_42
, libxslt, tcl, tk, makeWrapper }: , libxslt, tcl, tk, makeWrapper }:
@ -10,9 +10,9 @@ stdenv.mkDerivation rec {
sha256 = "16dcmkj7dfmr1cy28hi0ipc2qx7dy3knnb77w5bn78hwdfd2dcv9"; sha256 = "16dcmkj7dfmr1cy28hi0ipc2qx7dy3knnb77w5bn78hwdfd2dcv9";
}; };
patches = [ ./docbook2texi.patch ]; patches = [ ./pwd.patch ./docbook2texi.patch ];
buildInputs = [curl openssl zlib expat gettext] buildInputs = [curl openssl zlib expat gettext cpio]
++ (if emacs != null then [emacs] else []) ++ (if emacs != null then [emacs] else [])
++ # documentation tools ++ # documentation tools
[ asciidoc texinfo xmlto docbook2x [ asciidoc texinfo xmlto docbook2x
@ -40,14 +40,21 @@ stdenv.mkDerivation rec {
+ ''# Wrap `gitk' + ''# Wrap `gitk'
wrapProgram $out/bin/gitk \ wrapProgram $out/bin/gitk \
--set TK_LIBRARY "${tk}/lib/tk8.4" \ --set TK_LIBRARY "${tk}/lib/tk8.4" \
--prefix PATH : "${tk}/bin" ''; --prefix PATH : "${tk}/bin" ''
+ ''# Wrap `git-clone'
wrapProgram $out/bin/git-clone \
--prefix PATH : "${cpio}/bin" '';
meta = { meta = {
license = "GPLv2"; license = "GPLv2";
homepage = http://git.or.cz; homepage = http://git.or.cz;
description = ''Git, a popular distributed version control system description = "Git, a popular distributed version control system";
designed to handle very large projects with speed
and efficiency.''; longDescription = ''
Git, a popular distributed version control system designed to
handle very large projects with speed and efficiency.
'';
}; };
} }

22
pkgs/applications/version-management/git/pwd.patch Normal file
View File

@ -0,0 +1,22 @@
--- git-1.5.4.4/git-clone.sh 2008-03-09 11:18:13.000000000 +0100
+++ git-1.5.4.4/git-clone.sh 2008-03-30 23:43:35.000000000 +0200
@@ -40,7 +40,7 @@ eval "$(echo "$OPTIONS_SPEC" | git rev-p
get_repo_base() {
(
- cd "`/bin/pwd`" &&
+ cd "`pwd`" &&
cd "$1" || cd "$1.git" &&
{
cd .git
--- git-1.5.4.4/git-submodule.sh 2008-03-09 11:18:13.000000000 +0100
+++ git-1.5.4.4/git-submodule.sh 2008-03-31 00:01:03.000000000 +0200
@@ -28,7 +28,7 @@ say()
# NEEDSWORK: identical function exists in get_repo_base in clone.sh
get_repo_base() {
(
- cd "`/bin/pwd`" &&
+ cd "`pwd`" &&
cd "$1" || cd "$1.git" &&
{
cd .git

2
pkgs/top-level/all-packages.nix
View File

@ -5090,7 +5090,7 @@ let pkgs = rec {
inherit fetchurl stdenv curl openssl zlib expat perl gettext inherit fetchurl stdenv curl openssl zlib expat perl gettext
asciidoc texinfo xmlto docbook2x asciidoc texinfo xmlto docbook2x
docbook_xsl docbook_xml_dtd_42 libxslt docbook_xsl docbook_xml_dtd_42 libxslt
tcl tk makeWrapper; cpio tcl tk makeWrapper;
emacs = if (getConfig ["git" "useEmacs"] true) then emacs else null; emacs = if (getConfig ["git" "useEmacs"] true) then emacs else null;
}; };