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

git-annex: clean up build expression

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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