summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2021-05-29 21:17:10 -0300
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2021-05-30 02:20:06 +0000
commita5a6efd9b4f40c730076f5f220b260b3b0b8c006 (patch)
tree85527660820a6aa5865867d511ef04abe8fe3ce3
parentgitRepo: add myself as maintainer (diff)
downloadnixpkgs-a5a6efd9b4f40c730076f5f220b260b3b0b8c006.tar.gz
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 <otavio@ossystems.com.br> (cherry picked from commit 94d5fd438d6df069d6d303fb046e430f6118a93a)
-rw-r--r--pkgs/applications/version-management/git-repo/default.nix2
-rw-r--r--pkgs/applications/version-management/git-repo/import-ssl-module.patch12
2 files changed, 0 insertions, 14 deletions
diff --git a/pkgs/applications/version-management/git-repo/default.nix b/pkgs/applications/version-management/git-repo/default.nix
index 07903726f3c9..c20be8ed068c 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 f1ec4e3a7ddb..000000000000
--- 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