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
@@ -13,7 +13,7 @@
 }:

 let
-  version = "2.17.0";
+  version = "2.16.3";
  svn = subversionClient.override { perlBindings = true; };
 in

@@ -22,7 +22,7 @@ stdenv.mkDerivation {

  src = fetchurl {
    url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
-    sha256 = "1ismz7nsz8dgjmk782xr9s0mr2qh06f72pdcgbxfmnw1bvlya5p9";
+    sha256 = "0j1dwvg5llnj3g0fp8hdgpms4hp90qw9f6509vqw30dhwplrjpfn";
  };

  hardeningDisable = [ "format" ];