summary refs log tree commit diff
path: root/pkgs/applications/version-management/git-and-tools/git
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2021-02-19 17:15:31 +0100
committerJan Tojnar <jtojnar@gmail.com>2021-02-19 17:15:31 +0100
commit8f50f1ce107914ae5a07bd9aff6649021deb6fca (patch)
tree12a65659f7a05af761500651b5260b34eea6abab /pkgs/applications/version-management/git-and-tools/git
parentc34b032ccb5cb1cf282ed141d7f60420879e2b42 (diff)
parente4f96ad7d9fa4ff2ada4936cab6abaa8b0e823c0 (diff)
downloadnixpkgs-8f50f1ce107914ae5a07bd9aff6649021deb6fca.tar
nixpkgs-8f50f1ce107914ae5a07bd9aff6649021deb6fca.tar.gz
nixpkgs-8f50f1ce107914ae5a07bd9aff6649021deb6fca.tar.bz2
nixpkgs-8f50f1ce107914ae5a07bd9aff6649021deb6fca.tar.lz
nixpkgs-8f50f1ce107914ae5a07bd9aff6649021deb6fca.tar.xz
nixpkgs-8f50f1ce107914ae5a07bd9aff6649021deb6fca.tar.zst
nixpkgs-8f50f1ce107914ae5a07bd9aff6649021deb6fca.zip
Merge branch 'staging-next' into staging
Resolved the following conflicts:

- kernel flags between 09176d28a0ebbd8bae35f92406a48cded78ac9f7 and 2b28822d8dec38fd62ef17643ec71da3bb488619
- clojure-lsp between 3fa00685ce21fb1a4218d444d0862ebcb2b99706 and e03c068af5c9ca950214cd6c3b5cfe67f595da88
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools/git')
-rw-r--r--pkgs/applications/version-management/git-and-tools/git/default.nix1
1 files changed, 0 insertions, 1 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 c955c04d779..5d1589446be 100644
--- a/pkgs/applications/version-management/git-and-tools/git/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git/default.nix
@@ -1,5 +1,4 @@
 { fetchurl, lib, stdenv, buildPackages
-, fetchpatch
 , curl, openssl, zlib, expat, perlPackages, python3, gettext, cpio
 , gnugrep, gnused, gawk, coreutils # needed at runtime by git-filter-branch etc
 , openssh, pcre2