Merge branch 'master' into add-missing-licenses

Conflicts: pkgs/applications/version-management/subversion/default.nix
2018-08-09 13:10:27 +02:00
parent 8915ed06b3 1d4de0d552
commit af8cd3c74e
279 changed files with 12381 additions and 9643 deletions
@@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  name = "silver-searcher-${version}";
-  version = "2.1.0";
+  version = "2.2.0";

  src = fetchFromGitHub {
    owner = "ggreer";
    repo = "the_silver_searcher";
    rev = "${version}";
-    sha256 = "0wcw4kyivb10m9b173183jrj46a0gisd35yqxi1mr9hw5l5dhkpa";
+    sha256 = "0cyazh7a66pgcabijd27xnk1alhsccywivv6yihw378dqxb22i1p";
  };

  patches = [ ./bash-completion.patch ];