From 398e3c2cc0a6536beeb5ead64a2fb83c5305956c Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 11 Apr 2024 12:56:29 +0000 Subject: [PATCH] git-repo: 2.39 -> 2.45 Signed-off-by: Otavio Salvador --- pkgs/applications/version-management/git-repo/default.nix | 4 ++-- .../version-management/git-repo/import-ssl-module.patch | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index e989e03ca1cf..a7d0f49344a0 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.39"; + version = "2.45"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - hash = "sha256-Qw0x/YiXMDrlTy6boembfqVRvEYiMWOALJtaMrr7/WI="; + hash = "sha256-f765TcOHL8wdPa9qSmGegofjCXx1tF/K5bRQnYQcYVc="; }; # Fix 'NameError: name 'ssl' is not defined' diff --git a/pkgs/applications/version-management/git-repo/import-ssl-module.patch b/pkgs/applications/version-management/git-repo/import-ssl-module.patch index efc3d2b1f8a5..43e879a8ba17 100644 --- a/pkgs/applications/version-management/git-repo/import-ssl-module.patch +++ b/pkgs/applications/version-management/git-repo/import-ssl-module.patch @@ -18,11 +18,13 @@ diff --git a/repo b/repo index 8b05def..f394b3e 100755 --- a/repo +++ b/repo -@@ -236,6 +236,7 @@ import optparse +@@ -236,8 +236,9 @@ import optparse import re import shutil import stat +import ssl + import urllib.error + import urllib.request if sys.version_info[0] == 3: import urllib.request