uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
62
pkgs/applications/version-management/git-repo/default.nix
Normal file
62
pkgs/applications/version-management/git-repo/default.nix
Normal file
|
|
@ -0,0 +1,62 @@
|
|||
{ lib, stdenv, fetchFromGitHub, makeWrapper, nix-update-script
|
||||
, python3, git, gnupg, less, openssh
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "git-repo";
|
||||
version = "2.25";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "android";
|
||||
repo = "tools_repo";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-3S4peybytlO432ui+bECVWQTbyNfs2kSMqcqQyVc1os=";
|
||||
};
|
||||
|
||||
# Fix 'NameError: name 'ssl' is not defined'
|
||||
patches = [ ./import-ssl-module.patch ];
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
buildInputs = [ python3 ];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace repo --replace \
|
||||
'urllib.request.urlopen(url)' \
|
||||
'urllib.request.urlopen(url, context=ssl.create_default_context())'
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
|
||||
mkdir -p $out/bin
|
||||
cp repo $out/bin/repo
|
||||
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
# Important runtime dependencies
|
||||
postFixup = ''
|
||||
wrapProgram $out/bin/repo --prefix PATH ":" \
|
||||
"${lib.makeBinPath [ git gnupg less openssh ]}"
|
||||
'';
|
||||
|
||||
passthru = {
|
||||
updateScript = nix-update-script {
|
||||
attrPath = "gitRepo";
|
||||
};
|
||||
};
|
||||
|
||||
meta = with lib; {
|
||||
description = "Android's repo management tool";
|
||||
longDescription = ''
|
||||
Repo is a Python script based on Git that helps manage many Git
|
||||
repositories, does the uploads to revision control systems, and automates
|
||||
parts of the development workflow. Repo is not meant to replace Git, only
|
||||
to make it easier to work with Git.
|
||||
'';
|
||||
homepage = "https://android.googlesource.com/tools/repo";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ otavio ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
Fix runtime error due missing import
|
||||
|
||||
Traceback (most recent call last):
|
||||
File "/nix/store/4qqhr7g9ri3n7v6ik9ahlpvyp18wcn4p-git-repo-2.15.3/bin/.repo-wrapped", line 1339, in <module>
|
||||
main(sys.argv[1:])
|
||||
File "/nix/store/4qqhr7g9ri3n7v6ik9ahlpvyp18wcn4p-git-repo-2.15.3/bin/.repo-wrapped", line 1304, in main
|
||||
_Init(args, gitc_init=(cmd == 'gitc-init'))
|
||||
File "/nix/store/4qqhr7g9ri3n7v6ik9ahlpvyp18wcn4p-git-repo-2.15.3/bin/.repo-wrapped", line 607, in _Init
|
||||
_Clone(url, dst, opt.clone_bundle, opt.quiet, opt.verbose)
|
||||
File "/nix/store/4qqhr7g9ri3n7v6ik9ahlpvyp18wcn4p-git-repo-2.15.3/bin/.repo-wrapped", line 912, in _Clone
|
||||
if clone_bundle and _DownloadBundle(url, cwd, quiet, verbose):
|
||||
File "/nix/store/4qqhr7g9ri3n7v6ik9ahlpvyp18wcn4p-git-repo-2.15.3/bin/.repo-wrapped", line 860, in _DownloadBundle
|
||||
r = urllib.request.urlopen(url, context=ssl.create_default_context())
|
||||
NameError: name 'ssl' is not defined
|
||||
builder for '/nix/store/4hvds8fv8xmzlm86yg9cf1lj6hrya7sg-amdvlk-src.drv' failed with exit code 1
|
||||
|
||||
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
|
||||
Loading…
Add table
Add a link
Reference in a new issue