diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-09-03 10:39:57 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-09-03 10:41:55 +0200 |
| commit | ff68088eaabde73d7f107763f38034ce38800339 (patch) | |
| tree | 0ea87d25a935de4a4321e289c5fdc91976814dba | |
| parent | dc198e8e3bc0b2780298e9c8ad64a8d0f8765676 (diff) | |
| download | guix-ff68088eaabde73d7f107763f38034ce38800339.tar.gz | |
gnu: guile-syntax-highlight: Move Gitile variant to guile-xyz.scm.
Fixes a regression introduced in 5dac09e263d566ccf99776df97c47eed0d30c172 whereby version-control.scm would inherit from GUILE-SYNTAX-HIGHLIGHT, which is in guile-xyz.scm, thereby leading to unbound variable errors. Reported by vivien on #guix. * gnu/packages/version-control.scm (guile-syntax-highlight-for-gitile): Move to... * gnu/packages/guile-xyz.scm (guile-syntax-highlight-for-gitile): ... here. New variable. Add 'properties' field.
| -rw-r--r-- | gnu/packages/guile-xyz.scm | 23 | ||||
| -rw-r--r-- | gnu/packages/version-control.scm | 22 |
2 files changed, 23 insertions, 22 deletions
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 4131d57626..457701a436 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -755,6 +755,29 @@ HTML (via SXML) or any other format for rendering.") (home-page "https://dthompson.us/projects/guile-syntax-highlight.html") (license license:lgpl3+))) +;; gitile requires a more recent version than the latest release. +(define-public guile-syntax-highlight-for-gitile + (let ((commit "897fa5156ff41588e0d281eb00e4e94de63ccd8a") + (revision "0")) + (package + (inherit guile-syntax-highlight) + (version (git-version "0.1" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://git.dthompson.us/guile-syntax-highlight.git") + (commit commit))) + (file-name (git-file-name "guile-syntax-highlight" version)) + (sha256 + (base32 + "18zlg4mkgd3swgv2ggfz91ivnnzc0zhvc9ybgrxg1y762va9hyvj")))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("texinfo" ,texinfo) + ,@(package-native-inputs guile-syntax-highlight))) + (properties '((hidden? . #t)))))) + (define-public guile2.2-syntax-highlight (package (inherit guile-syntax-highlight) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 5f6379dbcd..8a6a8d8d60 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1527,28 +1527,6 @@ also walk each side of a merge and test those changes individually.") control to Git repositories.") (license license:gpl2))) -;; gitile requires a more recent version than the latest release. -(define guile-syntax-highlight-for-gitile - (let ((commit "897fa5156ff41588e0d281eb00e4e94de63ccd8a") - (revision "0")) - (package - (inherit guile-syntax-highlight) - (version (git-version "0.1" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://git.dthompson.us/guile-syntax-highlight.git") - (commit commit))) - (file-name (git-file-name "guile-syntax-highlight" version)) - (sha256 - (base32 - "18zlg4mkgd3swgv2ggfz91ivnnzc0zhvc9ybgrxg1y762va9hyvj")))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("texinfo" ,texinfo) - ,@(package-native-inputs guile-syntax-highlight)))))) - (define-public gitile (package (name "gitile") |