From 0363991a250177912d4ee6849c1b5ba05fbeaaff Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 9 Oct 2014 23:46:13 +0200 Subject: Break module cycle involving (guix store) and (guix ui). Before, there was a cycle along the lines of: (guix store) -> (guix nar) -> (guix ui) -> (guix store) This caused problems, as discussed at: http://lists.gnu.org/archive/html/guix-devel/2014-10/msg00109.html This patch removes cycles in the (guix ...) modules. * guix/nar.scm (&nar-error, &nar-read-error, dump, write-contents, read-contents, %archive-version-1, write-file, restore-file): Move to... * guix/serialization.scm: ... here. * guix/store.scm: Remove dependency on (guix nar). * guix/scripts/hash.scm, guix/scripts/offload.scm, guix/scripts/substitute-binary.scm, tests/nar.scm, tests/store.scm, tests/substitute-binary.scm: Adjust accordingly. --- guix/scripts/substitute-binary.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'guix/scripts/substitute-binary.scm') diff --git a/guix/scripts/substitute-binary.scm b/guix/scripts/substitute-binary.scm index a2d0cab727..f5ccc8d5e5 100755 --- a/guix/scripts/substitute-binary.scm +++ b/guix/scripts/substitute-binary.scm @@ -23,7 +23,7 @@ #:use-module (guix utils) #:use-module (guix config) #:use-module (guix records) - #:use-module (guix nar) + #:use-module (guix serialization) #:use-module (guix hash) #:use-module (guix base64) #:use-module (guix pk-crypto) -- cgit v1.2.3