Author: simons
Date: Wed Jul 13 10:41:10 2011
New Revision: 27747
URL: https://svn.nixos.org/websvn/nix/?rev=27747&sc=1
Log:
git-annex: the build system uses 'which' to determine whether ikiwiki is
installed
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 13 10:41:05 2011 (r27746)
+++
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/default.nix
Wed Jul 13 10:41:10 2011 (r27747)
@@ -46,7 +46,7 @@
};
gitAnnex = lib.makeOverridable (import ./git-annex) {
- inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki;
+ inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki
which;
inherit (haskellPackages) ghc MissingH utf8String QuickCheck2 pcreLight
SHA dataenc
HTTP testpack;
};
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 13 10:41:05 2011 (r27746)
+++
nixpkgs/trunk/pkgs/applications/version-management/git-and-tools/git-annex/default.nix
Wed Jul 13 10:41:10 2011 (r27747)
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, ghc, libuuid, rsync, findutils, curl, perl, MissingH,
utf8String
-, QuickCheck2, pcreLight, SHA, dataenc, HTTP, testpack, git, ikiwiki }:
+, QuickCheck2, pcreLight, SHA, dataenc, HTTP, testpack, git, ikiwiki, which }:
let
version = "3.20110705";
@@ -13,7 +13,7 @@
};
buildInputs = [ghc libuuid rsync findutils curl perl MissingH utf8String
QuickCheck2 pcreLight
- SHA dataenc HTTP testpack git ikiwiki];
+ SHA dataenc HTTP testpack git ikiwiki which];
checkTarget = "test";
doCheck = true;
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
