guix: Simplify environment file.

1 files changed, 8 insertions, 34 deletions

diff --git a/guix.scm b/guix.scm
index 70aef9e..2bdae1c 100644
--- a/guix.scm
+++ b/guix.scm
@@ -10,32 +10,7 @@
  (gnu packages guile)
  (gnu packages guile-xyz)
  (gnu packages pkg-config)
- (gnu packages texinfo)
- (gnu packages parallel))
-
-;; Later versions (such as 1.03.6) have a regression so that no
-;; #define'd symbols are recorded.
-(define-public nyacc-older
-  (package
-    (inherit nyacc-0.99)
-    (version "1.03.0")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://savannah/nyacc/nyacc-"
-                                  version ".tar.gz"))
-              (sha256
-               (base32
-                "1vdiqpm3p0ndmpmkzcpkpjvgklfsk4wxrhkixdxbczpafdfl635p"))
-              (modules '((guix build utils)))
-              (snippet
-               '(begin
-                  (substitute* "configure"
-                    (("GUILE_GLOBAL_SITE=\\$prefix.*")
-                     "GUILE_GLOBAL_SITE=\
-$prefix/share/guile/site/$GUILE_EFFECTIVE_VERSION\n"))
-                  #t))))
-    (inputs
-     `(("guile" ,guile-3.0)))))
+ (gnu packages texinfo))
 
 (package
   (name "guile-drmaa")
@@ -43,16 +18,15 @@ $prefix/share/guile/site/$GUILE_EFFECTIVE_VERSION\n"))
   (source "./guile-drmaa-0.1.tar.gz")
   (build-system gnu-build-system)
   (native-inputs
-   `(("autoconf" ,autoconf)
-     ("automake" ,automake)
-     ("pkg-config" ,pkg-config)
-     ("texinfo" ,texinfo)
-     ("sed" ,sed)))
+   (list autoconf
+         automake
+         pkg-config
+         texinfo
+         sed))
   (inputs
-   `(("guile" ,guile-3.0)))
+   (list guile-3.0))
   (propagated-inputs
-   `(("guile-bytestructures" ,guile-bytestructures)
-     ("nyacc" ,nyacc-older)))
+   (list guile-bytestructures nyacc))
   (synopsis "")
   (description "")
   (home-page "")