civodul pushed a commit to branch master
in repository guix.
commit 0aa6b3869584dba5916039b8e71b6532463e42ab
Author: Ludovic Courtès <[email protected]>
AuthorDate: Wed Jan 15 23:34:46 2020 +0100
serialize: Export 'dump-port*'.
* guix/serialization.scm (dump): Export as 'dump-port*'.
* guix/scripts/challenge.scm (dump-port*): Remove.
---
guix/scripts/challenge.scm | 7 ++-----
guix/serialization.scm | 3 ++-
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/guix/scripts/challenge.scm b/guix/scripts/challenge.scm
index ebeebd5..65e2427 100644
--- a/guix/scripts/challenge.scm
+++ b/guix/scripts/challenge.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2015, 2016, 2017, 2019 Ludovic Courtès <[email protected]>
+;;; Copyright © 2015, 2016, 2017, 2019, 2020 Ludovic Courtès <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -25,7 +25,7 @@
#:use-module (guix monads)
#:use-module (guix base32)
#:use-module (guix packages)
- #:use-module (guix progress)
+ #:use-module ((guix progress) #:hide (dump-port*))
#:use-module (guix serialization)
#:use-module (guix scripts substitute)
#:use-module (rnrs bytevectors)
@@ -193,9 +193,6 @@ taken since we do not import the archives."
;;; Reporting.
;;;
-(define dump-port* ;FIXME: deduplicate
- (@@ (guix serialization) dump))
-
(define (port-sha256* port size)
;; Like 'port-sha256', but limited to SIZE bytes.
(let-values (((out get) (open-sha256-port)))
diff --git a/guix/serialization.scm b/guix/serialization.scm
index f793feb..9452303 100644
--- a/guix/serialization.scm
+++ b/guix/serialization.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Ludovic Courtès
<[email protected]>
+;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Ludovic
Courtès <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -36,6 +36,7 @@
write-string-pairs
write-store-path read-store-path
write-store-path-list read-store-path-list
+ (dump . dump-port*)
&nar-error
nar-error?
