From 8abaf8dfe539a2d73782a0189cd09f6211fb6298 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:33:14 +0000 Subject: [PATCH] fetchsvn: move defaults to package file --- pkgs/build-support/fetchsvn/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/fetchsvn/default.nix b/pkgs/build-support/fetchsvn/default.nix index 194ce3b39b1d..68433d1471d6 100644 --- a/pkgs/build-support/fetchsvn/default.nix +++ b/pkgs/build-support/fetchsvn/default.nix @@ -1,4 +1,4 @@ -{stdenvNoCC, subversion, glibcLocales, sshSupport ? false, openssh ? null}: +{stdenvNoCC, subversion, glibcLocales, sshSupport ? true, openssh ? null}: {url, rev ? "HEAD", md5 ? "", sha256 ? "" , ignoreExternals ? false, ignoreKeywords ? false, name ? null , preferLocalBuild ? true }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3e7c8b32fb66..ce595b3e4f7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -226,9 +226,7 @@ in fetchs3 = callPackage ../build-support/fetchs3 { }; - fetchsvn = callPackage ../build-support/fetchsvn { - sshSupport = true; - }; + fetchsvn = callPackage ../build-support/fetchsvn { }; fetchsvnrevision = import ../build-support/fetchsvnrevision runCommand subversion;