diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2020-10-21 22:12:48 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2021-01-12 22:00:42 -0500 |
| commit | 44b0ffcf00f2150c120ecf82003ab10a93fe2184 (patch) | |
| tree | 47d691f364a549685ed9fd17fc843e97b90633a6 /gnu/packages/python.scm | |
| parent | a8650a70ab70120a3136366180e32b8812df99c2 (diff) | |
gnu: python-3.8: Fix indentation.
* gnu/packages/python.scm (python-3.8): Fix indentation.
Diffstat (limited to 'gnu/packages/python.scm')
| -rw-r--r-- | gnu/packages/python.scm | 57 |
1 files changed, 29 insertions, 28 deletions
diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 1c183f925b1..c0686b01286 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm | |||
| @@ -362,7 +362,8 @@ data types.") | |||
| 362 | (properties `((superseded . ,python-2))))) | 362 | (properties `((superseded . ,python-2))))) |
| 363 | 363 | ||
| 364 | (define-public python-3.8 | 364 | (define-public python-3.8 |
| 365 | (package (inherit python-2) | 365 | (package |
| 366 | (inherit python-2) | ||
| 366 | (name "python") | 367 | (name "python") |
| 367 | (version "3.8.5") | 368 | (version "3.8.5") |
| 368 | (source (origin | 369 | (source (origin |
| @@ -430,24 +431,24 @@ data types.") | |||
| 430 | " test_write_pty") | 431 | " test_write_pty") |
| 431 | '())))) | 432 | '())))) |
| 432 | ((#:phases phases) | 433 | ((#:phases phases) |
| 433 | `(modify-phases ,phases | 434 | `(modify-phases ,phases |
| 434 | ,@(if (hurd-system?) | 435 | ,@(if (hurd-system?) |
| 435 | `((delete 'patch-regen-for-hurd)) ;regen was removed after 3.5.9 | 436 | `((delete 'patch-regen-for-hurd)) ;regen was removed after 3.5.9 |
| 436 | '()) | 437 | '()) |
| 437 | (add-before 'check 'set-TZDIR | 438 | (add-before 'check 'set-TZDIR |
| 438 | (lambda* (#:key inputs native-inputs #:allow-other-keys) | 439 | (lambda* (#:key inputs native-inputs #:allow-other-keys) |
| 439 | ;; test_email requires the Olson time zone database. | 440 | ;; test_email requires the Olson time zone database. |
| 440 | (setenv "TZDIR" | 441 | (setenv "TZDIR" |
| 441 | (string-append (assoc-ref | 442 | (string-append (assoc-ref |
| 442 | (or native-inputs inputs) "tzdata") | 443 | (or native-inputs inputs) "tzdata") |
| 443 | "/share/zoneinfo")) | 444 | "/share/zoneinfo")) |
| 444 | #t)) | 445 | #t)) |
| 445 | ;; Unset SOURCE_DATE_EPOCH while running the test-suite and set it | 446 | ;; Unset SOURCE_DATE_EPOCH while running the test-suite and set it |
| 446 | ;; again afterwards. See <https://bugs.python.org/issue34022>. | 447 | ;; again afterwards. See <https://bugs.python.org/issue34022>. |
| 447 | (add-before 'check 'unset-SOURCE_DATE_EPOCH | 448 | (add-before 'check 'unset-SOURCE_DATE_EPOCH |
| 448 | (lambda _ (unsetenv "SOURCE_DATE_EPOCH") #t)) | 449 | (lambda _ (unsetenv "SOURCE_DATE_EPOCH") #t)) |
| 449 | (add-after 'check 'reset-SOURCE_DATE_EPOCH | 450 | (add-after 'check 'reset-SOURCE_DATE_EPOCH |
| 450 | (lambda _ (setenv "SOURCE_DATE_EPOCH" "1") #t)) | 451 | (lambda _ (setenv "SOURCE_DATE_EPOCH" "1") #t)) |
| 451 | (replace 'rebuild-bytecode | 452 | (replace 'rebuild-bytecode |
| 452 | (lambda* (#:key outputs #:allow-other-keys) | 453 | (lambda* (#:key outputs #:allow-other-keys) |
| 453 | (let ((out (assoc-ref outputs "out"))) | 454 | (let ((out (assoc-ref outputs "out"))) |
| @@ -464,12 +465,12 @@ data types.") | |||
| 464 | "python3" | 465 | "python3" |
| 465 | '(string-append out | 466 | '(string-append out |
| 466 | "/bin/python3")) | 467 | "/bin/python3")) |
| 467 | ,@opt | 468 | ,@opt |
| 468 | "-m" "compileall" | 469 | "-m" "compileall" |
| 469 | "-f" ; force rebuild | 470 | "-f" ; force rebuild |
| 470 | ;; Don't build lib2to3, because it's Python 2 code. | 471 | ;; Don't build lib2to3, because it's Python 2 code. |
| 471 | "-x" "lib2to3/.*" | 472 | "-x" "lib2to3/.*" |
| 472 | ,file))) | 473 | ,file))) |
| 473 | (find-files out "\\.py$"))) | 474 | (find-files out "\\.py$"))) |
| 474 | (list '() '("-O") '("-OO"))) | 475 | (list '() '("-O") '("-OO"))) |
| 475 | #t))) | 476 | #t))) |
| @@ -481,9 +482,9 @@ data types.") | |||
| 481 | '("arm" "aarch64")) | 482 | '("arm" "aarch64")) |
| 482 | '((add-after 'unpack 'apply-alignment-patch | 483 | '((add-after 'unpack 'apply-alignment-patch |
| 483 | (lambda* (#:key native-inputs inputs #:allow-other-keys) | 484 | (lambda* (#:key native-inputs inputs #:allow-other-keys) |
| 484 | (invoke "patch" "-p1" "--force" "--input" | 485 | (invoke "patch" "-p1" "--force" "--input" |
| 485 | (assoc-ref (or native-inputs inputs) | 486 | (assoc-ref (or native-inputs inputs) |
| 486 | "arm-alignment.patch"))))) | 487 | "arm-alignment.patch"))))) |
| 487 | '())))))) | 488 | '())))))) |
| 488 | (native-inputs | 489 | (native-inputs |
| 489 | `(("tzdata" ,tzdata-for-tests) | 490 | `(("tzdata" ,tzdata-for-tests) |
