Merge remote-tracking branch 'upstream/master' into HEAD

Conflicts: pkgs/applications/version-management/git-and-tools/git/default.nix pkgs/top-level/all-packages.nix pkgs/top-level/unix-tools.nix
2018-04-16 21:13:30 +03:00
parent c0e58f8074 333a24a628
commit 16b45ec3da
268 changed files with 3142 additions and 1851 deletions
@@ -33,6 +33,9 @@ stdenv.mkDerivation {
      ./construct-command-line.patch
      ./long-command-line.patch
      ./darwin-library_search-dylib.patch
+
+      # Fix support for glibc 2.27's glob
+      ../4.2/glibc-2.27-glob.patch
    ];
  patchFlags = "-p0";