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

git-annex: added openssh to build inputs so that the configure phase enables support for SSH connection caching

Browse Source 
svn path=/nixpkgs/trunk/; revision=34386
This commit is contained in:
Peter Simons 2012-06-08 14:02:28 +00:00
parent 87d25896c1
commit 330ea0887f
2 changed files with 3 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

@ -43,7 +43,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 coreutils; inherit stdenv fetchurl libuuid rsync findutils curl perl git ikiwiki which coreutils openssh;
inherit (haskellPackages_ghc741) ghc MissingH utf8String pcreLight SHA dataenc inherit (haskellPackages_ghc741) 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; QuickCheck2 bloomfilter editDistance;

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

@ -1,7 +1,7 @@
{ 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 , QuickCheck2, rsync, SHA, testpack, utf8String, which, liftedBase, coreutils
, IfElse, bloomfilter, editDistance , IfElse, bloomfilter, editDistance, openssh
}: }:
let let
@ -20,7 +20,7 @@ stdenv.mkDerivation {
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 QuickCheck2
rsync SHA testpack utf8String which liftedBase IfElse bloomfilter rsync SHA testpack utf8String which liftedBase IfElse bloomfilter
editDistance editDistance openssh
]; ];
checkTarget = "test"; checkTarget = "test";