From a51efd1bb47a49f71654f213c46fa416b2d5716b Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 29 May 2021 18:45:50 -0300 Subject: [PATCH 1/5] gitRepo: 2.14.5 -> 2.15.3 Signed-off-by: Otavio Salvador (cherry picked from commit 19807e4ced2eea5c8f52a6e86df24e10ebb15367) --- pkgs/applications/version-management/git-repo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index cd6d9b0fd51..c4c71d2cd48 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "git-repo"; - version = "2.14.5"; + version = "2.15.3"; src = fetchFromGitHub { owner = "android"; From 6eac23ff6aabb75926d176c49f5a683b7d1c7d7c Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 29 May 2021 21:11:54 -0300 Subject: [PATCH 2/5] gitRepo: add myself as maintainer Signed-off-by: Otavio Salvador (cherry picked from commit 3a37d115ef369c03810a2339a09449d5c18a103d) --- pkgs/applications/version-management/git-repo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index c4c71d2cd48..07903726f3c 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://android.googlesource.com/tools/repo"; license = licenses.asl20; - maintainers = [ ]; + maintainers = with maintainers; [ otavio ]; platforms = platforms.unix; }; } From a5a6efd9b4f40c730076f5f220b260b3b0b8c006 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 29 May 2021 21:17:10 -0300 Subject: [PATCH 3/5] gitRepo: Drop unnecessary patch The import-ssl-module.patch does not seem to be need and the tool seem to be working just fine. Drop the patch. Signed-off-by: Otavio Salvador (cherry picked from commit 94d5fd438d6df069d6d303fb046e430f6118a93a) --- .../version-management/git-repo/default.nix | 2 -- .../git-repo/import-ssl-module.patch | 12 ------------ 2 files changed, 14 deletions(-) delete mode 100644 pkgs/applications/version-management/git-repo/import-ssl-module.patch diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index 07903726f3c..c20be8ed068 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -13,8 +13,6 @@ stdenv.mkDerivation rec { sha256 = "sha256-3FSkWpHda1jVhy/633B+ippWcbKd83IlQcJYS9Qx5wQ="; }; - patches = [ ./import-ssl-module.patch ]; - nativeBuildInputs = [ makeWrapper ]; buildInputs = [ python3 ]; diff --git a/pkgs/applications/version-management/git-repo/import-ssl-module.patch b/pkgs/applications/version-management/git-repo/import-ssl-module.patch deleted file mode 100644 index f1ec4e3a7dd..00000000000 --- a/pkgs/applications/version-management/git-repo/import-ssl-module.patch +++ /dev/null @@ -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 From 042c54b758bb6bb82207f9f882f2a638d8a5cceb Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 29 May 2021 21:21:10 -0300 Subject: [PATCH 4/5] gitRepo: add missing preInstall and postInstall hooks calls Signed-off-by: Otavio Salvador (cherry picked from commit 9d161bd45c40168a8aa83667fa4bf1b600ccc262) --- pkgs/applications/version-management/git-repo/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index c20be8ed068..d0d70f50e4b 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -23,8 +23,12 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin cp repo $out/bin/repo + + runHook postInstall ''; # Important runtime dependencies From 1f6295e555854c6c26a0d632ca7c8d7df7109d17 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 29 May 2021 21:28:34 -0300 Subject: [PATCH 5/5] gitRepo: Add updateScript support for easier upgrade in future Signed-off-by: Otavio Salvador (cherry picked from commit ee498167d0f1d4825baa0d7d6f98bb7424db19e8) --- pkgs/applications/version-management/git-repo/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix index d0d70f50e4b..7b29e466160 100644 --- a/pkgs/applications/version-management/git-repo/default.nix +++ b/pkgs/applications/version-management/git-repo/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper +{ lib, stdenv, fetchFromGitHub, makeWrapper, nix-update-script , python3, git, gnupg, less }: @@ -37,6 +37,12 @@ stdenv.mkDerivation rec { "${lib.makeBinPath [ git gnupg less ]}" ''; + passthru = { + updateScript = nix-update-script { + attrPath = "gitRepo"; + }; + }; + meta = with lib; { description = "Android's repo management tool"; longDescription = ''