rekahsoft/blog-rekahsoft-ca
1
1
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

WIP: guix development workflow

Browse Source
This commit is contained in:
Collin J. Doering 2021-11-21 21:28:44 -05:00
parent 368d1c4880
commit 94e74df3be
Signed by: rekahsoft
GPG Key ID: 7B4DEB93212B3022
5 changed files with 257 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
blog-rekahsoft-ca.cabal
View File

@ -61,8 +61,8 @@ executable blog-rekahsoft-ca
other-extensions: OverloadedStrings, TupleSections, FlexibleContexts
-- Other library packages from which modules are imported.
build-depends: base >=4.11 && <4.12,
hakyll >= 4.12 && <4.13,
build-depends: base >=4.14 && <4.15,
hakyll >= 4.15 && <4.16,
pandoc >= 1.13,
parsec >= 3.1,
filepath >= 1.3,
@ -89,7 +89,7 @@ executable gencss
other-extensions: OverloadedStrings
-- Other library packages from which modules are imported.
build-depends: base >=4.11 && <4.12,
build-depends: base >=4.14 && <4.15,
clay >=0.13 && <0.14,
text >=1.2 && <1.3

199
blog-rekahsoft-ca.scm Normal file
View File

@ -0,0 +1,199 @@
;; (C) Copyright Collin J. Doering 2021
;;
;; This program 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.
;;
;; This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
;; File: blog-rekahsoft-ca.scm
;; Author: Collin J. Doering <collin.doering@rekahsoft.ca>
;; Date: Nov 21, 2021
(use-modules
(gnu packages)
((guix licenses) #:prefix license:)
(guix packages)
(guix download)
(guix git-download)
(guix build-system haskell)
(gnu packages linux)
(gnu packages haskell-web)
(gnu packages haskell-apps)
(gnu packages haskell-xyz)
(gnu packages haskell-crypto)
(gnu packages haskell-check))
(define-public ghc-lrucache
(package
(name "ghc-lrucache")
(version "1.2.0.1")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/lrucache/lrucache-"
version
".tar.gz"))
(sha256
(base32 "11avhnjnb89rvn2s41jhh5r40zgp7r6kb5c0hcfiibpabqvv46pw"))))
(build-system haskell-build-system)
(inputs `(("ghc-contravariant" ,ghc-contravariant)))
(home-page "http://github.com/chowells79/lrucache")
(synopsis "a simple, pure LRU cache")
(description
"This package contains a simple, pure LRU cache, implemented in terms of \"Data.Map\". . It also contains a mutable IO wrapper providing atomic updates to an LRU cache.")
(license license:bsd-3)))
(define-public ghc-hakyll
(package
(name "ghc-hakyll")
(version "4.15.1.0")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/hakyll/hakyll-"
version
".tar.gz"))
(sha256
(base32 "18nhpnhi63xvmb14khw1ad8rwj2lxdyhpc58gnmr9vb5zz2db6bh"))))
(build-system haskell-build-system)
(inputs
`(("ghc-aeson" ,ghc-aeson)
("ghc-blaze-html" ,ghc-blaze-html)
("ghc-blaze-markup" ,ghc-blaze-markup)
("ghc-data-default" ,ghc-data-default)
("ghc-file-embed" ,ghc-file-embed)
("ghc-hashable" ,ghc-hashable)
("ghc-lifted-async" ,ghc-lifted-async)
("ghc-lrucache" ,ghc-lrucache)
("ghc-network-uri" ,ghc-network-uri)
("ghc-optparse-applicative" ,ghc-optparse-applicative)
("ghc-random" ,ghc-random)
("ghc-regex-tdfa" ,ghc-regex-tdfa)
("ghc-resourcet" ,ghc-resourcet)
("ghc-scientific" ,ghc-scientific)
("ghc-tagsoup" ,ghc-tagsoup)
("ghc-time-locale-compat" ,ghc-time-locale-compat)
("ghc-unordered-containers" ,ghc-unordered-containers)
("ghc-vector" ,ghc-vector)
("ghc-yaml" ,ghc-yaml)
("ghc-wai" ,ghc-wai)
("ghc-warp" ,ghc-warp)
("ghc-wai-app-static" ,ghc-wai-app-static)
("ghc-http-types" ,ghc-http-types)
("ghc-fsnotify" ,ghc-fsnotify)
("ghc-http-conduit" ,ghc-http-conduit)
("ghc-pandoc" ,ghc-pandoc)))
(native-inputs
`(("ghc-quickcheck" ,ghc-quickcheck)
("ghc-tasty" ,ghc-tasty)
("ghc-tasty-golden" ,ghc-tasty-golden)
("ghc-tasty-hunit" ,ghc-tasty-hunit)
("ghc-tasty-quickcheck" ,ghc-tasty-quickcheck)
;; "rev" program used during tests from util-linux
("util-linux" ,util-linux)))
(arguments
`(#:cabal-revision
("1" "1kxdvh7250nvfdz5wnchyqhghhp05i06sfnjg9ar17p0wyqzv46z")))
(home-page "http://jaspervdj.be/hakyll")
(synopsis "A static website compiler library")
(description
"Hakyll is a static website compiler library. It provides you with the tools to create a simple or advanced static website using a Haskell DSL and formats such as markdown or RST. You can find more information, including a tutorial, on the website: . * <http://jaspervdj.be/hakyll> . If you seek assistance, there's: . * A google group: <http://groups.google.com/group/hakyll> . * An IRC channel, @#hakyll@ on irc.libera.chat (we *do not* have a channel on Freenode anymore) . Additionally, there's the Haddock documentation in the different modules, meant as a reference.")
(license license:bsd-3)))
(define-public ghc-hspec-discover
(package
(name "ghc-hspec-discover")
(version "2.9.1")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/hspec-discover/hspec-discover-"
version
".tar.gz"))
(sha256
(base32 "13cbjyzmd543jcpi7bh420adh2bpn088v8fv0cb25zgx8q5khmxw"))))
(build-system haskell-build-system)
(native-inputs
`(("ghc-quickcheck" ,ghc-quickcheck)
("ghc-hspec-meta" ,ghc-hspec-meta)
("ghc-mockery" ,ghc-mockery)))
(home-page "http://hspec.github.io/")
(synopsis "Automatically discover and run Hspec tests")
(description
"Automatically discover and run Hspec tests . <http://hspec.github.io/hspec-discover.html>")
(license license:expat)))
(define-public ghc-clay
(package
(name "ghc-clay")
(version "0.13.3")
(source
(origin
(method url-fetch)
(uri (string-append
"https://hackage.haskell.org/package/clay/clay-"
version
".tar.gz"))
(sha256
(base32 "192lsbyj6azjs2ygpx4i47fyr8zfmvwcas8mia07ndqglk2c9csx"))))
(build-system haskell-build-system)
(native-inputs
`(("ghc-hspec" ,ghc-hspec) ("ghc-hspec-discover" ,ghc-hspec-discover)))
(home-page "http://fvisser.nl/clay")
(synopsis "CSS preprocessor as embedded Haskell.")
(description
"Clay is a CSS preprocessor like LESS and Sass, but implemented as an embedded domain specific language (EDSL) in Haskell. This means that all CSS selectors and style rules are first class Haskell functions, which makes reuse and composability easy. . The project is described on <http://fvisser.nl/clay>. . The API documentation can be found in the top level module \"Clay\".")
(license license:bsd-3)))
(define-public blog-rekahsoft-ca
(package
(name "blog-rekahsoft-ca")
(version "0.0.0-0")
(source (origin
(method git-fetch)
(uri (git-reference
(url "https://git.rekahsoft.ca/rekahsoft/blog-rekahsoft-ca.git")
(commit version)))
(file-name (git-file-name name version))
(sha256
(base32
"0kjb6gf7fbydw8g065kq350swgpmk02lk64dvhn3fwwgqrdgy6hh"))))
(build-system haskell-build-system)
(inputs `(("ghc-hakyll" ,ghc-hakyll)
("ghc-clay" ,ghc-clay)))
(home-page "http://git.rekahsoft.ca/rekahsoft/blog-rekahsoft-ca")
(synopsis "Code, templates and content for my Hakyll powered blog at blog.rekahsoft.ca")
(description
"The code, templates and content for my Hakyll powered blog at blog.rekahsoft.ca.")
(license license:gpl3)))
;; (define-public blog-rekahsoft-ca-site
;; (package
;; (inherit blog-rekahsoft-ca)
;; (name "blog-rekahsoft-ca-site")
;; (build-system haskell-build-system)
;; (native-inputs `(("cabal-install" ,cabal-install)))
;; (inputs `(("ghc-hakyll" ,ghc-hakyll)
;; ("ghc-clay" ,ghc-clay)))
;; (home-page "http://git.rekahsoft.ca/rekahsoft/blog-rekahsoft-ca")
;; (synopsis "Code, templates and content for my Hakyll powered blog at blog.rekahsoft.ca")
;; (description
;; "The code, templates and content for my Hakyll powered blog at blog.rekahsoft.ca.")
;; (license license:gpl3)))
blog-rekahsoft-ca

40
manifest.scm Normal file
View File

@ -0,0 +1,40 @@
;; (C) Copyright Collin J. Doering 2021
;;
;; This program 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.
;;
;; This program 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 this program. If not, see <http://www.gnu.org/licenses/>.
;; File: manifest.scm
;; Author: Collin J. Doering <collin.doering@rekahsoft.ca>
;; Date: Nov 21, 2021
(use-modules
(gnu packages)
(guix packages)
(guix profiles)
(guix transformations))
(load "blog-rekahsoft-ca.scm")
(define dev-transform
(options->transformation
`((with-source . ,(string-append "blog-rekahsoft-ca=" (getcwd))))))
(concatenate-manifests
(list
(packages->manifest
`(,(dev-transform blog-rekahsoft-ca)))
(specifications->manifest
`("bash"
"coreutils"
"ghc"
"glibc-utf8-locales"))))

8
site
View File

@ -1,4 +1,4 @@
#!/bin/bash
#!/bin/sh
function run_site_only() {
[ "$SITE_ONLY" == "true" ]
@ -38,7 +38,7 @@ case "$1" in
;;
gencss)
shift
stack exec gencss -- "$@"
gencss -- "$@"
;;
# Override of hakyll site commands
-h|--help)
@ -77,7 +77,7 @@ EOF
run_override_only && exit
# Only run hakyll site --help command if -- site only
run_site_only && stack exec blog-rekahsoft-ca -- --help | sed 's/\(Usage: \)blog-rekahsoft-ca/\1.\/site -/g'
run_site_only && blog-rekahsoft-ca -- --help | sed 's/\(Usage: \)blog-rekahsoft-ca/\1.\/site -/g'
;;
build)
run_override_only || ! run_site_only && stack build
@ -104,6 +104,6 @@ EOF
popd > /dev/null
;;&
*)
stack exec blog-rekahsoft-ca -- "$@"
blog-rekahsoft-ca -- "$@"
;;
esac

21
src/site.hs
View File

@ -138,16 +138,17 @@ main = do
clayDeps <- makePatternDependency $ fromList clayIds
manifestDeps <- makePatternDependency $ fromList manifestIds
rulesExtraDependencies [clayDeps] $ create ["default.css"] $ do
route idRoute
compile $ makeItem =<< (unsafeCompiler $ do
(_, hout, _, ph) <- createProcess $ shell "stack build blog-rekahsoft-ca:gencss"
exitCode <- waitForProcess ph
if exitCode == ExitSuccess
then readProcess "stack" ["exec", "gencss", "--", "compact"] ""
else case hout of
Nothing -> fail "Error running 'stack build blog-rekahsoft-ca:gencss'"
Just hout' -> hGetContents hout' >>= fail)
-- TODO: this needs to be re-thought out when guix is used instead of stack
-- rulesExtraDependencies [clayDeps] $ create ["default.css"] $ do
-- route idRoute
-- compile $ makeItem =<< (unsafeCompiler $ do
-- (_, hout, _, ph) <- createProcess $ shell "stack build blog-rekahsoft-ca:gencss"
-- exitCode <- waitForProcess ph
-- if exitCode == ExitSuccess
-- then readProcess "stack" ["exec", "gencss", "--", "compact"] ""
-- else case hout of
-- Nothing -> fail "Error running 'stack build blog-rekahsoft-ca:gencss'"
-- Just hout' -> hGetContents hout' >>= fail)
rulesExtraDependencies [manifestDeps] $ create ["manifest.appcache"] $ do
route idRoute