Merge staging-next into staging

This commit is contained in:
github-actions[bot]
2021-02-12 00:36:23 +00:00
committed by GitHub
39 changed files with 2402 additions and 1404 deletions
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "diff-so-fancy";
version = "1.3.0";
version = "1.4.0";
src = fetchFromGitHub {
owner = "so-fancy";
repo = "diff-so-fancy";
rev = "v${version}";
sha256 = "0aavxahzha2mms4vdwysk79pa6wzswpfwgsq2hwaxnaf66maahfl";
sha256 = "sha256-//n7kOANVHRSjxclxDcMnpMVzUcd/U6fFsP8acRjVWA=";
};
nativeBuildInputs = [
@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "git-repo";
version = "2.12";
version = "2.12.1";
src = fetchFromGitHub {
owner = "android";
repo = "tools_repo";
rev = "v${version}";
sha256 = "sha256-k9G0lN7qKQhWiXibzhC9Ma9h+44LQJ966MIakWk5nJM=";
sha256 = "sha256-9w8kGMgxvbeKpri+zC8mcsbC6pnwqbLbKu1XB5tfBBo=";
};
patches = [ ./import-ssl-module.patch ];