From b9a7fa817a65f74a68c5a5104d9ec861fb778800 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Tue, 1 Sep 2020 16:12:53 -0400
Subject: 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(-)

(limited to 'gnu')

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 1d267bb659..499f5bb220 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"))
-- 
cgit v1.2.3

author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=d3162b98a824a32ce955de18b9b891fbc4342d44'>root</a>/<a href='/guix/log/gnu?id=d3162b98a824a32ce955de18b9b891fbc4342d44'>gnu</a>/<a href='/guix/log/gnu/services?id=d3162b98a824a32ce955de18b9b891fbc4342d44'>services</a>/<a href='/guix/log/gnu/services/ganeti.scm?id=d3162b98a824a32ce955de18b9b891fbc4342d44'>ganeti.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/gnu/services/ganeti.scm?id=d3162b98a824a32ce955de18b9b891fbc4342d44&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-10-10 23:39:17 +0200'>2020-10-10</span></td><td><a href='/guix/commit/gnu/services/ganeti.scm?id=d7fb4199c770c3bd7ce755b1160aa19e9164f148'>services: ganeti: Fix typo.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/ganeti.scm (ganeti-luxid-service-type)[description]: Fix typo.
</span></span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-08-25 17:14:50 +0200'>2020-08-25</span></td><td><a href='/guix/commit<tr><td><span title='2017-07-18 20:16:03 +0800'>2017-07-18</span></td><td><a href='/guix/commit/gnu/services/sysctl.scm?id=172b3e2cc2d0384970c362e46af8231c63b0b004'>services: sysctl: Fix typo.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/sysctl.scm: Fix typo of 'make-sysctl-configuration'.
</span></span></td><td>宋文武</td></tr>
<tr><td><span title='2017-07-04 20:40:51 +0800'>2017-07-04</span></td><td><a href='/guix/commit/gnu/services/sysctl.scm?id=296bf4d5ab1cf7822956205b6d266c2c67ce056c'>services: Add 'sysctl-service-type'.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/sysctl.scm: New file.
* doc/guix.texi (Miscellaneous Services): Document it.
* gnu/local.mk (GNU_SYSTEM_MODULES): Add it.
</span></span></td><td>宋文武</td></tr>
rvices/ganeti.scm?id=41daf1286575f3a1998493c893f6d5a9c5b62de8'>services: ganeti: Use TLS on the remote API by default.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/ganeti.scm (&lt;ganeti-rapi-configuration&gt;): Set SSL? to #t.
* gnu/tests/ganeti.scm (%ganeti-os): Set SSL? to #f.
* doc/guix.texi (Virtualization Services): Adjust accordingly.
</span></span></td><td>Marius Bakke</td></tr>
<tr><td><span title='2020-07-16 21:51:44 +0200'>2020-07-16</span></td><td><a href='/guix/commit/gnu/services/ganeti.scm?id=9a622827559b223cc6b48733a82c74ce14a29bab'>services: Add ganeti.</a><span class='msg-avail'>...<span class='msg-tooltip'>* gnu/services/ganeti.scm, gnu/tests/ganeti.scm: New files.
* doc/guix.texi (Virtualization Services): Document the Ganeti services.
</span></span></td><td>Marius Bakke</td></tr>