ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-15 21:57:02 +03:00
Code Issues Projects Releases Wiki Activity

git-and-tools: fixed build in the presence of QuickCheck 2.5

Browse Source 
svn path=/nixpkgs/trunk/; revision=34553
This commit is contained in:
Peter Simons 2012-06-18 18:16:23 +00:00
parent 972006aa43
commit a3224ededc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,9 +44,9 @@ rec {
gitAnnex = lib.makeOverridable (import ./git-annex) { gitAnnex = lib.makeOverridable (import ./git-annex) {
inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which coreutils openssh; inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which coreutils openssh;
inherit (haskellPackages_ghc741) ghc MissingH utf8String pcreLight SHA dataenc inherit (haskellPackages) ghc MissingH utf8String pcreLight SHA dataenc
HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl IfElse HTTP testpack hS3 mtl network hslogger hxt json liftedBase monadControl IfElse
QuickCheck2 bloomfilter editDistance; QuickCheck bloomfilter editDistance;
}; };
qgit = import ./qgit { qgit = import ./qgit {

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

@ -1,6 +1,6 @@
{ stdenv, fetchurl, curl, dataenc, findutils, ghc, git, hS3, hslogger, HTTP, hxt { stdenv, fetchurl, curl, dataenc, findutils, ghc, git, hS3, hslogger, HTTP, hxt
, ikiwiki, json, libuuid, MissingH, monadControl, mtl, network, pcreLight, perl , ikiwiki, json, libuuid, MissingH, monadControl, mtl, network, pcreLight, perl
, QuickCheck2, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils , QuickCheck, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils
, IfElse, bloomfilter, editDistance, openssh , IfElse, bloomfilter, editDistance, openssh
}: }:
@ -18,7 +18,7 @@ stdenv.mkDerivation {
buildInputs = [ buildInputs = [
curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json curl dataenc findutils ghc git hS3 hslogger HTTP hxt ikiwiki json
libuuid MissingH monadControl mtl network pcreLight perl QuickCheck2 libuuid MissingH monadControl mtl network pcreLight perl QuickCheck
rsync SHA testpack utf8String which liftedBase IfElse bloomfilter rsync SHA testpack utf8String which liftedBase IfElse bloomfilter
editDistance openssh editDistance openssh
]; ];