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

git-annex: update to version 3.20121010

Browse Source
This commit is contained in:
Peter Simons 2012-10-15 20:17:23 +02:00
parent c8851cefbc
commit c90a15a604
2 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,10 +43,13 @@ rec {
}); });
gitAnnex = lib.makeOverridable (import ./git-annex) { gitAnnex = lib.makeOverridable (import ./git-annex) {
inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which coreutils openssh; inherit stdenv fetchurl perl coreutils git libuuid rsync findutils curl ikiwiki which openssh;
inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc inherit (haskellPackages) ghc bloomfilter dataenc editDistance hinotify hS3 hslogger HTTP
HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl IfElse blazeBuilder blazeHtml caseInsensitive IfElse json liftedBase MissingH monadControl mtl
QuickCheck bloomfilter editDistance stm hinotify; network pcreLight QuickCheck SHA stm utf8String networkInfo dbus
clientsession cryptoApi dataDefault extensibleExceptions filepath hamlet
httpTypes networkMulticast text time transformers transformersBase wai
waiLogger warp yesod yesodDefault yesodStatic testpack;
}; };
qgit = import ./qgit { qgit = import ./qgit {

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

@ -1,27 +1,35 @@
{ stdenv, fetchurl, curl, dataenc, findutils, ghc, git, hS3, hslogger, HTTP, hxt { stdenv, ghc, fetchurl, perl, coreutils, git, libuuid, rsync
, ikiwiki, json, libuuid, MissingH, monadControl, mtl, network, pcreLight, perl , findutils, curl, ikiwiki, which, openssh
, QuickCheck, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils , blazeBuilder, blazeHtml, bloomfilter, caseInsensitive
, IfElse, bloomfilter, editDistance, openssh, stm, hinotify , clientsession, cryptoApi, dataDefault, dataenc, dbus
, editDistance, extensibleExceptions, filepath, hamlet, hinotify
, hS3, hslogger, HTTP, httpTypes, IfElse, json, liftedBase
, MissingH, monadControl, mtl, network, networkInfo
, networkMulticast, pcreLight, QuickCheck, SHA, stm, text, time
, transformers, transformersBase, utf8String, wai, waiLogger, warp
, yesod, yesodDefault, yesodStatic, testpack
}: }:
let let
version = "3.20120825"; version = "3.20121010";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "git-annex-${version}"; name = "git-annex-${version}";
src = fetchurl { src = fetchurl {
url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=refs/tags/${version}"; url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=refs/tags/${version}";
sha256 = "edffe6a99d07599f62d4d5f6823de8a830abe8977c7671fd6eb21aeaebc0b8d0"; sha256 = "4db543af6cbcb2d92c808c01969425d1fd1a916b37386dcdfe1a3101876ccde2";
name = "git-annex-${version}.tar.gz"; name = "git-annex-${version}.tar.gz";
}; };
buildInputs = [ buildInputs = [ ghc git libuuid rsync findutils curl ikiwiki which
curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json openssh blazeBuilder blazeHtml bloomfilter caseInsensitive
libuuid MissingH monadControl mtl network pcreLight perl QuickCheck clientsession cryptoApi dataDefault dataenc dbus editDistance
rsync SHA testpack utf8String which liftedBase IfElse bloomfilter extensibleExceptions filepath hamlet hinotify hS3 hslogger HTTP
editDistance openssh stm hinotify httpTypes IfElse json liftedBase MissingH monadControl mtl network
]; networkInfo networkMulticast pcreLight QuickCheck SHA stm text time
transformers transformersBase utf8String wai waiLogger warp yesod
yesodDefault yesodStatic testpack ];
checkTarget = "test"; checkTarget = "test";
doCheck = true; doCheck = true;
@ -29,7 +37,7 @@ stdenv.mkDerivation {
# The 'add_url' test fails because it attempts to use the network. # The 'add_url' test fails because it attempts to use the network.
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|' Build/mdwn2man
sed -i -e 's|"cp |"${coreutils}/bin/cp |' -e 's|"rm -f |"${coreutils}/bin/rm -f |' test.hs sed -i -e 's|"cp |"${coreutils}/bin/cp |' -e 's|"rm -f |"${coreutils}/bin/rm -f |' test.hs
''; '';