diff options
Diffstat (limited to 'crn/packages/lua-xyz.scm')
| -rw-r--r-- | crn/packages/lua-xyz.scm | 140 |
1 files changed, 53 insertions, 87 deletions
diff --git a/crn/packages/lua-xyz.scm b/crn/packages/lua-xyz.scm index 9d5b2a3..286ecd3 100644 --- a/crn/packages/lua-xyz.scm +++ b/crn/packages/lua-xyz.scm @@ -1,94 +1,60 @@ (define-module (crn packages lua-xyz)) (use-modules (guix git) - (guix git-download) - (guix gexp) - (guix download) - (guix packages) - (guix licenses) - (guix build-system copy) - (guix build-system cmake) - (guix utils) - (gnu packages) - (gnu packages lua)) + (guix git-download) + (guix gexp) + (guix download) + (guix packages) + (guix licenses) + (guix build-system cmake) + (guix utils) + (gnu packages) + (gnu packages bash) + (gnu packages glib) + (gnu packages linux) + (gnu packages lua) + (gnu packages pkg-config) + (gnu packages python-xyz) + (gnu packages valgrind) + (gnu packages xorg) + (gnu packages web)) (define-public luastatus -(package - (name "luastatus") - (version "0.6.0") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/shdown/luastatus") - (commit "8d01bdf"))) - (sha256 - (base32 "0bwmdwqwsvr4jalcm4hpdwy1wsrbrl414ig69lwai9h2ran6ni3h")))) - (build-system cmake-build-system) - (native-inputs (specifications->packages (list "lua" "pkg-config"))) - (inputs (specifications->packages - (list "alsa-lib" - "xcb-util" - "yajl" - "glib" - "libnl" - "eudev" - "libx11" - "libxcb" - "xcb-util-wm" - "python-docutils"))) - (home-page "https://github.com/shdown/luastatus") - (synopsis "luastatus is a universal status bar content generator.") - (description "luastatus is a universal status bar content generator. It allows you to configure the way the data from event sources is processed and shown, with Lua.") - (license gpl3) - (arguments - (list #:phases - #~(modify-phases %standard-phases - (delete 'check)))))) - -(define-public digestif (package - (name "digestif") - (version "0.5.1") + (name "luastatus") + (version "0.6.0") (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/astoff/digestif") - (commit "v0.5.1"))) - (sha256 - (base32 "1jb8h7yks8bp74jpq85sz69d2k69vhp6gliajz8ximl3hbhdq17i")))) - (build-system copy-build-system) - (inputs (specifications->packages - (list "lua@5.3.5" - "lua-filesystem" - "lua-lpeg"))) - (home-page "https://github.com/astoff/digestif") - (synopsis "A language server for TeX and friends") - (description "Digestif is a code analyzer, and a language server, for LaTeX, ConTeXt et caterva. It provides context-sensitive completion, documentation, code navigation, and related functionality to any text editor that speaks the LSP protocol.") - (license gpl3) + (method git-fetch) + (uri (git-reference + (url "https://github.com/shdown/luastatus") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1xyh220par0f8l8ylh6jx0qzskafwy1hi0v1dw22qs0g6nkbj4y2")))) + (build-system cmake-build-system) + (native-inputs (list lua + pkg-config + python-docutils + valgrind)) + (inputs (list alsa-lib + bash + xcb-util + yajl + glib + libnl + eudev + libx11 + libxcb + xcb-util-wm)) (arguments - `( - #:install-plan - `(("bin/digestif" "bin/") - ("digestif/" ,(string-append "share/lua/" ,(version-major+minor (package-version lua)) "/digestif")) - ("data/" "share/digestif")) - #:phases - (modify-phases %standard-phases - (add-after 'install 'wrap - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((digestif (assoc-ref outputs "out")) - (lua (assoc-ref inputs "lua")) - (lua-lpeg (assoc-ref inputs "lua-lpeg")) - (lua-filesystem (assoc-ref inputs "lua-filesystem")) - (lua-version ,(version-major+minor (package-version lua)))) - (wrap-program (string-append digestif "/bin/digestif") - `("LUA_PATH" ";" suffix - (,(format #f "~a/share/lua/~a/?.lua" digestif lua-version))) - `("DIGESTIF_DATA" suffix (,(format #f "~a/share/digestif" digestif))) - `("LUA_PATH" ";" suffix - (,(format #f "~a/share/lua/~a/?.lua" lua-lpeg lua-version))) - `("LUA_CPATH" ";" suffix - (,(format #f "~a/lib/lua/~a/?.so" lua-lpeg lua-version))) - `("LUA_PATH" ";" suffix - (,(format #f "~a/share/lua/~a/?.lua" lua-filesystem lua-version))) - `("LUA_CPATH" ";" suffix - (,(format #f "~a/lib/lua/~a/?.so" lua-filesystem lua-version)))) - #t)))))))) + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "../source/tests/misc.sh" ".") + (invoke "../source/tests/torture.sh" "."))))))) + (home-page "https://github.com/shdown/luastatus") + (synopsis "Universal status bar content generator") + (description "Luastatus is a universal status bar content generator. +It allows you to configure the way the data from event sources is +processed and shown, with Lua.") + (license gpl3))) |