From ff91dbdb35315fee173db212359a14e47f86c1b7 Mon Sep 17 00:00:00 2001 From: Peter Simons <simons@cryp.to> Date: Wed, 20 Jul 2011 12:13:07 +0000 Subject: [PATCH] git-annex: the latest version depends on the monad-control package svn path=/nixpkgs/trunk/; revision=27839 --- .../version-management/git-and-tools/default.nix | 2 +- .../version-management/git-and-tools/git-annex/default.nix | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index cc58a6ff6c6c..dd20d17fb9df 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -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 { diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index f9bc4767916b..fb0365710656 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -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;