diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-10-09 23:46:13 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-10-09 23:51:19 +0200 |
| commit | 0363991a250177912d4ee6849c1b5ba05fbeaaff (patch) | |
| tree | 5c2c5b4248cfafac372eae34c1adf78dfde18df4 /guix/scripts | |
| parent | 4938b0eead9b1f34883c166a16c769a5db03edd9 (diff) | |
| download | guix-patches-0363991a250177912d4ee6849c1b5ba05fbeaaff.tar guix-patches-0363991a250177912d4ee6849c1b5ba05fbeaaff.tar.gz | |
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.
Diffstat (limited to 'guix/scripts')
| -rw-r--r-- | guix/scripts/hash.scm | 2 | ||||
| -rw-r--r-- | guix/scripts/offload.scm | 1 | ||||
| -rwxr-xr-x | guix/scripts/substitute-binary.scm | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/guix/scripts/hash.scm b/guix/scripts/hash.scm index ea8c2ada6b..e2305d73ee 100644 --- a/guix/scripts/hash.scm +++ b/guix/scripts/hash.scm @@ -20,7 +20,7 @@ (define-module (guix scripts hash) #:use-module (guix base32) #:use-module (guix hash) - #:use-module (guix nar) + #:use-module (guix serialization) #:use-module (guix ui) #:use-module (guix utils) #:use-module (rnrs io ports) diff --git a/guix/scripts/offload.scm b/guix/scripts/offload.scm index 391906ff79..5d1c7c23cb 100644 --- a/guix/scripts/offload.scm +++ b/guix/scripts/offload.scm @@ -21,6 +21,7 @@ #:use-module (guix records) #:use-module (guix store) #:use-module (guix derivations) + #:use-module (guix serialization) #:use-module (guix nar) #:use-module (guix utils) #:use-module ((guix build utils) #:select (which mkdir-p)) 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) |