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

git-annex: the latest version depends on the monad-control package

Browse Source 
svn path=/nixpkgs/trunk/; revision=27839
This commit is contained in:
Peter Simons 2011-07-20 12:13:07 +00:00
parent f61f66f46d
commit ff91dbdb35
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,7 @@ rec {
gitAnnex = lib.makeOverridable (import ./git-annex) { gitAnnex = lib.makeOverridable (import ./git-annex) {
inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which; inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which;
inherit (haskellPackages) ghc MissingH utf8String QuickCheck2 pcreLight SHA dataenc inherit (haskellPackages) ghc MissingH utf8String QuickCheck2 pcreLight SHA dataenc
HTTP testpack; HTTP testpack monadControl;
}; };
qgit = import ./qgit { qgit = import ./qgit {

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

@ -1,5 +1,6 @@
{ stdenv, fetchurl, ghc, libuuid, rsync, findutils, curl, perl, MissingH, utf8String { 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 let
version = "3.20110719"; version = "3.20110719";
@ -13,7 +14,7 @@ stdenv.mkDerivation {
}; };
buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String QuickCheck2 pcreLight 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"; checkTarget = "test";
doCheck = true; doCheck = true;