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

Merge branch 'origin/master' into stdenv-updates.

Browse Source 
Conflicts:
	pkgs/tools/misc/less/default.nix
This commit is contained in:
Peter Simons
2013-12-16 21:13:24 +01:00
parent 2bc29e4e6d 60103a4bd9
commit 45e8de9a7d
232 changed files with 1551 additions and 681 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/applications/version-management/git-and-tools/git-annex/default.nix
+13 -15
View File
@@ -4,18 +4,18 @@
, extensibleExceptions, feed, filepath, git, gnupg1, gnutls, hamlet
, hinotify, hS3, hslogger, HTTP, httpConduit, httpTypes, IfElse
, json, lsof, MissingH, MonadCatchIOTransformers, monadControl, mtl
, network, networkInfo, networkMulticast, networkProtocolXmpp
, openssh, perl, QuickCheck, random, regexTdfa, rsync
, SafeSemaphore, SHA, stm, tasty, tastyHunit, tastyQuickcheck, text
, time, transformers, unixCompat, utf8String, uuid, wai, waiLogger
, warp, which, xmlConduit, xmlTypes, yesod, yesodCore, yesodDefault
, yesodForm, yesodStatic
, network, networkConduit, networkInfo, networkMulticast
, networkProtocolXmpp, openssh, perl, QuickCheck, random, regexTdfa
, rsync, SafeSemaphore, SHA, stm, tasty, tastyHunit
, tastyQuickcheck, text, time, transformers, unixCompat, utf8String
, uuid, wai, waiLogger, warp, which, xmlConduit, xmlTypes, yesod
, yesodCore, yesodDefault, yesodForm, yesodStatic
}:
cabal.mkDerivation (self: {
pname = "git-annex";
version = "5.20131130";
sha256 = "0px918wzv9zqxz7wc6rx2ay8rizbckw79yinhisjvp3y5lldyjj1";
version = "5.20131213";
sha256 = "0mwslkz0kklp4phlsf8hibh97sabdnigls7hr9725wb0ncfa85yn";
isLibrary = false;
isExecutable = true;
buildDepends = [
@@ -24,11 +24,11 @@ cabal.mkDerivation (self: {
editDistance extensibleExceptions feed filepath gnutls hamlet
hinotify hS3 hslogger HTTP httpConduit httpTypes IfElse json
MissingH MonadCatchIOTransformers monadControl mtl network
networkInfo networkMulticast networkProtocolXmpp QuickCheck random
regexTdfa SafeSemaphore SHA stm tasty tastyHunit tastyQuickcheck
text time transformers unixCompat utf8String uuid wai waiLogger
warp xmlConduit xmlTypes yesod yesodCore yesodDefault yesodForm
yesodStatic
networkConduit networkInfo networkMulticast networkProtocolXmpp
QuickCheck random regexTdfa SafeSemaphore SHA stm tasty tastyHunit
tastyQuickcheck text time transformers unixCompat utf8String uuid
wai waiLogger warp xmlConduit xmlTypes yesod yesodCore yesodDefault
yesodForm yesodStatic
];
buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ];
configureFlags = "-fS3
@@ -47,8 +47,6 @@ cabal.mkDerivation (self: {
checkPhase = ''
export HOME="$NIX_BUILD_TOP/tmp"
mkdir "$HOME"
cp dist/build/git-annex/git-annex git-annex
./git-annex test
'';
meta = {
homepage = "http://git-annex.branchable.com/";