diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-10-02 18:22:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-02 18:22:18 +0200 |
| commit | 4d1abc44199c8957105f538119c2d19d67aee26f (patch) | |
| tree | b38dcdc8763d2d5ab0068851a0765d09136a6af7 /pkgs | |
| parent | fbc1fb78e37cc29eadee4ad8687e8777eba3cf0e (diff) | |
| parent | fe970a82ece66e08d5400c22eebd2c2ec19b5457 (diff) | |
Merge pull request #47604 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs')
114 files changed, 1135 insertions, 1135 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/default.nix b/pkgs/applications/version-management/git-and-tools/default.nix index 88746f5eba84..5ae10dd68b61 100644 --- a/pkgs/applications/version-management/git-and-tools/default.nix +++ b/pkgs/applications/version-management/git-and-tools/default.nix @@ -4,7 +4,6 @@ args @ {config, lib, pkgs}: with args; with pkgs; let gitBase = callPackage ./git { - texinfo = texinfo5; svnSupport = false; # for git-svn support guiSupport = false; # requires tcl/tk sendEmailSupport = false; # requires plenty of perl libraries 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 6cc109c48c75..8bd6457a9e50 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/ |