diff options
| author | David Thompson <dthompson2@worcester.edu> | 2022-10-05 11:14:45 -0400 |
|---|---|---|
| committer | David Thompson <dthompson2@worcester.edu> | 2022-10-05 11:14:45 -0400 |
| commit | da6ec95b5c7788f329474f7542cbcd84f9710150 (patch) | |
| tree | 9dd3e31e3309dc535d2b3f5f9d7dc154fe8f7d8c | |
| parent | 65bd6b34ab4b672d083f27fb176024cb3ffcfa93 (diff) | |
guix: Switch to manifest.scm and use special guile-syntax-hightlight.
| -rw-r--r-- | manifest.scm (renamed from guix.scm) | 33 |
1 files changed, 26 insertions, 7 deletions
@@ -2,12 +2,34 @@ (gnu packages base) (gnu packages guile) (gnu packages guile-xyz) + (gnu packages pkg-config) (gnu packages rsync) + (gnu packages texinfo) (guix git-download) (guix packages) (guix profiles) (guix utils)) +(define guile-syntax-highlight* + (let ((commit "d68ccf7c2ae9516ca2ddacc5f65e2277038b23f6")) + (package + (inherit guile-syntax-highlight) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.dthompson.us/guile-syntax-highlight.git") + (commit commit))) + (sha256 + (base32 + "0sbxy7mn6kzx83ml4x530r4g7b22jk1kpp766mcgm35zw7mn1qi9")))) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'bootstrap + (lambda _ (invoke "sh" "bootstrap")))))) + (inputs (list guile-3.0-latest)) + (native-inputs (list autoconf automake pkg-config))))) + (define haunt* (let ((commit "63afd408c890aec7d62c754ae1399c901ff2a794")) (package @@ -21,12 +43,9 @@ (base32 "0mf8b9w7ky8grsy4cq9573ggg4gm465fgvk8dnk7kxma810fvxmx")))) (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ,@(package-native-inputs haunt))) + (list automake autoconf pkg-config texinfo)) (inputs - (cons `("rsync" ,rsync) - (package-inputs haunt))) + (list rsync guile-3.0-latest)) (arguments (substitute-keyword-arguments (package-arguments haunt) ((#:phases phases) @@ -36,6 +55,6 @@ (invoke "sh" "bootstrap")))))))))) (packages->manifest - (list guile-3.0 - guile-syntax-highlight + (list guile-3.0-latest + guile-syntax-highlight* haunt*)) |