diff options
| author | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2006-07-17 15:22:20 +0000 |
|---|---|---|
| committer | Martin Bravenboer <martin.bravenboer@logicblox.com> | 2006-07-17 15:22:20 +0000 |
| commit | 7478e8ef87ca2a621fce53e667979cb932078e26 (patch) | |
| tree | 7f34b57337bfca414351bc8060114cc1126bed9e /pkgs/build-support/fetchsvn | |
| parent | a908e6a4de821d5293639cc2adb880c9beda9187 (diff) | |
| download | nixpkgs-7478e8ef87ca2a621fce53e667979cb932078e26.tar nixpkgs-7478e8ef87ca2a621fce53e667979cb932078e26.tar.gz nixpkgs-7478e8ef87ca2a621fce53e667979cb932078e26.tar.bz2 nixpkgs-7478e8ef87ca2a621fce53e667979cb932078e26.tar.lz nixpkgs-7478e8ef87ca2a621fce53e667979cb932078e26.tar.xz nixpkgs-7478e8ef87ca2a621fce53e667979cb932078e26.tar.zst nixpkgs-7478e8ef87ca2a621fce53e667979cb932078e26.zip | |
Added ssh support to fetchsvn
svn path=/nixpkgs/trunk/; revision=5734
Diffstat (limited to 'pkgs/build-support/fetchsvn')
| -rw-r--r-- | pkgs/build-support/fetchsvn/builder.sh | 4 | ||||
| -rw-r--r-- | pkgs/build-support/fetchsvn/default.nix | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/build-support/fetchsvn/builder.sh b/pkgs/build-support/fetchsvn/builder.sh index 8153cbdf6d9..d06efa88e29 100644 --- a/pkgs/build-support/fetchsvn/builder.sh +++ b/pkgs/build-support/fetchsvn/builder.sh @@ -2,6 +2,10 @@ source $stdenv/setup header "exporting $url (r$rev) into $out" +if test "$sshSupport"; then + export SVN_SSH="$openssh/bin/ssh" +fi + # Pipe the "p" character into Subversion to force it to accept the # server's certificate. This is perfectly safe: we don't care # whether the server is being spoofed --- only the cryptographic diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix index dd8f7b41f78..ff842b0ee24 100644 --- a/pkgs/build-support/fetchsvn/default.nix +++ b/pkgs/build-support/fetchsvn/default.nix @@ -1,4 +1,4 @@ -{stdenv, subversion, nix}: {url, rev ? "HEAD", md5}: +{stdenv, subversion, nix, sshSupport ? false, openssh ? null}: {url, rev ? "HEAD", md5}: stdenv.mkDerivation { name = "svn-export"; @@ -12,5 +12,5 @@ stdenv.mkDerivation { outputHashMode = "recursive"; outputHash = md5; - inherit url rev; + inherit url rev sshSupport openssh; } |