From 32883938eb2faa135f268cfba851c6c6e3e6e478 Mon Sep 17 00:00:00 2001
From: David Thompson <dthompson2@worcester.edu>
Date: Mon, 12 Oct 2015 20:08:49 -0400
Subject: Update Guix development package.

---
 README.md   |  2 +-
 guix.scm    | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 package.scm | 66 -----------------------------------------------------------
 3 files changed, 69 insertions(+), 67 deletions(-)
 create mode 100644 guix.scm
 delete mode 100644 package.scm

diff --git a/README.md b/README.md
index 1d856a5..643c2f8 100644
--- a/README.md
+++ b/README.md
@@ -77,7 +77,7 @@ GNU Guix users can create a build environment with all necessary
 dependencies using the handy `guix environment` tool:
 
 ```
-guix environment -l package.scm
+guix environment -l guix.scm
 ```
 
 Examples
diff --git a/guix.scm b/guix.scm
new file mode 100644
index 0000000..affec18
--- /dev/null
+++ b/guix.scm
@@ -0,0 +1,68 @@
+;;; Haunt --- Static site generator for GNU Guile
+;;; Copyright © 2015 David Thompson <davet@gnu.org>
+;;;
+;;; This file is part of Haunt.
+;;;
+;;; Haunt 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.
+;;;
+;;; Haunt 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 Haunt.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;; GNU Guix development package.  To build and install, run:
+;;
+;;   guix package -f guix.scm
+;;
+;; To use as the basis for a development environment, run:
+;;
+;;   guix environment -l guix.scm
+;;
+;;; Code:
+
+(use-modules (guix packages)
+             (guix licenses)
+             (guix git-download)
+             (guix build-system gnu)
+             (gnu packages)
+             (gnu packages autotools)
+             (gnu packages guile))
+
+(package
+  (name "haunt")
+  (version "0.1")
+  (source (origin
+            (method git-fetch)
+            (uri (git-reference
+                  (url "git://dthompson.us/haunt.git")
+                  (commit "1ddcff3")))
+            (sha256
+             (base32
+              "0gx1ijbz9k0lcgmv82x49nam1i7r16sqx5v8hbpafkiqyxkm2v1k"))))
+  (build-system gnu-build-system)
+  (arguments
+   '(#:phases
+     (modify-phases %standard-phases
+       (add-after 'unpack 'bootstrap
+         (lambda _ (zero? (system* "sh" "bootstrap")))))))
+  (native-inputs
+   `(("autoconf" ,autoconf)
+     ("automake" ,automake)))
+  (inputs
+   `(("guile" ,guile-2.0)))
+  (propagated-inputs
+   `(("guile-reader" ,guile-reader)))
+  (synopsis "Functional static site generator")
+  (description "Haunt is a static site generator written in Guile
+Scheme.  Haunt features a functional build system and an extensible
+interface for reading articles in any format.")
+  (home-page "http://haunt.dthompson.us")
+  (license gpl3+))
diff --git a/package.scm b/package.scm
deleted file mode 100644
index 3cb3102..0000000
--- a/package.scm
+++ /dev/null
@@ -1,66 +0,0 @@
-;;; Haunt --- Static site generator for GNU Guile
-;;; Copyright © 2015 David Thompson <davet@gnu.org>
-;;;
-;;; This file is part of Haunt.
-;;;
-;;; Haunt 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.
-;;;
-;;; Haunt 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 Haunt.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-;;
-;; GNU Guix development package.  To build and install, run:
-;;
-;;   guix package -e '(primitive-load "package.scm")'
-;;
-;; To use as the basis for a development environment, run:
-;;
-;;   guix environment -l package.scm
-;;
-;;; Code:
-
-(use-modules (guix packages)
-             (guix licenses)
-             (guix git-download)
-             (guix build-system gnu)
-             (gnu packages)
-             (gnu packages autotools)
-             (gnu packages guile))
-
-(package
-  (name "haunt")
-  (version "0.1")
-  (source (origin
-            (method git-fetch)
-            (uri (git-reference
-                  (url "git://dthompson.us/haunt.git")
-                  (commit "f012747")))
-            (sha256
-             (base32
-              "0gj4xw79g3q87m6js0mbvv437zf7df5d2xg4sx65mpgc85j7zafs"))))
-  (build-system gnu-build-system)
-  (arguments
-   '(#:phases
-     (modify-phases %standard-phases
-       (add-after 'unpack 'bootstrap
-         (lambda _ (zero? (system* "sh" "bootstrap")))))))
-  (native-inputs
-   `(("autoconf" ,autoconf)
-     ("automake" ,automake)))
-  (inputs
-   `(("guile" ,guile-2.0)))
-  (synopsis "Functional static site generator")
-  (description "Haunt is a static site generator written in Guile
-Scheme.  Haunt features a functional build system and an extensible
-interface for reading articles in any format.")
-  (home-page "http://haunt.dthompson.us")
-  (license gpl3+))
-- 
cgit v1.2.3