diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-12-13 17:18:24 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-12-13 17:48:25 +0100 |
| commit | 8394619baceb118df92e355377fd543bb1aa501a (patch) | |
| tree | 504f07c2a9f88596a305b59ef45f941062426a52 /gnu/packages/lua.scm | |
| parent | aca2defe0172868295941fd9f0e97886f6e9b2d4 (diff) | |
gnu: Simplify package inputs.
This commit was obtained by running:
./pre-inst-env guix style
without any additional argument.
Diffstat (limited to 'gnu/packages/lua.scm')
| -rw-r--r-- | gnu/packages/lua.scm | 84 |
1 files changed, 39 insertions, 45 deletions
diff --git a/gnu/packages/lua.scm b/gnu/packages/lua.scm index 22dc7c6bc47..85def0d8f66 100644 --- a/gnu/packages/lua.scm +++ b/gnu/packages/lua.scm | |||
| @@ -73,7 +73,7 @@ | |||
| 73 | (patches (search-patches "lua-pkgconfig.patch" | 73 | (patches (search-patches "lua-pkgconfig.patch" |
| 74 | "lua-liblua-so.patch")))) | 74 | "lua-liblua-so.patch")))) |
| 75 | (build-system gnu-build-system) | 75 | (build-system gnu-build-system) |
| 76 | (inputs `(("readline" ,readline))) | 76 | (inputs (list readline)) |
| 77 | (arguments | 77 | (arguments |
| 78 | `(#:modules ((guix build gnu-build-system) | 78 | `(#:modules ((guix build gnu-build-system) |
| 79 | (guix build utils) | 79 | (guix build utils) |
| @@ -229,8 +229,7 @@ some projects."))) | |||
| 229 | (invoke "lua" "tests/test.lua") | 229 | (invoke "lua" "tests/test.lua") |
| 230 | (invoke "lua" "tests/test-lom.lua")))))) | 230 | (invoke "lua" "tests/test-lom.lua")))))) |
| 231 | (inputs | 231 | (inputs |
| 232 | `(("lua" ,lua) | 232 | (list lua expat)) |
| 233 | ("expat" ,expat))) | ||
| 234 | (home-page "https://matthewwild.co.uk/projects/luaexpat/") | 233 | (home-page "https://matthewwild.co.uk/projects/luaexpat/") |
| 235 | (synopsis "SAX XML parser based on the Expat library") | 234 | (synopsis "SAX XML parser based on the Expat library") |
| 236 | (description "LuaExpat is a SAX XML parser based on the Expat library.") | 235 | (description "LuaExpat is a SAX XML parser based on the Expat library.") |
| @@ -273,7 +272,7 @@ some projects."))) | |||
| 273 | (invoke "lua" "test/testsrvr.lua")) | 272 | (invoke "lua" "test/testsrvr.lua")) |
| 274 | (invoke "lua" "test/testclnt.lua")))))) | 273 | (invoke "lua" "test/testclnt.lua")))))) |
| 275 | (inputs | 274 | (inputs |
| 276 | `(("lua" ,lua))) | 275 | (list lua)) |
| 277 | (home-page "http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/") | 276 | (home-page "http://www.tecgraf.puc-rio.br/~diego/professional/luasocket/") |
| 278 | (synopsis "Socket library for Lua") | 277 | (synopsis "Socket library for Lua") |
| 279 | (description "LuaSocket is a Lua extension library that is composed by two | 278 | (description "LuaSocket is a Lua extension library that is composed by two |
| @@ -323,7 +322,7 @@ handy.") | |||
| 323 | (modify-phases %standard-phases | 322 | (modify-phases %standard-phases |
| 324 | (delete 'configure)))) | 323 | (delete 'configure)))) |
| 325 | (inputs | 324 | (inputs |
| 326 | `(("lua" ,lua))) | 325 | (list lua)) |
| 327 | (home-page "https://keplerproject.github.io/luafilesystem/index.html") | 326 | (home-page "https://keplerproject.github.io/luafilesystem/index.html") |
| 328 | (synopsis "File system library for Lua") | 327 | (synopsis "File system library for Lua") |
| 329 | (description "LuaFileSystem is a Lua library developed to complement the | 328 | (description "LuaFileSystem is a Lua library developed to complement the |
| @@ -379,8 +378,7 @@ directory structure and file attributes.") | |||
| 379 | (find-files "." "^[0-9].*\\.lua$")))) | 378 | (find-files "." "^[0-9].*\\.lua$")))) |
| 380 | #t))))) | 379 | #t))))) |
| 381 | (inputs | 380 | (inputs |
| 382 | `(("lua" ,lua) | 381 | (list lua openssl)) |
| 383 | ("openssl" ,openssl))) | ||
| 384 | (home-page "https://25thandclement.com/~william/projects/luaossl.html") | 382 | (home-page "https://25thandclement.com/~william/projects/luaossl.html") |
| 385 | (synopsis "OpenSSL bindings for Lua") | 383 | (synopsis "OpenSSL bindings for Lua") |
| 386 | (description "The luaossl extension module for Lua provides comprehensive, | 384 | (description "The luaossl extension module for Lua provides comprehensive, |
| @@ -427,8 +425,7 @@ binds OpenSSL's bignum, message digest, HMAC, cipher, and CSPRNG interfaces.") | |||
| 427 | (modify-phases %standard-phases | 425 | (modify-phases %standard-phases |
| 428 | (delete 'configure)))) | 426 | (delete 'configure)))) |
| 429 | (inputs | 427 | (inputs |
| 430 | `(("lua" ,lua) | 428 | (list lua openssl)) |
| 431 | ("openssl" ,openssl))) | ||
| 432 | (propagated-inputs | 429 | (propagated-inputs |
| 433 | `(("lua-socket" | 430 | `(("lua-socket" |
| 434 | ,(make-lua-socket | 431 | ,(make-lua-socket |
| @@ -531,12 +528,11 @@ secure session between the peers.") | |||
| 531 | 528 | ||
| 532 | (apply invoke "make" "check" make-flags))))))) | 529 | (apply invoke "make" "check" make-flags))))))) |
| 533 | (native-inputs | 530 | (native-inputs |
| 534 | `(("m4" ,m4))) | 531 | (list m4)) |
| 535 | (inputs | 532 | (inputs |
| 536 | `(("lua" ,lua) | 533 | (list lua openssl)) |
| 537 | ("openssl" ,openssl))) | ||
| 538 | (propagated-inputs | 534 | (propagated-inputs |
| 539 | `(("lua-ossl" ,lua-ossl))) | 535 | (list lua-ossl)) |
| 540 | (home-page "https://25thandclement.com/~william/projects/cqueues.html") | 536 | (home-page "https://25thandclement.com/~william/projects/cqueues.html") |
| 541 | (synopsis "Event loop for Lua using continuation queues") | 537 | (synopsis "Event loop for Lua using continuation queues") |
| 542 | (description "The cqueues extension module for Lua implements an event loop | 538 | (description "The cqueues extension module for Lua implements an event loop |
| @@ -568,9 +564,9 @@ to be non-intrusive, composable, and embeddable within existing applications.") | |||
| 568 | (base32 "0qc2d1riyr4b5a0gnsmdw2lz5pw65s4ac60hc34w3mmk9l6yg6nl")))) | 564 | (base32 "0qc2d1riyr4b5a0gnsmdw2lz5pw65s4ac60hc34w3mmk9l6yg6nl")))) |
| 569 | (build-system trivial-build-system) | 565 | (build-system trivial-build-system) |
| 570 | (inputs | 566 | (inputs |
| 571 | `(("lua" ,lua))) | 567 | (list lua)) |
| 572 | (propagated-inputs | 568 | (propagated-inputs |
| 573 | `(("lua-filesystem" ,lua-filesystem))) | 569 | (list lua-filesystem)) |
| 574 | (arguments | 570 | (arguments |
| 575 | `(#:modules ((guix build utils)) | 571 | `(#:modules ((guix build utils)) |
| 576 | #:builder | 572 | #:builder |
| @@ -608,9 +604,9 @@ standard libraries.") | |||
| 608 | (base32 "1h0cf7bp4am54r0j8lhjs2l1c7q5vz74ba0jvw9qdbaqimls46g8")))) | 604 | (base32 "1h0cf7bp4am54r0j8lhjs2l1c7q5vz74ba0jvw9qdbaqimls46g8")))) |
| 609 | (build-system gnu-build-system) | 605 | (build-system gnu-build-system) |
| 610 | (inputs | 606 | (inputs |
| 611 | `(("lua" ,lua))) | 607 | (list lua)) |
| 612 | (propagated-inputs | 608 | (propagated-inputs |
| 613 | `(("lua-penlight" ,lua-penlight))) | 609 | (list lua-penlight)) |
| 614 | (arguments | 610 | (arguments |
| 615 | `(#:tests? #f ;tests must run after installation. | 611 | `(#:tests? #f ;tests must run after installation. |
| 616 | #:phases | 612 | #:phases |
| @@ -698,8 +694,8 @@ describing the commented declarations and functions.") | |||
| 698 | (setenv "DISPLAY" ":1") | 694 | (setenv "DISPLAY" ":1") |
| 699 | #t))))) | 695 | #t))))) |
| 700 | (native-inputs | 696 | (native-inputs |
| 701 | `(("dbus" ,dbus) ;tests use 'dbus-run-session' | 697 | (list dbus ;tests use 'dbus-run-session' |
| 702 | ("pkg-config" ,pkg-config))) | 698 | pkg-config)) |
| 703 | (inputs | 699 | (inputs |
| 704 | `(("cairo" ,cairo) | 700 | `(("cairo" ,cairo) |
| 705 | ("glib" ,glib) | 701 | ("glib" ,glib) |
| @@ -752,7 +748,7 @@ Notable examples are GTK+, GStreamer and Webkit.") | |||
| 752 | (string-append out "/share/lua/" lua-version)) | 748 | (string-append out "/share/lua/" lua-version)) |
| 753 | #t)))) | 749 | #t)))) |
| 754 | #:test-target "test")) | 750 | #:test-target "test")) |
| 755 | (inputs `(("lua" ,lua))) | 751 | (inputs (list lua)) |
| 756 | (synopsis "Pattern-matching library for Lua") | 752 | (synopsis "Pattern-matching library for Lua") |
| 757 | (description | 753 | (description |
| 758 | "LPeg is a pattern-matching library for Lua, based on Parsing Expression | 754 | "LPeg is a pattern-matching library for Lua, based on Parsing Expression |
| @@ -804,8 +800,7 @@ Grammars (PEGs).") | |||
| 804 | (or (getenv "CPATH") ""))) | 800 | (or (getenv "CPATH") ""))) |
| 805 | #t))))) | 801 | #t))))) |
| 806 | (inputs | 802 | (inputs |
| 807 | `(("lua" ,lua) | 803 | (list lua libuv)) |
| 808 | ("libuv" ,libuv))) | ||
| 809 | (native-inputs | 804 | (native-inputs |
| 810 | `(("lua-compat" | 805 | `(("lua-compat" |
| 811 | ,(origin | 806 | ,(origin |
| @@ -857,7 +852,7 @@ Grammars (PEGs).") | |||
| 857 | #:phases | 852 | #:phases |
| 858 | (modify-phases %standard-phases | 853 | (modify-phases %standard-phases |
| 859 | (delete 'configure)))) | 854 | (delete 'configure)))) |
| 860 | (inputs `(("lua" ,lua))) | 855 | (inputs (list lua)) |
| 861 | (home-page "https://bitop.luajit.org/index.html") | 856 | (home-page "https://bitop.luajit.org/index.html") |
| 862 | (synopsis "Bitwise operations on numbers for Lua") | 857 | (synopsis "Bitwise operations on numbers for Lua") |
| 863 | (description | 858 | (description |
| @@ -918,8 +913,7 @@ on numbers.") | |||
| 918 | (chdir "./runner") | 913 | (chdir "./runner") |
| 919 | (invoke "./test_runner"))))))) | 914 | (invoke "./test_runner"))))))) |
| 920 | (native-inputs | 915 | (native-inputs |
| 921 | `(("lua" ,lua) | 916 | (list lua pkg-config)) |
| 922 | ("pkg-config" ,pkg-config))) | ||
| 923 | (home-page "https://github.com/jeremyong/Selene") | 917 | (home-page "https://github.com/jeremyong/Selene") |
| 924 | (synopsis "Lua C++11 bindings") | 918 | (synopsis "Lua C++11 bindings") |
| 925 | (description | 919 | (description |
| @@ -1133,26 +1127,26 @@ shell command executions.") | |||
| 1133 | "-Denable_manpages=false" | 1127 | "-Denable_manpages=false" |
| 1134 | "-Dversion_suffix=-guix1"))) | 1128 | "-Dversion_suffix=-guix1"))) |
| 1135 | (native-inputs | 1129 | (native-inputs |
| 1136 | `(("gcc" ,gcc-10) ; gcc-7 is too old for our C++17 needs | 1130 | (list gcc-10 ; gcc-7 is too old for our C++17 needs |
| 1137 | ("luajit-lua52-openresty" ,luajit-lua52-openresty) | 1131 | luajit-lua52-openresty |
| 1138 | ("pkg-config" ,pkg-config) | 1132 | pkg-config |
| 1139 | ("re2c" ,re2c) | 1133 | re2c |
| 1140 | ("xxd" ,xxd))) | 1134 | xxd)) |
| 1141 | (inputs | 1135 | (inputs |
| 1142 | `(("boost" ,boost) | 1136 | (list boost |
| 1143 | ("boost-static" ,boost-static) | 1137 | boost-static |
| 1144 | ("fmt" ,fmt-7) | 1138 | fmt-7 |
| 1145 | ;; LuaJIT has a 2GiB addressing limit[1] that has been fixed on OpenResty | 1139 | ;; LuaJIT has a 2GiB addressing limit[1] that has been fixed on OpenResty |
| 1146 | ;; fork. Emilua is severely affected by this limit, so the upstream package | 1140 | ;; fork. Emilua is severely affected by this limit, so the upstream package |
| 1147 | ;; is avoided. Emilua also depends on the -DLUAJIT_ENABLE_LUA52COMPAT | 1141 | ;; is avoided. Emilua also depends on the -DLUAJIT_ENABLE_LUA52COMPAT |
| 1148 | ;; configure flag[2] for some features to work (e.g. __pairs on HTTP | 1142 | ;; configure flag[2] for some features to work (e.g. __pairs on HTTP |
| 1149 | ;; headers). | 1143 | ;; headers). |
| 1150 | ;; | 1144 | ;; |
| 1151 | ;; [1] <http://hacksoflife.blogspot.com/2012/12/integrating-luajit-with-x-plane-64-bit.html> | 1145 | ;; [1] <http://hacksoflife.blogspot.com/2012/12/integrating-luajit-with-x-plane-64-bit.html> |
| 1152 | ;; [2] <http://luajit.org/extensions.html#lua52> | 1146 | ;; [2] <http://luajit.org/extensions.html#lua52> |
| 1153 | ("luajit-lua52-openresty" ,luajit-lua52-openresty) | 1147 | luajit-lua52-openresty |
| 1154 | ("ncurses" ,ncurses) | 1148 | ncurses |
| 1155 | ("openssl" ,openssl))) | 1149 | openssl)) |
| 1156 | (native-search-paths | 1150 | (native-search-paths |
| 1157 | (list | 1151 | (list |
| 1158 | (search-path-specification | 1152 | (search-path-specification |
| @@ -1196,7 +1190,7 @@ enabled.") | |||
| 1196 | (delete 'check) | 1190 | (delete 'check) |
| 1197 | (add-after 'install 'check | 1191 | (add-after 'install 'check |
| 1198 | (assoc-ref %standard-phases 'check))))) | 1192 | (assoc-ref %standard-phases 'check))))) |
| 1199 | (inputs `(("lua" ,lua))) | 1193 | (inputs (list lua)) |
| 1200 | (home-page "https://fennel-lang.org/") | 1194 | (home-page "https://fennel-lang.org/") |
| 1201 | (synopsis "Lisp that compiles to Lua") | 1195 | (synopsis "Lisp that compiles to Lua") |
| 1202 | (description | 1196 | (description |
