Author: simons
Date: Wed Jul 20 12:13:07 2011
New Revision: 27839
URL: https://svn.nixos.org/websvn/nix/?rev=27839&sc=1
Log:
git-annex: the latest version depends on the monad-control package
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
Wed Jul 20 11:50:13 2011 (r27838)
+++
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
Wed Jul 20 12:13:07 2011 (r27839)
@@ -48,7 +48,7 @@
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 {
Modified:
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
Wed Jul 20 11:50:13 2011 (r27838)
+++
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
Wed Jul 20 12:13:07 2011 (r27839)
@@ -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 @@
};
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;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
