diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2022-05-16 10:55:46 +0300 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2022-05-16 11:14:42 +0300 |
commit | e5e0e283ffd92f153303401c39dfcc1d8dde4f96 (patch) | |
tree | 82c7f8498081c1f807a0e4a25d0fd75c0e493043 /gnu/packages/python-build.scm | |
parent | 7c204281ff0b57de59261cd7b68fab3df1c0f49c (diff) | |
parent | 40a729a0e6f1d660b942241416c1e2c567616d4d (diff) |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/packages/python-build.scm')
-rw-r--r-- | gnu/packages/python-build.scm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index 2abb781f76..eb291c2c86 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm @@ -5,7 +5,7 @@ ;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org> ;;; Copyright © 2018, 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr> -;;; Copyright © 2021 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2021, 2022 Ricardo Wurmus <rekado@elephly.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -309,10 +309,12 @@ information.") ;; *either* of the licenses found in LICENSE.APACHE or LICENSE.BSD. ;; Contributions to this software is made under the terms of *both* these ;; licenses. - (license (list license:asl2.0 license:bsd-2)))) + (license (list license:asl2.0 license:bsd-2)) + (properties `((python2-variant . ,(delay python2-packaging-bootstrap)))))) (define-public python2-packaging-bootstrap - (let ((base (package-with-python2 python-packaging-bootstrap))) + (let ((base (package-with-python2 + (strip-python2-variant python-packaging-bootstrap)))) (package/inherit base (version "20.0") ;last version with Python 2 support (source |