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

git-annex: update to version 4.20130314

Browse Source
This commit is contained in:
Peter Simons 2013-03-20 10:15:06 +01:00
parent a1a7448e5b
commit 51e64392ea
2 changed files with 15 additions and 16 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

@ -49,10 +49,9 @@ rec {
editDistance extensibleExceptions filepath gnutls hamlet hinotify hS3 editDistance extensibleExceptions filepath gnutls hamlet hinotify hS3
hslogger httpConduit httpTypes HUnit IfElse json liftedBase MissingH hslogger httpConduit httpTypes HUnit IfElse json liftedBase MissingH
monadControl mtl network networkInfo networkMulticast networkProtocolXmpp monadControl mtl network networkInfo networkMulticast networkProtocolXmpp
QuickCheck random regexCompat SafeSemaphore SHA stm text time QuickCheck random regexCompat SafeSemaphore SHA stm text time regexTdfa
transformers transformersBase utf8String uuid wai waiLogger warp transformers transformersBase utf8String uuid wai waiLogger warp
xmlConduit xmlTypes yesod yesodDefault yesodForm yesodStatic testpack xmlConduit xmlTypes yesod yesodDefault yesodForm yesodStatic testpack;
cabalInstall;
}; };
qgit = import ./qgit { qgit = import ./qgit {

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

@ -6,19 +6,18 @@
, networkInfo, networkMulticast, networkProtocolXmpp, openssh, QuickCheck , networkInfo, networkMulticast, networkProtocolXmpp, openssh, QuickCheck
, random, regexCompat, rsync, SafeSemaphore, SHA, stm, text, time, transformers , random, regexCompat, rsync, SafeSemaphore, SHA, stm, text, time, transformers
, transformersBase, utf8String, uuid, wai, waiLogger, warp, xmlConduit, xmlTypes , transformersBase, utf8String, uuid, wai, waiLogger, warp, xmlConduit, xmlTypes
, yesod, yesodDefault, yesodForm, yesodStatic, testpack , yesod, yesodDefault, yesodForm, yesodStatic, testpack, regexTdfa
, cabalInstall # TODO: remove this build input at the next update
}: }:
let let
version = "4.20130227"; version = "4.20130314";
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=${version}"; url = "http://git.kitenet.net/?p=git-annex.git;a=snapshot;sf=tgz;h=${version}";
sha256 = "1zw5kzb08zz43ahbhrazjpq9zn73l3kwnqilp464frf7fg7rwan6"; sha256 = "0rwirg9qdbd75c7wl6413blv9045sbxmw20idvbm47qc4q14gzv9";
name = "git-annex-${version}.tar.gz"; name = "git-annex-${version}.tar.gz";
}; };
@ -30,20 +29,21 @@ stdenv.mkDerivation {
networkProtocolXmpp openssh QuickCheck random regexCompat rsync networkProtocolXmpp openssh QuickCheck random regexCompat rsync
SafeSemaphore SHA stm text time transformers transformersBase utf8String SafeSemaphore SHA stm text time transformers transformersBase utf8String
uuid wai waiLogger warp xmlConduit xmlTypes yesod yesodDefault yesodForm uuid wai waiLogger warp xmlConduit xmlTypes yesod yesodDefault yesodForm
yesodStatic which perl testpack cabalInstall ]; yesodStatic which perl testpack regexTdfa ];
configurePhase = '' configurePhase = ''
makeFlagsArray=( PREFIX=$out ) makeFlagsArray=( PREFIX=$out CABAL=./Setup )
patchShebangs . patchShebangs .
ghc -O2 --make Setup
# cabal-install wants to store stuff in $HOME ./Setup configure -ftestsuite -f-android -fproduction -fdns -fxmpp -fpairing -fwebapp -fassistant -fdbus -finotify -fwebdav -fs3
mkdir ../tmp
export HOME=$PWD/../tmp
cabal configure -f-fast -ftestsuite -f-android -fproduction -fdns -fxmpp -fpairing -fwebapp -fassistant -fdbus -finotify -fwebdav -fs3
''; '';
checkPhase = "./git-annex test"; doCheck = true;
checkPhase = ''
export HOME="$NIX_BUILD_TOP/tmp"
mkdir "$HOME"
./git-annex test
'';
meta = { meta = {
homepage = "http://git-annex.branchable.com/"; homepage = "http://git-annex.branchable.com/";