Merge master into staging-next

2021-02-12 12:20:20 +00:00
parent 1551e9d6ee def7e21923
commit 15db604744
19 changed files with 121 additions and 115 deletions
@@ -4,13 +4,13 @@

 stdenv.mkDerivation rec {
  pname = "git-repo";
-  version = "2.12.1";
+  version = "2.12.2";

  src = fetchFromGitHub {
    owner = "android";
    repo = "tools_repo";
    rev = "v${version}";
-    sha256 = "sha256-9w8kGMgxvbeKpri+zC8mcsbC6pnwqbLbKu1XB5tfBBo=";
+    sha256 = "sha256-E0HGianaTNRVJsFh8tb1wdxEARRXzkFG2OHU6op5oQ4=";
  };

  patches = [ ./import-ssl-module.patch ];