gitRepo: 2.14.5 -> 2.15.3 (#124904)

This commit is contained in:
Otavio Salvador 2021-05-29 23:16:10 -03:00 committed by GitHub
parent 81f992d0e4
commit e00e031ce1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 17 deletions

View file

@ -1,10 +1,10 @@
{ lib, stdenv, fetchFromGitHub, makeWrapper { lib, stdenv, fetchFromGitHub, makeWrapper, nix-update-script
, python3, git, gnupg, less , python3, git, gnupg, less
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "git-repo"; pname = "git-repo";
version = "2.14.5"; version = "2.15.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "android"; owner = "android";
@ -13,8 +13,6 @@ stdenv.mkDerivation rec {
sha256 = "sha256-3FSkWpHda1jVhy/633B+ippWcbKd83IlQcJYS9Qx5wQ="; sha256 = "sha256-3FSkWpHda1jVhy/633B+ippWcbKd83IlQcJYS9Qx5wQ=";
}; };
patches = [ ./import-ssl-module.patch ];
nativeBuildInputs = [ makeWrapper ]; nativeBuildInputs = [ makeWrapper ];
buildInputs = [ python3 ]; buildInputs = [ python3 ];
@ -25,8 +23,12 @@ stdenv.mkDerivation rec {
''; '';
installPhase = '' installPhase = ''
runHook preInstall
mkdir -p $out/bin mkdir -p $out/bin
cp repo $out/bin/repo cp repo $out/bin/repo
runHook postInstall
''; '';
# Important runtime dependencies # Important runtime dependencies
@ -35,6 +37,12 @@ stdenv.mkDerivation rec {
"${lib.makeBinPath [ git gnupg less ]}" "${lib.makeBinPath [ git gnupg less ]}"
''; '';
passthru = {
updateScript = nix-update-script {
attrPath = "gitRepo";
};
};
meta = with lib; { meta = with lib; {
description = "Android's repo management tool"; description = "Android's repo management tool";
longDescription = '' longDescription = ''
@ -45,7 +53,7 @@ stdenv.mkDerivation rec {
''; '';
homepage = "https://android.googlesource.com/tools/repo"; homepage = "https://android.googlesource.com/tools/repo";
license = licenses.asl20; license = licenses.asl20;
maintainers = [ ]; maintainers = with maintainers; [ otavio ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

View file

@ -1,12 +0,0 @@
diff --git a/repo b/repo
index 8b05def..f394b3e 100755
--- a/repo
+++ b/repo
@@ -236,6 +236,7 @@ import optparse
import re
import shutil
import stat
+import ssl
if sys.version_info[0] == 3:
import urllib.request