Merge branch 'master' into staging

2018-09-08 22:08:32 +00:00
parent 16650af8c3 fb0e0dcbc6
commit b7bd0561be
311 changed files with 8379 additions and 3004 deletions
--- a/pkgs/development/tools/build-managers/bear/default.nix
+++ b/pkgs/development/tools/build-managers/bear/default.nix
@@ -2,13 +2,13 @@

 stdenv.mkDerivation rec {
  name = "bear-${version}";
-  version = "2.3.12";
+  version = "2.3.13";

  src = fetchFromGitHub {
    owner = "rizsotto";
    repo = "Bear";
    rev = version;
-    sha256 = "1zzz2yiiny9pm4h6ayb82xzxc2j5djcpf8va2wagcw92m7w6miqw";
+    sha256 = "0imvvs22gyr1v6ydgp5yn2nq8fb8llmz0ra1m733ikjaczl3jm7z";
  };

  nativeBuildInputs = [ cmake ];