2 files changed, 19 insertions, 18 deletions
diff --git a/module/datetime/app.scm b/module/datetime/app.scm
deleted file mode 100644
index 9797ee39..00000000
--- a/module/datetime/app.scm
+++ /dev/null
@@ -1,18 +0,0 @@
-(define-module (datetime app)
-  :use-module (util)
-  :use-module (util app)
-  :use-module (ice-9 rdelim)
-  :use-module (datetime zic))
-
-(define-method (init-app)
-  (setf 'zoneinfo
-        (let* ((pipe
-                (-> (@ (global) basedir)
-                    dirname
-                    (string-append "/tzget")
-                    ((@ (ice-9 popen) open-input-pipe))))
-               (path (read-line pipe))
-               (names (string-split (read-line pipe) #\space)))
-          (read-zoneinfo
-           (map (lambda (s) (string-append path file-name-separator-string s))
-                names)))))
diff --git a/module/datetime/instance.scm b/module/datetime/instance.scm
new file mode 100644
index 00000000..fa5f96d6
--- /dev/null
+++ b/module/datetime/instance.scm
@@ -0,0 +1,19 @@
+(define-module (datetime instance)
+  :use-module (util)
+  :use-module (ice-9 rdelim)
+  :use-module (datetime zic)
+  :export (zoneinfo))
+
+
+(define-once
+  zoneinfo
+  (let* ((pipe
+          (-> (@ (global) basedir)
+              dirname
+              (string-append "/tzget")
+              ((@ (ice-9 popen) open-input-pipe))))
+         (path (read-line pipe))
+         (names (string-split (read-line pipe) #\space)))
+    (read-zoneinfo
+     (map (lambda (s) (string-append path file-name-separator-string s))
+          names))))