X-Git-Url: https://jxself.org/git/?p=mudsync.git;a=blobdiff_plain;f=guix.scm;h=6a9869905e03602080f4e1ac4e67512db952143a;hp=338b0b4831b1faa767f215b670fe986a286b78bf;hb=5beae5b135265d5230f574325623cb787069a51e;hpb=5a26827c4861bca21877ddad2074691efe075840

diff --git a/guix.scm b/guix.scm
index 338b0b4..6a98699 100644
--- a/guix.scm
+++ b/guix.scm
@@ -51,48 +51,6 @@
 
 (define %source-dir (dirname (current-filename)))
 
-(define guile-without-select-bug
-  (package
-   (inherit guile-next)
-   (version (package-version guile-next))
-   (source (origin
-              (method url-fetch)
-              (uri (string-append "ftp://alpha.gnu.org/gnu/guile/guile-"
-                                  version ".tar.xz"))
-              (sha256
-               (base32
-                "0r9y4hw17dlxahik4zsccfb2f3p2a07wqndfm251bgmam9hln6gi"))
-              (modules '((guix build utils)))
-
-              ;; Remove the pre-built object files.  Instead, build everything
-              ;; from source, at the expense of significantly longer build
-              ;; times (almost 3 hours on a 4-core Intel i5).
-              (snippet '(for-each delete-file
-                                  (find-files "prebuilt" "\\.go$")))
-
-              ;; Here's what we're adding
-              (patches (list (string-append %source-dir
-                                            "/build-aux/patch-guile-fix-live-repl.patch")))))))
-
-(define guile-8sync-latest
-  (package
-    (inherit guile-8sync)
-    (version "git")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "git://git.savannah.gnu.org/8sync.git")
-             (commit "dfde2119df2a0adb86ec4921f95ef2c15692a593")))
-       (sha256
-        (base32
-         "086smlch92n6z5xng0la9l9g6m145klw1c8222cgj32qhyarbkpk"))))
-    (arguments
-     `(#:phases (modify-phases %standard-phases
-                  (add-before 'configure 'bootstrap
-                              (lambda _
-                                (zero? (system* "./bootstrap.sh")))))))))
-
 (package
   (name "guile-mudsync")
   (version "git")
@@ -102,11 +60,11 @@
   (build-system gnu-build-system)
   (native-inputs `(("autoconf" ,autoconf)
                    ("automake" ,automake)
-                   ("guile" ,guile-without-select-bug)
-                   ("guile-8sync" ,guile-8sync-latest)
-                   ("guile-irregex" ,guile2.2-irregex)
                    ("pkg-config" ,pkg-config)
                    ("texinfo" ,texinfo)))
+  (inputs `(("guile" ,guile-2.2)
+            ("guile-8sync" ,guile-8sync)
+            ("guile-irregex" ,guile2.2-irregex)))
   (arguments
    `(#:phases (modify-phases %standard-phases
                 (add-before 'configure 'bootstrap