diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-04-08 15:47:00 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-04-08 15:47:00 -0400 |
| commit | 533a893cc6b03f100566760d6e0c8e0500ed7082 (patch) | |
| tree | 0ecbf89895a400c43d16bb1f6539f1a88aeaa4cf /guix/build-system/python.scm | |
| parent | 6a2546f92d07df04e5d700924edd027ed1e2ef11 (diff) | |
| parent | c762df54786fd6f005f3b5307323f1d2df3cbf0b (diff) | |
Merge branch 'master' into staging
Conflicts:
.guix-authorizations
gnu/ci.scm
gnu/packages/base.scm
gnu/packages/databases.scm
gnu/packages/gnome.scm
gnu/packages/gtk.scm
gnu/packages/imagemagick.scm
gnu/packages/password-utils.scm
gnu/packages/python-xyz.scm
gnu/packages/web-browsers.scm
Diffstat (limited to 'guix/build-system/python.scm')
| -rw-r--r-- | guix/build-system/python.scm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/guix/build-system/python.scm b/guix/build-system/python.scm index e39c06528e..80895162f8 100644 --- a/guix/build-system/python.scm +++ b/guix/build-system/python.scm @@ -98,8 +98,7 @@ pre-defined variants." ;; Otherwise build the new package object graph. ((eq? (package-build-system p) python-build-system) - (package - (inherit p) + (package/inherit p (location (package-location p)) (name (let ((name (package-name p))) (string-append new-prefix @@ -131,8 +130,7 @@ pre-defined variants." (define (strip-python2-variant p) "Remove the 'python2-variant' property from P." - (package - (inherit p) + (package/inherit p (properties (alist-delete 'python2-variant (package-properties p))))) (define* (lower name |