diff options
author | Michael Weiss <dev.primeos@gmail.com> | 2020-02-25 09:44:16 +0100 |
---|---|---|
committer | Michael Weiss <dev.primeos@gmail.com> | 2020-02-25 10:06:29 +0100 |
commit | cc2ade3d7f5abdc494bc710ed67c2fa16a2d84ab (patch) | |
tree | db48b89d96e5af56a835231e0b8068fa607c66fc /pkgs/applications/version-management | |
parent | d7c6c9a79366fa1075d3442adbc212d44bff1e92 (diff) | |
download | nixlib-cc2ade3d7f5abdc494bc710ed67c2fa16a2d84ab.tar nixlib-cc2ade3d7f5abdc494bc710ed67c2fa16a2d84ab.tar.gz nixlib-cc2ade3d7f5abdc494bc710ed67c2fa16a2d84ab.tar.bz2 nixlib-cc2ade3d7f5abdc494bc710ed67c2fa16a2d84ab.tar.lz nixlib-cc2ade3d7f5abdc494bc710ed67c2fa16a2d84ab.tar.xz nixlib-cc2ade3d7f5abdc494bc710ed67c2fa16a2d84ab.tar.zst nixlib-cc2ade3d7f5abdc494bc710ed67c2fa16a2d84ab.zip |
gitRepo: 2.3 -> 2.4.1
Diffstat (limited to 'pkgs/applications/version-management')
-rw-r--r-- | pkgs/applications/version-management/git-repo/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/version-management/git-repo/import-ssl-module.patch | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 7af3e70f211d..543ca58401a9 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.3"; + version = "2.4.1"; src = fetchFromGitHub { owner = "android"; repo = "tools_repo"; rev = "v${version}"; - sha256 = "0jrll0mjfwakyjvlhbxwsdi32jhgss9mwz8c8h24n1qbqqxysrk4"; + sha256 = "0khg1731927gvin73dcbw1657kbfq4k7agla5rpzqcnwkk5agzg3"; }; patches = [ ./import-ssl-module.patch ]; 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 783a2c17dee9..f1ec4e3a7ddb 100644 --- a/pkgs/applications/version-management/git-repo/import-ssl-module.patch +++ b/pkgs/applications/version-management/git-repo/import-ssl-module.patch @@ -1,9 +1,11 @@ ---- a/repo 2020-02-05 21:11:52.773854798 +0100 -+++ b/repo 2020-02-05 21:12:34.018329462 +0100 -@@ -137,6 +137,7 @@ +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 subprocess - import sys +import ssl if sys.version_info[0] == 3: |