From a26c5495cd40f6adb9e36cb68d1fa5300fa7f182 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 12 Apr 2022 00:58:51 +0200 Subject: [PATCH] git: add reasonable defaults for boolean flags --- .../version-management/git-and-tools/git/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 3 --- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 1f08cd26ef36..f2038e95d259 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -4,15 +4,15 @@ , openssh, pcre2, bash , asciidoc, texinfo, xmlto, docbook2x, docbook_xsl, docbook_xml_dtd_45 , libxslt, tcl, tk, makeWrapper, libiconv -, svnSupport, subversionClient, perlLibs, smtpPerlLibs +, svnSupport ? false, subversionClient, perlLibs, smtpPerlLibs , perlSupport ? stdenv.buildPlatform == stdenv.hostPlatform , nlsSupport ? true , osxkeychainSupport ? stdenv.isDarwin -, guiSupport +, guiSupport ? false , withManual ? true , pythonSupport ? true , withpcre2 ? true -, sendEmailSupport +, sendEmailSupport ? false , darwin , nixosTests , withLibsecret ? false diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cf2854ac7ed8..071f4d86eea5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26139,9 +26139,6 @@ with pkgs; }; git = callPackage ../applications/version-management/git-and-tools/git { - svnSupport = false; # for git-svn support - guiSupport = false; # requires tcl/tk - sendEmailSupport = false; # requires plenty of perl libraries perlLibs = [perlPackages.LWP perlPackages.URI perlPackages.TermReadKey]; smtpPerlLibs = [ perlPackages.libnet perlPackages.NetSMTPSSL