mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-21 13:10:33 +00:00
git-annex: the latest version depends on the monad-control package
svn path=/nixpkgs/trunk/; revision=27839
This commit is contained in:
parent
f61f66f46d
commit
ff91dbdb35
|
@ -48,7 +48,7 @@ rec {
|
|||
gitAnnex = lib.makeOverridable (import ./git-annex) {
|
||||
inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which;
|
||||
inherit (haskellPackages) ghc MissingH utf8String QuickCheck2 pcreLight SHA dataenc
|
||||
HTTP testpack;
|
||||
HTTP testpack monadControl;
|
||||
};
|
||||
|
||||
qgit = import ./qgit {
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
{ stdenv, fetchurl, ghc, libuuid, rsync, findutils, curl, perl, MissingH, utf8String
|
||||
, QuickCheck2, pcreLight, SHA, dataenc, HTTP, testpack, git, ikiwiki, which }:
|
||||
, QuickCheck2, pcreLight, SHA, dataenc, HTTP, testpack, git, ikiwiki, which
|
||||
, monadControl }:
|
||||
|
||||
let
|
||||
version = "3.20110719";
|
||||
|
@ -13,7 +14,7 @@ stdenv.mkDerivation {
|
|||
};
|
||||
|
||||
buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String QuickCheck2 pcreLight
|
||||
SHA dataenc HTTP testpack git ikiwiki which];
|
||||
SHA dataenc HTTP testpack git ikiwiki which monadControl];
|
||||
|
||||
checkTarget = "test";
|
||||
doCheck = true;
|
||||
|
|
Loading…
Reference in a new issue