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

git-annex: updated to version 3.20111231

Browse Source 
svn path=/nixpkgs/trunk/; revision=31212
This commit is contained in:
Peter Simons 2012-01-02 14:51:26 +00:00
parent e195f5b358
commit 38f6d36e91
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,11 +46,10 @@ rec {
}; };
gitAnnex = lib.makeOverridable (import ./git-annex) { gitAnnex = lib.makeOverridable (import ./git-annex) {
inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which; inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which coreutils;
inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc
HTTP testpack hS3 mtl network hslogger hxt json; HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl;
QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1; QuickCheck2 = haskellPackages.QuickCheck_2_4_0_1;
monadControl = haskellPackages.monadControl_OBSOLETE;
}; };
qgit = import ./qgit { qgit = import ./qgit {

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

@ -1,23 +1,23 @@
{ stdenv, fetchurl, curl, dataenc, findutils, ghc, git, hS3, hslogger, HTTP, hxt { stdenv, fetchurl, curl, dataenc, findutils, ghc, git, hS3, hslogger, HTTP, hxt
, ikiwiki, json, libuuid, MissingH, monadControl, mtl, network, pcreLight, perl , ikiwiki, json, libuuid, MissingH, monadControl, mtl, network, pcreLight, perl
, QuickCheck2, rsync, SHA, testpack, utf8String, which , QuickCheck2, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils
}: }:
let let
version = "3.20111203"; version = "3.20111231";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "git-annex-${version}"; name = "git-annex-${version}";
src = fetchurl { src = fetchurl {
url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz"; url = "http://ftp.de.debian.org/debian/pool/main/g/git-annex/git-annex_${version}.tar.gz";
sha256 = "236a8fa537be1738a16afcab8a7438dc567dce75a6b71b62780d31048428f74b"; sha256 = "4f53e7fc9560838be7efd0c90543c93ce1c7d2ba36b7754200586d845ec114f5";
}; };
buildInputs = [ buildInputs = [
curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json
libuuid MissingH monadControl mtl network pcreLight perl QuickCheck2 libuuid MissingH monadControl mtl network pcreLight perl QuickCheck2
rsync SHA testpack utf8String which rsync SHA testpack utf8String which liftedBase
]; ];
checkTarget = "test"; checkTarget = "test";
@ -26,6 +26,7 @@ stdenv.mkDerivation {
preConfigure = '' preConfigure = ''
makeFlagsArray=( PREFIX=$out ) makeFlagsArray=( PREFIX=$out )
sed -i -e 's|#!/usr/bin/perl|#!${perl}/bin/perl|' mdwn2man sed -i -e 's|#!/usr/bin/perl|#!${perl}/bin/perl|' mdwn2man
sed -i -e 's|"cp |"${coreutils}/bin/cp |' -e 's|"rm -f |"${coreutils}/bin/rm -f |' test.hs
''; '';
meta = { meta = {