01/02: gnu: git: Build with Python 3.

[guix-commits]

rekado pushed a commit to branch master
in repository guix.

commit 7138257892f1189b84e06a47c7ba8540337bd7a3
Author: Ricardo Wurmus <address@hidden>
AuthorDate: Tue Mar 3 15:16:28 2020 +0100

    gnu: git: Build with Python 3.
    
    * gnu/packages/version-control.scm (git)[inputs]: Replace python-2 with
    python.
    [arguments]: Replace /usr/bin/python with python3.
---
 gnu/packages/version-control.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index 6597844..d88d5b4 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -8,7 +8,7 @@
 ;;; Copyright © 2014, 2016, 2019 Eric Bavier <address@hidden>
 ;;; Copyright © 2015, 2016, 2017, 2018, 2019 Efraim Flashner <address@hidden>
 ;;; Copyright © 2015, 2018 Kyle Meyer <address@hidden>
-;;; Copyright © 2015, 2017, 2018 Ricardo Wurmus <address@hidden>
+;;; Copyright © 2015, 2017, 2018, 2020 Ricardo Wurmus <address@hidden>
 ;;; Copyright © 2016, 2017 Leo Famulari <address@hidden>
 ;;; Copyright © 2016, 2017, 2018 ng0 <address@hidden>
 ;;; Copyright © 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice <address@hidden>
@@ -179,7 +179,7 @@ as well as the classic centralized workflow.")
       ("expat" ,expat)
       ("openssl" ,openssl)
       ("perl" ,perl)
-      ("python" ,python-2) ; CAVEAT: incompatible with python-3 according to 
INSTALL
+      ("python" ,python) ; for git-p4
       ("zlib" ,zlib)
 
       ;; Note: we keep this in inputs rather than native-inputs to work around
@@ -262,7 +262,7 @@ as well as the classic centralized workflow.")
           (lambda _
             (substitute* "Makefile"
               (("/usr/bin/perl") (which "perl"))
-              (("/usr/bin/python") (which "python")))
+              (("/usr/bin/python") (which "python3")))
             #t))
         (add-after 'configure 'add-PM.stamp
           (lambda _