git-annex: clean up build expression

This commit is contained in:
Peter Simons 2013-02-28 13:04:15 +01:00
parent 97c3f61e08
commit 329b33c59c
2 changed files with 39 additions and 35 deletions

View file

@ -43,13 +43,16 @@ rec {
});
gitAnnex = lib.makeOverridable (import ./git-annex) {
inherit stdenv fetchurl perl coreutils git libuuid rsync findutils curl ikiwiki which openssh;
inherit (haskellPackages) ghc bloomfilter dataenc editDistance hinotify hS3 hslogger HTTP
blazeBuilder blazeHtml caseInsensitive IfElse json liftedBase MissingH monadControl mtl
network pcreLight SHA stm utf8String networkInfo dbus clientsession cryptoApi dataDefault
extensibleExceptions filepath hamlet httpTypes networkMulticast text time transformers
transformersBase wai waiLogger warp yesod yesodDefault yesodStatic testpack QuickCheck
SafeSemaphore networkProtocolXmpp async dns DAV uuid Glob;
inherit stdenv fetchurl perl which ikiwiki curl bup git gnupg1 lsof openssh rsync;
inherit (haskellPackages) ghc aeson async blazeBuilder bloomfilter
caseInsensitive clientsession cryptoApi dataDefault dataenc DAV dbus dns
editDistance extensibleExceptions filepath gnutls hamlet hinotify hS3
hslogger httpConduit httpTypes HUnit IfElse json liftedBase MissingH
monadControl mtl network networkInfo networkMulticast networkProtocolXmpp
QuickCheck random regexCompat SafeSemaphore SHA stm text time
transformers transformersBase utf8String uuid wai waiLogger warp
xmlConduit xmlTypes yesod yesodDefault yesodForm yesodStatic testpack
cabalInstall;
};
qgit = import ./qgit {

View file

@ -1,14 +1,13 @@
{ stdenv, ghc, fetchurl, perl, coreutils, git, libuuid, rsync
, findutils, curl, ikiwiki, which, openssh
, blazeBuilder, blazeHtml, bloomfilter, caseInsensitive
, 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, SafeSemaphore
, networkProtocolXmpp, async, dns, DAV, uuid, Glob
{ stdenv, fetchurl, perl, which, ikiwiki, ghc, aeson, async, blazeBuilder
, bloomfilter, bup, caseInsensitive, clientsession, cryptoApi, curl, dataDefault
, dataenc, DAV, dbus, dns, editDistance, extensibleExceptions, filepath, git
, gnupg1, gnutls, hamlet, hinotify, hS3, hslogger, httpConduit, httpTypes, HUnit
, IfElse, json, liftedBase, lsof, MissingH, monadControl, mtl, network
, networkInfo, networkMulticast, networkProtocolXmpp, openssh, QuickCheck
, random, regexCompat, rsync, SafeSemaphore, SHA, stm, text, time, transformers
, transformersBase, utf8String, uuid, wai, waiLogger, warp, xmlConduit, xmlTypes
, yesod, yesodDefault, yesodForm, yesodStatic, testpack
, cabalInstall # TODO: remove this build input at the next update
}:
let
@ -23,27 +22,29 @@ stdenv.mkDerivation {
name = "git-annex-${version}.tar.gz";
};
buildInputs = [ ghc git libuuid rsync findutils curl ikiwiki which
openssh blazeBuilder blazeHtml bloomfilter caseInsensitive
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 SafeSemaphore networkProtocolXmpp
async dns DAV uuid Glob ];
buildInputs = [ ghc aeson async blazeBuilder bloomfilter bup ikiwiki
caseInsensitive clientsession cryptoApi curl dataDefault dataenc DAV dbus
dns editDistance extensibleExceptions filepath git gnupg1 gnutls hamlet
hinotify hS3 hslogger httpConduit httpTypes HUnit IfElse json liftedBase
lsof MissingH monadControl mtl network networkInfo networkMulticast
networkProtocolXmpp openssh QuickCheck random regexCompat rsync
SafeSemaphore SHA stm text time transformers transformersBase utf8String
uuid wai waiLogger warp xmlConduit xmlTypes yesod yesodDefault yesodForm
yesodStatic which perl testpack cabalInstall ];
checkTarget = "test";
doCheck = true;
preConfigure = ''
configurePhase = ''
makeFlagsArray=( PREFIX=$out )
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
# Remove this patch after the next update!
sed -i -e '9i #define WITH_OLD_URI' Utility/Url.hs
patchShebangs .
# cabal-install wants to store stuff in $HOME
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";
meta = {
homepage = "http://git-annex.branchable.com/";
description = "Manage files with git without checking them into git";