me/guix
Archived
1
0
Fork 0
Code Activity

packages: Avoid #:re-export-and-replace to allow upgrades from 1.2.0.

Browse source 
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!'
This commit is contained in:
Ludovic Courtès 2021-12-22 22:01:25 +01:00
parent 4c2af58b0f
commit e89f767ce8
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
guix/packages.scm
View file

@ -56,7 +56,6 @@
#:re-export (%current-system #:re-export (%current-system
%current-target-system %current-target-system
search-path-specification) ;for convenience search-path-specification) ;for convenience
#:re-export-and-replace (delete) ;used as syntactic keyword
#:replace ((define-public* . define-public)) #:replace ((define-public* . define-public))
#:export (content-hash #:export (content-hash
content-hash? content-hash?
@ -181,6 +180,11 @@
package->cross-derivation package->cross-derivation
origin->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: ;;; Commentary:
;;; ;;;
;;; This module provides a high-level mechanism to define packages in a ;;; This module provides a high-level mechanism to define packages in a