branch master updated: gnu: linux-libre: Use Python 3 in make-linux-libre-source.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

apteryx pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new b9a7fa8  gnu: linux-libre: Use Python 3 in make-linux-libre-source.
b9a7fa8 is described below

commit b9a7fa817a65f74a68c5a5104d9ec861fb778800
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Tue Sep 1 16:12:53 2020 -0400

    gnu: linux-libre: Use Python 3 in make-linux-libre-source.
    
    Successfully tested with all of the linux-libre versions we carry in Guix:
    4.4.234, 4.9.234, 4.14.195, 4.19.142, 5.4.61 and 5.8.5.
    
    * gnu/packages/linux.scm (make-linux-libre-source): Replace python-2 by
    python-wrapper.  Do not set the PYTHON environment variable, which is not
    required when using python-wrapper.
---
 gnu/packages/linux.scm | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 1d267bb..499f5bb 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -296,11 +296,7 @@ corresponding UPSTREAM-SOURCE (an origin), using the given 
DEBLOB-SCRIPTS."
                          #+(canonical-package bzip2)
                          #+(canonical-package gzip)
                          #+(canonical-package tar)
-                         ;; The comments in the 'deblob-check' script
-                         ;; claim that it supports Python 2 and 3, but
-                         ;; in fact it fails when run in Python 3 as
-                         ;; of version 5.1.3.
-                         #+python-2))
+                         #+python-wrapper))
 
                   (with-directory-excursion "/tmp/bin"
 
@@ -337,7 +333,6 @@ corresponding UPSTREAM-SOURCE (an origin), using the given 
DEBLOB-SCRIPTS."
                            (error "multiple directories found" dirs)))))
 
                   (with-directory-excursion dir
-                    (setenv "PYTHON" (which "python"))
                     (format #t "Running deblob script...~%")
                     (force-output)
                     (invoke "/tmp/bin/deblob"))