~ruther/guix-local

e89f767ce8990f4959616031e3c98fbfe92a008b — Ludovic Courtès 4 years ago 4c2af58
packages: Avoid #:re-export-and-replace to allow upgrades from 1.2.0.

Fixes <https://issues.guix.gnu.org/52694>.
Reported by Carl Dong <contact@carldong.me>.

Use of #:re-export-and-replace would prevent upgrades from 1.2.0, whose
'source-module-closure' procedure did not recognize #:re-export-and-replace.

* guix/packages.scm: Remove #:re-export-and-replace and add top-level
call to 'module-re-export!'
1 files changed, 5 insertions(+), 1 deletions(-)

M guix/packages.scm
M guix/packages.scm => guix/packages.scm +5 -1
@@ 56,7 56,6 @@
  #:re-export (%current-system
               %current-target-system
               search-path-specification)         ;for convenience
  #:re-export-and-replace (delete)                ;used as syntactic keyword
  #:replace ((define-public* . define-public))
  #:export (content-hash
            content-hash?


@@ 181,6 180,11 @@
            package->cross-derivation
            origin->derivation))

;; The 'source-module-closure' procedure ca. 1.2.0 did not recognize
;; #:re-export-and-replace: <https://issues.guix.gnu.org/52694>.
;; Work around it.
(module-re-export! (current-module) '(delete) #:replace? #t)

;;; Commentary:
;;;
;;; This module provides a high-level mechanism to define packages in a