configure.ac

@@ -1,6 +1,6 @@
 AC_INIT([mudsync], [0.1.0-pre], [cwebber@dustycloud.org])
 
-PKG_CHECK_MODULES([GUILE], [guile-2.2])
+PKG_CHECK_MODULES([GUILE], [guile-3.0])
 
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 

guix.scm

@@ -46,6 +46,7 @@
              (gnu packages)
              (gnu packages autotools)
              (gnu packages guile)
+             (gnu packages guile-xyz)
              (gnu packages pkg-config)
              (gnu packages texinfo))
 
@@ -62,9 +63,9 @@
                    ("automake" ,automake)
                    ("pkg-config" ,pkg-config)
                    ("texinfo" ,texinfo)))
-  (inputs `(("guile" ,guile-2.2)
+  (inputs `(("guile" ,guile-3.0)
             ("guile-8sync" ,guile-8sync)
-            ("guile-irregex" ,guile2.2-irregex)))
+            ("guile-irregex" ,guile-irregex)))
   (arguments
    `(#:phases (modify-phases %standard-phases
                 (add-before 'configure 'bootstrap

mudsync/package-config.scm

@@ -1,52 +0,0 @@
-;;; Mudsync --- Live hackable MUD
-;;; Copyright © 2017 Christopher Allan Webber <cwebber@dustycloud.org>
-;;;
-;;; This file is part of Mudsync.
-;;;
-;;; Mudsync is free software; you can redistribute it and/or modify it
-;;; under the terms of the GNU General Public License as published by
-;;; the Free Software Foundation; either version 3 of the License, or
-;;; (at your option) any later version.
-;;;
-;;; Mudsync is distributed in the hope that it will be useful, but
-;;; WITHOUT ANY WARRANTY; without even the implied warranty of
-;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; General Public License for more details.
-;;;
-;;; You should have received a copy of the GNU General Public License
-;;; along with Mudsync.  If not, see <http://www.gnu.org/licenses/>.
-
-(define-module (mudsync package-config)
-  #:export (%datadir
-            scope-datadir web-static-filepath
-
-            %mudsync-package-name %mudsync-version))
-
-(define %datadir
-  (or (getenv "MUDSYNC_DATADIR")
-      "/usr/local/share/mudsync"))
-
-(define (clean-path path)
-  "Remove any nasty .. stuff from the path"
-  (string-join (delete ".." (string-split path file-name-separator-char))
-               file-name-separator-string))
-
-(define (scope-datadir filename)
-  (clean-path (string-append %datadir filename)))
-
-(define (web-static-filepath filename)
-  (scope-datadir (string-append "/web-static" filename)))
-
-
-(define %mudsync-package-name
-  "mudsync")
-
-(define %mudsync-version
-  "0.1.0-pre")
-
-;; (define %mudsync-bug-report-address
-;;   "@PACKAGE_BUGREPORt")
-
-;; (define %mudsync-home-page-url
-;;   "")
-