amaharaneko/guix-mirrors
1
1
Fork 0
mirror of https://codeberg.org/guix/guix.git synced 2025-10-02 02:15:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: git-repo: Update to 2.3.

Browse source 
* 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.
This commit is contained in:
Maxim Cournoyer 2020-02-24 09:31:12 -05:00
parent eab07e78b6
commit af52ba64fa
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 13 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
gnu/packages/android.scm
View file

@ -9,6 +9,7 @@
;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2019 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2019 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2019 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -716,7 +717,7 @@ to be passed to the @code{udev} service.")
(define-public git-repo (define-public git-repo
(package (package
(name "git-repo") (name "git-repo")
(version "1.12.37") (version "2.3")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -725,11 +726,10 @@ to be passed to the @code{udev} service.")
(commit (string-append "v" version)))) (commit (string-append "v" version))))
(file-name (string-append "git-repo-" version "-checkout")) (file-name (string-append "git-repo-" version "-checkout"))
(sha256 (sha256
(base32 "0qp7jqhblv7xblfgpcq4n18dyjdv8shz7r60c3vnjxx2fngkj2jd")))) (base32 "0jrll0mjfwakyjvlhbxwsdi32jhgss9mwz8c8h24n1qbqqxysrk4"))))
(build-system python-build-system) (build-system python-build-system)
(arguments (arguments
`(#:python ,python-2 ; code says: "Python 3 support is … experimental." `(#:phases
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'build 'set-executable-paths (add-before 'build 'set-executable-paths
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
@ -738,8 +738,8 @@ to be passed to the @code{udev} service.")
(gpg (assoc-ref inputs "gnupg")) (gpg (assoc-ref inputs "gnupg"))
(ssh (assoc-ref inputs "ssh"))) (ssh (assoc-ref inputs "ssh")))
(substitute* '("repo" "git_command.py") (substitute* '("repo" "git_command.py")
(("^GIT = 'git' ") (("^GIT = 'git'")
(string-append "GIT = '" git "/bin/git' "))) (string-append "GIT = '" git "/bin/git'")))
(substitute* "repo" (substitute* "repo"
((" cmd = \\['gpg',") ((" cmd = \\['gpg',")
(string-append " cmd = ['" gpg "/bin/gpg',"))) (string-append " cmd = ['" gpg "/bin/gpg',")))
@ -777,9 +777,14 @@ def _FindRepo():
((" rev = _Verify\\(.*\\)") " rev = None")) ((" rev = _Verify\\(.*\\)") " rev = None"))
#t))) #t)))
(delete 'build) ; nothing to build (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 (replace 'check
(lambda _ (lambda _
(invoke "python" "-m" "nose"))) (invoke "./run_tests")))
(replace 'install (replace 'install
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
@ -798,7 +803,7 @@ def _FindRepo():
("gnupg" ,gnupg) ("gnupg" ,gnupg)
("ssh" ,openssh))) ("ssh" ,openssh)))
(native-inputs (native-inputs
`(("nose" ,python2-nose))) `(("pytest" ,python-pytest)))
(home-page "https://code.google.com/p/git-repo/") (home-page "https://code.google.com/p/git-repo/")
(synopsis "Helps to manage many Git repositories.") (synopsis "Helps to manage many Git repositories.")
(description "Repo is a tool built on top of Git. Repo helps manage many (description "Repo is a tool built on top of Git. Repo helps manage many