alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

git-annex: update to version 3.20121112

Browse source
This commit is contained in:
Peter Simons 2012-11-15 12:49:46 +01:00
parent a36040de70
commit 84c6f6f88e
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/applications/version-management/git-and-tools/default.nix
View file

@ -48,7 +48,8 @@ rec {
blazeBuilder blazeHtml caseInsensitive IfElse json liftedBase MissingH monadControl mtl blazeBuilder blazeHtml caseInsensitive IfElse json liftedBase MissingH monadControl mtl
network pcreLight SHA stm utf8String networkInfo dbus clientsession cryptoApi dataDefault network pcreLight SHA stm utf8String networkInfo dbus clientsession cryptoApi dataDefault
extensibleExceptions filepath hamlet httpTypes networkMulticast text time transformers extensibleExceptions filepath hamlet httpTypes networkMulticast text time transformers
transformersBase wai waiLogger warp yesod yesodDefault yesodStatic testpack QuickCheck; transformersBase wai waiLogger warp yesod yesodDefault yesodStatic testpack QuickCheck
SafeSemaphore networkPprotocolXmpp async dns;
}; };
qgit = import ./qgit { qgit = import ./qgit {

12
pkgs/applications/version-management/git-and-tools/git-annex/default.nix
View file

@ -7,18 +7,19 @@
, MissingH, monadControl, mtl, network, networkInfo , MissingH, monadControl, mtl, network, networkInfo
, networkMulticast, pcreLight, QuickCheck, SHA, stm, text, time , networkMulticast, pcreLight, QuickCheck, SHA, stm, text, time
, transformers, transformersBase, utf8String, wai, waiLogger, warp , transformers, transformersBase, utf8String, wai, waiLogger, warp
, yesod, yesodDefault, yesodStatic, testpack , yesod, yesodDefault, yesodStatic, testpack, SafeSemaphore
, networkPprotocolXmpp, async, dns
}: }:
let let
version = "3.20121017"; version = "3.20121112";
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 = "1949efb22cd3154323ee00d3ab62b07158df4024283a67a53134a1fa2efa9841"; sha256 = "1ch91jvzm3di5p024kwx0ikgf588lk7bp36hlgj4ar9aa2fdl7yr";
name = "git-annex-${version}.tar.gz"; name = "git-annex-${version}.tar.gz";
}; };
@ -29,7 +30,8 @@ stdenv.mkDerivation {
httpTypes IfElse json liftedBase MissingH monadControl mtl network httpTypes IfElse json liftedBase MissingH monadControl mtl network
networkInfo networkMulticast pcreLight QuickCheck SHA stm text time networkInfo networkMulticast pcreLight QuickCheck SHA stm text time
transformers transformersBase utf8String wai waiLogger warp yesod transformers transformersBase utf8String wai waiLogger warp yesod
yesodDefault yesodStatic testpack ]; yesodDefault yesodStatic testpack SafeSemaphore networkPprotocolXmpp
async dns ];
checkTarget = "test"; checkTarget = "test";
doCheck = true; doCheck = true;
@ -39,6 +41,8 @@ stdenv.mkDerivation {
makeFlagsArray=( PREFIX=$out ) makeFlagsArray=( PREFIX=$out )
sed -i -e 's|#!/usr/bin/perl|#!${perl}/bin/perl|' Build/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
# Remove this patch after the next update!
sed -i -e '9i #define WITH_OLD_URI' Utility/Url.hs
''; '';
meta = { meta = {