From a4f20976fbd8b118f02e2a897de186e59054ba71 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:27 +0000 Subject: [PATCH] fetchsvnssh: move defaults to package file --- pkgs/build-support/fetchsvnssh/default.nix | 2 +- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/build-support/fetchsvnssh/default.nix b/pkgs/build-support/fetchsvnssh/default.nix index f76bd10247b..fbd74efd750 100644 --- a/pkgs/build-support/fetchsvnssh/default.nix +++ b/pkgs/build-support/fetchsvnssh/default.nix @@ -1,4 +1,4 @@ -{stdenvNoCC, subversion, sshSupport ? false, openssh ? null, expect}: +{stdenvNoCC, subversion, sshSupport ? true, openssh ? null, expect}: {username, password, url, rev ? "HEAD", md5 ? "", sha256 ? ""}: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5d0eede6ba3..31220caacc0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -230,9 +230,7 @@ in fetchsvnrevision = import ../build-support/fetchsvnrevision runCommand subversion; - fetchsvnssh = callPackage ../build-support/fetchsvnssh { - sshSupport = true; - }; + fetchsvnssh = callPackage ../build-support/fetchsvnssh { }; fetchhg = callPackage ../build-support/fetchhg { };