aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/android.scm
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2020-02-24 09:31:12 -0500
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2020-02-24 10:54:04 -0500
commitaf52ba64fa6350690d65a1aca9c89e13103fd8d0 (patch)
tree44b4569d84d57aa9bd7e5e96d1dcf2818bd6aca4 /gnu/packages/android.scm
parenteab07e78b691ae7866267fc04d31c7c3ad6b0eeb (diff)
downloadguix-af52ba64fa6350690d65a1aca9c89e13103fd8d0.tar
guix-af52ba64fa6350690d65a1aca9c89e13103fd8d0.tar.gz
gnu: git-repo: Update to 2.3.
* gnu/packages/android.scm (git-repo): Update to 2.3. [arguments]: Remove the #:python argument. git-repo v2.x is now compatible with Python 3. [phases]{configure-git}: New phase. {set-executable-paths}: Adapt the substitution rule for the GIT command. {check}: Use the "run_tests" script to launch tests. [native-inputs]: Replace python2-nose by python-test.
Diffstat (limited to 'gnu/packages/android.scm')
-rw-r--r--gnu/packages/android.scm21
1 files changed, 13 insertions, 8 deletions
diff --git a/gnu/packages/android.scm b/gnu/packages/android.scm
index 30dd8925a4..ba883f1ff9 100644
--- a/gnu/packages/android.scm
+++ b/gnu/packages/android.scm
@@ -9,6 +9,7 @@
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
+;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -716,7 +717,7 @@ to be passed to the @code{udev} service.")
(define-public git-repo
(package
(name "git-repo")
- (version "1.12.37")
+ (version "2.3")
(source
(origin
(method git-fetch)
@@ -725,11 +726,10 @@ to be passed to the @code{udev} service.")
(commit (string-append "v" version))))
(file-name (string-append "git-repo-" version "-checkout"))
(sha256
- (base32 "0qp7jqhblv7xblfgpcq4n18dyjdv8shz7r60c3vnjxx2fngkj2jd"))))
+ (base32 "0jrll0mjfwakyjvlhbxwsdi32jhgss9mwz8c8h24n1qbqqxysrk4"))))
(build-system python-build-system)
(arguments
- `(#:python ,python-2 ; code says: "Python 3 support is … experimental."
- #:phases
+ `(#:phases
(modify-phases %standard-phases
(add-before 'build 'set-executable-paths
(lambda* (#:key inputs outputs #:allow-other-keys)
@@ -738,8 +738,8 @@ to be passed to the @code{udev} service.")
(gpg (assoc-ref inputs "gnupg"))
(ssh (assoc-ref inputs "ssh")))
(substitute* '("repo" "git_command.py")
- (("^GIT = 'git' ")
- (string-append "GIT = '" git "/bin/git' ")))
+ (("^GIT = 'git'")
+ (string-append "GIT = '" git "/bin/git'")))
(substitute* "repo"
((" cmd = \\['gpg',")
(string-append " cmd = ['" gpg "/bin/gpg',")))
@@ -777,9 +777,14 @@ def _FindRepo():
((" rev = _Verify\\(.*\\)") " rev = None"))
#t)))
(delete 'build) ; nothing to build
+ (add-before 'check 'configure-git
+ (lambda _
+ (setenv "HOME" (getcwd))
+ (invoke "git" "config" "--global" "user.email" "you@example.com")
+ (invoke "git" "config" "--global" "user.name" "Your Name")))
(replace 'check
(lambda _
- (invoke "python" "-m" "nose")))
+ (invoke "./run_tests")))
(replace 'install
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
@@ -798,7 +803,7 @@ def _FindRepo():
("gnupg" ,gnupg)
("ssh" ,openssh)))
(native-inputs
- `(("nose" ,python2-nose)))
+ `(("pytest" ,python-pytest)))
(home-page "https://code.google.com/p/git-repo/")
(synopsis "Helps to manage many Git repositories.")
(description "Repo is a tool built on top of Git. Repo helps manage many