From e89f767ce8990f4959616031e3c98fbfe92a008b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Wed, 22 Dec 2021 22:01:25 +0100
Subject: [PATCH] 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!'
---
 guix/packages.scm | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/guix/packages.scm b/guix/packages.scm
index b00fa2f702..da8b66dfa6 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -56,7 +56,6 @@ (define-module (guix packages)
   #: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 @@ (define-module (guix packages)
             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