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

Update git and related tools to latest releases.

Browse Source 
Git     -> 1.8.5.1
stgit   -> 0.16
svn2git -> 2.2.2

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
This commit is contained in:
Moritz Ulrich 2013-12-09 01:15:16 +01:00
parent 0c5f72af58
commit b4f93af3c9
No known key found for this signature in database
GPG Key ID: A9E1CC79ECBFA432
4 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/version-management/git-and-tools/default.nix
View File

@ -83,7 +83,7 @@ rec {
}; };
svn2git = import ./svn2git { svn2git = import ./svn2git {
inherit stdenv fetchgit ruby makeWrapper; inherit stdenv fetchurl ruby makeWrapper;
git = gitSVN; git = gitSVN;
}; };

6
pkgs/applications/version-management/git-and-tools/git/default.nix
View File

@ -10,7 +10,7 @@
let let
version = "1.8.4.3"; version = "1.8.5.1";
svn = subversionClient.override { perlBindings = true; }; svn = subversionClient.override { perlBindings = true; };
@ -21,7 +21,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "http://git-core.googlecode.com/files/git-${version}.tar.gz"; url = "http://git-core.googlecode.com/files/git-${version}.tar.gz";
sha256 = "08fbdxh2cjd4hffm0nydwysh5zh6nrssbi9x01yy0n2y8rqzly0a"; sha256 = "0i7fz0b79f3algs68m15wg4bq99ayg1crpy66cqylxq3mzbw8n8m";
}; };
patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ]; patches = [ ./docbook2texi.patch ./symlinks-in-bin.patch ];
@ -140,6 +140,6 @@ stdenv.mkDerivation {
''; '';
platforms = stdenv.lib.platforms.all; platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.simons ]; maintainers = with stdenv.lib.maintainers; [ simons the-kenny ];
}; };
} }

6
pkgs/applications/version-management/git-and-tools/stgit/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, python, git }: { stdenv, fetchurl, python, git }:
let let
name = "stgit-0.15"; name = "stgit-0.16";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
inherit name; inherit name;
src = fetchurl { src = fetchurl {
url = "http://download.gna.org/stgit/${name}.tar.gz"; url = "http://download.gna.org/stgit/${name}.tar.gz";
sha256 = "0kgq9x0i7riwcl1lmmm40z0jiz5agr1kqxm2byv1qsf0q1ny47v9"; sha256 = "0hla6401g2kicaakz4awk67yf8fhqbw1shn1p9ma5x6ca29s3w82";
}; };
buildInputs = [ python git ]; buildInputs = [ python git ];
@ -28,7 +28,7 @@ stdenv.mkDerivation {
description = "StGit is a patch manager implemented on top of Git"; description = "StGit is a patch manager implemented on top of Git";
license = "GPL"; license = "GPL";
maintainers = [ stdenv.lib.maintainers.simons ]; maintainers = with stdenv.lib.maintainers; [ simons the-kenny ];
platforms = stdenv.lib.platforms.unix; platforms = stdenv.lib.platforms.unix;
}; };
} }

28
pkgs/applications/version-management/git-and-tools/svn2git/default.nix
View File

@ -1,12 +1,14 @@
{ stdenv, fetchgit, ruby, makeWrapper, git }: { stdenv, fetchurl, ruby, makeWrapper, git }:
stdenv.mkDerivation rec { let
name = "svn2git-2.1.0-20111206"; version = "2.2.2";
in
stdenv.mkDerivation {
name = "svn2git-${version}";
src = fetchgit { src = fetchurl {
url = https://github.com/nirvdrum/svn2git; url = "https://github.com/nirvdrum/svn2git/archive/v${version}.tar.gz";
rev = "5cd8d4b509affb66eb2dad50d7298c52b3b0d848"; sha256 = "14zinkpgybz15jvbfw0sb432w6f5w4sa5pdqycjwva8v8lxqn9mh";
sha256 = "26aa17f68f605e958b623d803b4bd405e12d6c5d51056635873a2c59e4c7b9ca";
}; };
buildInputs = [ ruby makeWrapper ]; buildInputs = [ ruby makeWrapper ];
@ -17,14 +19,22 @@ stdenv.mkDerivation rec {
'' ''
mkdir -p $out mkdir -p $out
cp -r lib $out/ cp -r lib $out/
mkdir -p $out/bin mkdir -p $out/bin
substituteInPlace bin/svn2git --replace '/usr/bin/env ruby' ${ruby}/bin/ruby substituteInPlace bin/svn2git --replace '/usr/bin/env ruby' ${ruby}/bin/ruby
cp bin/svn2git $out/bin/ cp bin/svn2git $out/bin/
chmod +x $out/bin/svn2git chmod +x $out/bin/svn2git
wrapProgram $out/bin/svn2git \ wrapProgram $out/bin/svn2git \
--set RUBYLIB $out/lib \ --set RUBYLIB $out/lib \
--prefix PATH : ${git}/bin --prefix PATH : ${git}/bin
''; '';
meta = {
homepage = https://github.com/nirvdrum/svn2git;
description = "Ruby tool for importing existing svn projects into git";
license = stdenv.lib.licenses.mit;
maintainers = [ stdenv.lib.maintainers.the-kenny ];
};
} }