Unverified Commit b775ef29 authored by superherointj's avatar superherointj Committed by GitHub
Browse files

Merge pull request #303424 from otavio/git-repo 

git-repo: 2.39 -> 2.45
parents 9dc3a3d0 398e3c2c

pkgs/applications/version-management/git-repo/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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'

pkgs/applications/version-management/git-repo/import-ssl-module.patch

+3 −1
Original line number Diff line number Diff line
@@ -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