diff options
author | Will Dietz <w@wdtz.org> | 2019-05-10 16:56:58 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-10 16:56:58 -0500 |
commit | d7ff576529f65687d19e347c0a55c3cd5d3962b6 (patch) | |
tree | 0da33205949248c15bccee1836edf42695caf554 | |
parent | 57fefacf702400c19925495464800cb4b51f9d42 (diff) | |
parent | 403ce6ae4d7d3b55c24b6ccc5238b6ba57d9838e (diff) |
Merge pull request #60343 from dtzWill/fix/luarocks-nix-formatting-and-awesome-doc-goodness
luarocks-nix,luaPackages: formatting and additions; awesome: docs!
-rw-r--r-- | maintainers/scripts/luarocks-packages.csv | 2 | ||||
-rwxr-xr-x | maintainers/scripts/update-luarocks-packages | 24 | ||||
-rw-r--r-- | pkgs/applications/window-managers/awesome/default.nix | 6 | ||||
-rw-r--r-- | pkgs/development/lua-modules/generated-packages.nix | 478 | ||||
-rw-r--r-- | pkgs/development/tools/misc/luarocks/luarocks-nix.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
6 files changed, 282 insertions, 234 deletions
diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index c51c663a541..7074a650e06 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -5,6 +5,7 @@ basexx, dkjson fifo inspect +ldoc lgi lpeg_patterns lpty @@ -22,6 +23,7 @@ luaevent, luacheck luaffi,,http://luarocks.org/dev, luuid, +markdown, penlight, rapidjson, say, diff --git a/maintainers/scripts/update-luarocks-packages b/maintainers/scripts/update-luarocks-packages index aee74dae10c..e7ab61b1a9c 100755 --- a/maintainers/scripts/update-luarocks-packages +++ b/maintainers/scripts/update-luarocks-packages @@ -76,11 +76,7 @@ FOOTER=" function convert_pkg () { nix_pkg_name="$1" lua_pkg_name="$2" - server="" - if [ ! -z "$3" ]; then - server=" --server=$3" - fi - + server="${3:+--server=$3}" version="${4:-}" echo "looking at $lua_pkg_name (version $version) from server [$server]" >&2 @@ -101,15 +97,15 @@ echo "$HEADER" | tee "$TMP_FILE" # name,server,version while IFS=, read -r nix_pkg_name lua_pkg_name server version do - if [ "${nix_pkg_name:0:1}" == "#" ]; then - echo "Skipping comment ${nix_pkg_name}" >&2 - continue - fi - if [ -z "$lua_pkg_name" ]; then - echo "Using nix_name as lua_pkg_name" >&2 - lua_pkg_name="$nix_pkg_name" - fi - convert_pkg "$nix_pkg_name" "$lua_pkg_name" "$server" "$version" + if [ "${nix_pkg_name:0:1}" == "#" ]; then + echo "Skipping comment ${nix_pkg_name}" >&2 + continue + fi + if [ -z "$lua_pkg_name" ]; then + echo "Using nix_name as lua_pkg_name" >&2 + lua_pkg_name="$nix_pkg_name" + fi + convert_pkg "$nix_pkg_name" "$lua_pkg_name" "$server" "$version" done < "$CSV_FILE" # close the set diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index bbe514144a1..58b80aae0cf 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -5,6 +5,7 @@ , xmlto, docbook_xml_dtd_45, docbook_xsl, findXMLCatalogs , libxkbcommon, xcbutilxrm, hicolor-icon-theme , asciidoctor +, fontsConf }: with luaPackages; stdenv.mkDerivation rec { @@ -27,8 +28,13 @@ with luaPackages; stdenv.mkDerivation rec { xmlto docbook_xml_dtd_45 docbook_xsl findXMLCatalogs asciidoctor + ldoc ]; + outputs = [ "out" "doc" ]; + + FONTCONFIG_FILE = toString fontsConf; + propagatedUserEnvPkgs = [ hicolor-icon-theme ]; buildInputs = [ cairo librsvg dbus gdk_pixbuf gobject-introspection git lgi libpthreadstubs libstartup_notification diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index c8fc051f7a9..a1f7a2096e5 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -1,7 +1,7 @@ /* pkgs/development/lua-modules/generated-packages.nix is an auto-generated file -- DO NOT EDIT! Regenerate it with: -nixpkgs$ maintainers/scripts/update-luarocks-packages pkgs/development/lua-modules/generated-packages.nix +nixpkgs$ ./maintainers/scripts/update-luarocks-packages pkgs/development/lua-modules/generated-packages.nix These packages are manually refined in lua-overrides.nix */ @@ -15,16 +15,16 @@ ansicolors = buildLuarocksPackage { version = "1.0.2-3"; src = fetchurl { - url = https://luarocks.org/ansicolors-1.0.2-3.src.rock; - sha256 = "1mhmr090y5394x1j8p44ws17sdwixn5a0r4i052bkfgk3982cqfz"; + url = https://luarocks.org/ansicolors-1.0.2-3.src.rock; + sha256 = "1mhmr090y5394x1j8p44ws17sdwixn5a0r4i052bkfgk3982cqfz"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "https://github.com/kikito/ansicolors.lua"; - description="Library for color Manipulation."; + description = "Library for color Manipulation."; license = { fullName = "MIT <http://opensource.org/licenses/MIT>"; }; @@ -35,16 +35,16 @@ argparse = buildLuarocksPackage { version = "0.6.0-1"; src = fetchurl { - url = https://luarocks.org/argparse-0.6.0-1.src.rock; - sha256 = "10ic5wppyghd1lmgwgl0lb40pv8z9fi9i87080axxg8wsr19y0p4"; + url = https://luarocks.org/argparse-0.6.0-1.src.rock; + sha256 = "10ic5wppyghd1lmgwgl0lb40pv8z9fi9i87080axxg8wsr19y0p4"; }; - disabled = ( luaOlder "5.1") || ( luaAtLeast "5.4"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.4" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "https://github.com/mpeterv/argparse"; - description="A feature-rich command-line argument parser"; + description = "A feature-rich command-line argument parser"; license = { fullName = "MIT"; }; @@ -52,19 +52,25 @@ argparse = buildLuarocksPackage { }; basexx = buildLuarocksPackage { pname = "basexx"; - version = "0.4.0-1"; + version = "0.4.1-1"; + + knownRockspec = (fetchurl { + url = https://luarocks.org/basexx-0.4.1-1.rockspec; + sha256 = "0kmydxm2wywl18cgj303apsx7hnfd68a9hx9yhq10fj7yfcxzv5f"; + }).outPath; src = fetchurl { - url = https://luarocks.org/basexx-0.4.0-1.src.rock; - sha256 = "1px8yrxg1qkk3kzdqj3siry742jdv4ysp2dmicxi15mkynqpjlzz"; + url = https://github.com/aiq/basexx/archive/v0.4.1.tar.gz; + sha256 = "1rnz6xixxqwy0q6y2hi14rfid4w47h69gfi0rnlq24fz8q2b0qpz"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "https://github.com/aiq/basexx"; - description="A base2, base16, base32, base64 and base85 library for Lua"; + description = "A base2, base16, base32, base64 and base85 library for Lua"; license = { fullName = "MIT"; }; @@ -75,16 +81,16 @@ dkjson = buildLuarocksPackage { version = "2.5-2"; src = fetchurl { - url = https://luarocks.org/dkjson-2.5-2.src.rock; - sha256 = "1qy9bzqnb9pf9d48hik4iq8h68aw3270kmax7mmpvvpw7kkyp483"; + url = https://luarocks.org/dkjson-2.5-2.src.rock; + sha256 = "1qy9bzqnb9pf9d48hik4iq8h68aw3270kmax7mmpvvpw7kkyp483"; }; - disabled = ( luaOlder "5.1") || ( luaAtLeast "5.4"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.4" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "http://dkolf.de/src/dkjson-lua.fsl/"; - description="David Kolf's JSON module for Lua"; + description = "David Kolf's JSON module for Lua"; license = { fullName = "MIT/X11"; }; @@ -95,16 +101,16 @@ fifo = buildLuarocksPackage { version = "0.2-0"; src = fetchurl { - url = https://luarocks.org/fifo-0.2-0.src.rock; - sha256 = "082c5g1m8brnsqj5gnjs65bm7z50l6b05cfwah14lqaqsr5a5pjk"; + url = https://luarocks.org/fifo-0.2-0.src.rock; + sha256 = "082c5g1m8brnsqj5gnjs65bm7z50l6b05cfwah14lqaqsr5a5pjk"; }; - - propagatedBuildInputs = [ lua ]; + + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "https://github.com/daurnimator/fifo.lua"; - description="A lua library/'class' that implements a FIFO"; + description = "A lua library/'class' that implements a FIFO"; license = { fullName = "MIT/X11"; }; @@ -115,36 +121,61 @@ inspect = buildLuarocksPackage { version = "3.1.1-0"; src = fetchurl { - url = https://luarocks.org/inspect-3.1.1-0.src.rock; - sha256 = "0k4g9ahql83l4r2bykfs6sacf9l1wdpisav2i0z55fyfcdv387za"; + url = https://luarocks.org/inspect-3.1.1-0.src.rock; + sha256 = "0k4g9ahql83l4r2bykfs6sacf9l1wdpisav2i0z55fyfcdv387za"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "https://github.com/kikito/inspect.lua"; - description="Lua table visualizer, ideal for debugging"; + description = "Lua table visualizer, ideal for debugging"; license = { fullName = "MIT <http://opensource.org/licenses/MIT>"; }; }; }; +ldoc = buildLuarocksPackage { + pname = "ldoc"; + version = "1.4.6-2"; + + knownRockspec = (fetchurl { + url = https://luarocks.org/ldoc-1.4.6-2.rockspec; + sha256 = "14yb0qihizby8ja0fa82vx72vk903mv6m7izn39mzfrgb8mha0pm"; + }).outPath; + + src = fetchurl { + url = http://stevedonovan.github.io/files/ldoc-1.4.6.zip; + sha256 = "1fvsmmjwk996ypzizcy565hj82bhj17vdb83ln6ff63mxr3zs1la"; + }; + + propagatedBuildInputs = [ penlight markdown ]; + buildType = "builtin"; + + meta = { + homepage = "http://stevedonovan.github.com/ldoc"; + description = "A Lua Documentation Tool"; + license = { + fullName = "MIT/X11"; + }; + }; +}; lgi = buildLuarocksPackage { pname = "lgi"; version = "0.9.2-1"; src = fetchurl { - url = https://luarocks.org/lgi-0.9.2-1.src.rock; - sha256 = "07ajc5pdavp785mdyy82n0w6d592n96g95cvq025d6i0bcm2cypa"; + url = https://luarocks.org/lgi-0.9.2-1.src.rock; + sha256 = "07ajc5pdavp785mdyy82n0w6d592n96g95cvq025d6i0bcm2cypa"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "make"; meta = { - homepage = "https://github.com/pavouk/lgi"; - description="Lua bindings to GObject libraries"; + homepage = "http://github.com/pavouk/lgi"; + description = "Lua bindings to GObject libraries"; license = { fullName = "MIT/X11"; }; @@ -155,16 +186,16 @@ lpeg_patterns = buildLuarocksPackage { version = "0.5-0"; src = fetchurl { - url = https://luarocks.org/lpeg_patterns-0.5-0.src.rock; - sha256 = "0mlw4nayrsdxrh98i26avz5i4170a9brciybw88kks496ra36v8f"; + url = https://luarocks.org/lpeg_patterns-0.5-0.src.rock; + sha256 = "0mlw4nayrsdxrh98i26avz5i4170a9brciybw88kks496ra36v8f"; }; - - propagatedBuildInputs = [ lua lpeg ]; + + propagatedBuildInputs = [ lua lpeg ]; buildType = "builtin"; meta = { homepage = "https://github.com/daurnimator/lpeg_patterns/archive/v0.5.zip"; - description="a collection of LPEG patterns"; + description = "a collection of LPEG patterns"; license = { fullName = "MIT"; }; @@ -175,16 +206,16 @@ lpty = buildLuarocksPackage { version = "1.2.2-1"; src = fetchurl { - url = https://luarocks.org/lpty-1.2.2-1.src.rock; - sha256 = "1vxvsjgjfirl6ranz6k4q4y2dnxqh72bndbk400if22x8lqbkxzm"; + url = https://luarocks.org/lpty-1.2.2-1.src.rock; + sha256 = "1vxvsjgjfirl6ranz6k4q4y2dnxqh72bndbk400if22x8lqbkxzm"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "make"; meta = { homepage = "http://www.tset.de/lpty/"; - description="A simple facility for lua to control other programs via PTYs."; + description = "A simple facility for lua to control other programs via PTYs."; license = { fullName = "MIT"; }; @@ -195,16 +226,16 @@ lrexlib-gnu = buildLuarocksPackage { version = "2.9.0-1"; src = fetchurl { - url = https://luarocks.org/lrexlib-gnu-2.9.0-1.src.rock; - sha256 = "036rda4rji1pbnbxk1nzjy5zmigdsiacqbzrbvciwq3lrxa2j5s2"; + url = https://luarocks.org/lrexlib-gnu-2.9.0-1.src.rock; + sha256 = "036rda4rji1pbnbxk1nzjy5zmigdsiacqbzrbvciwq3lrxa2j5s2"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { - homepage = "https://github.com/rrthomas/lrexlib"; - description="Regular expression library binding (GNU flavour)."; + homepage = "http://github.com/rrthomas/lrexlib"; + description = "Regular expression library binding (GNU flavour)."; license = { fullName = "MIT/X11"; }; @@ -215,16 +246,16 @@ lrexlib-posix = buildLuarocksPackage { version = "2.9.0-1"; src = fetchurl { - url = https://luarocks.org/lrexlib-posix-2.9.0-1.src.rock; - sha256 = "0ifpybf4m94g1nk70l0f5m45gph0rbp5wrxrl1hnw8ibv3mc1b1r"; + url = https://luarocks.org/lrexlib-posix-2.9.0-1.src.rock; + sha256 = "0ifpybf4m94g1nk70l0f5m45gph0rbp5wrxrl1hnw8ibv3mc1b1r"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { - homepage = "https://github.com/rrthomas/lrexlib"; - description="Regular expression library binding (POSIX flavour)."; + homepage = "http://github.com/rrthomas/lrexlib"; + description = "Regular expression library binding (POSIX flavour)."; license = { fullName = "MIT/X11"; }; @@ -235,16 +266,16 @@ ltermbox = buildLuarocksPackage { version = "0.2-1"; src = fetchurl { - url = https://luarocks.org/ltermbox-0.2-1.src.rock; - sha256 = "08jqlmmskbi1ml1i34dlmg6hxcs60nlm32dahpxhcrgjnfihmyn8"; + url = https://luarocks.org/ltermbox-0.2-1.src.rock; + sha256 = "08jqlmmskbi1ml1i34dlmg6hxcs60nlm32dahpxhcrgjnfihmyn8"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "http://code.google.com/p/termbox"; - description="A termbox library package"; + description = "A termbox library package"; license = { fullName = "New BSD License"; }; @@ -254,27 +285,26 @@ lua-cmsgpack = buildLuarocksPackage { pname = "lua-cmsgpack"; version = "0.4.0-0"; - knownRockspec = (fetchurl { - url = https://luarocks.org/lua-cmsgpack-0.4.0-0.rockspec; - sha256 = "10cvr6knx3qvjcw1q9v05f2qy607mai7lbq321nx682aa0n1fzin"; + knownRockspec = (fetchurl { + url = https://luarocks.org/lua-cmsgpack-0.4.0-0.rockspec; + sha256 = "10cvr6knx3qvjcw1q9v05f2qy607mai7lbq321nx682aa0n1fzin"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "git://github.com/antirez/lua-cmsgpack.git", - "rev": "57b1f90cf6cec46450e87289ed5a676165d31071", - "date": "2018-06-14T11:56:56+02:00", - "sha256": "0yiwl4p1zh9qid3ksc4n9fv5bwaa9vjb0vgwnkars204xmxdj8fj", - "fetchSubmodules": true -} - '') ["date"]) ; - - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "git://github.com/antirez/lua-cmsgpack.git", + "rev": "57b1f90cf6cec46450e87289ed5a676165d31071", + "date": "2018-06-14T11:56:56+02:00", + "sha256": "0yiwl4p1zh9qid3ksc4n9fv5bwaa9vjb0vgwnkars204xmxdj8fj", + "fetchSubmodules": true + } '') ["date"]) ; + + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { - homepage = "https://github.com/antirez/lua-cmsgpack"; - description="MessagePack C implementation and bindings for Lua 5.1/5.2/5.3"; + homepage = "http://github.com/antirez/lua-cmsgpack"; + description = "MessagePack C implementation and bindings for Lua 5.1/5.2/5.3"; license = { fullName = "Two-clause BSD"; }; @@ -285,16 +315,16 @@ lua_cliargs = buildLuarocksPackage { version = "3.0-2"; src = fetchurl { - url = https://luarocks.org/lua_cliargs-3.0-2.src.rock; - sha256 = "0qqdnw00r16xbyqn4w1xwwpg9i9ppc3c1dcypazjvdxaj899hy9w"; + url = https://luarocks.org/lua_cliargs-3.0-2.src.rock; + sha256 = "0qqdnw00r16xbyqn4w1xwwpg9i9ppc3c1dcypazjvdxaj899hy9w"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "https://github.com/amireh/lua_cliargs"; - description="A command-line argument parser."; + description = "A command-line argument parser."; license = { fullName = "MIT <http://opensource.org/licenses/MIT>"; }; @@ -305,16 +335,16 @@ lua-iconv = buildLuarocksPackage { version = "7-3"; src = fetchurl { - url = https://luarocks.org/lua-iconv-7-3.src.rock; - sha256 = "03xibhcqwihyjhxnzv367q4bfmzmffxl49lmjsq77g0prw8v0q83"; + url = https://luarocks.org/lua-iconv-7-3.src.rock; + sha256 = "03xibhcqwihyjhxnzv367q4bfmzmffxl49lmjsq77g0prw8v0q83"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "http://ittner.github.com/lua-iconv/"; - description="Lua binding to the iconv"; + description = "Lua binding to the iconv"; license = { fullName = "MIT/X11"; }; @@ -344,23 +374,21 @@ lua-term = buildLuarocksPackage { pname = "lua-term"; version = "0.7-1"; - knownRockspec = (fetchurl { - url = https://luarocks.org/lua-term-0.7-1.rockspec; - sha256 = "0r9g5jw7pqr1dyj6w58dqlr7y7l0jp077n8nnji4phf10biyrvg2"; + knownRockspec = (fetchurl { + url = https://luarocks.org/lua-term-0.7-1.rockspec; + sha256 = "0r9g5jw7pqr1dyj6w58dqlr7y7l0jp077n8nnji4phf10biyrvg2"; }).outPath; - src = fetchurl { - url = https://github.com/hoelzro/lua-term/archive/0.07.tar.gz; - sha256 = "0c3zc0cl3a5pbdn056vnlan16g0wimv0p9bq52h7w507f72x18f1"; + src = fetchurl { + url = https://github.com/hoelzro/lua-term/archive/0.07.tar.gz; + sha256 = "0c3zc0cl3a5pbdn056vnlan16g0wimv0p9bq52h7w507f72x18f1"; }; - - - + buildType = "builtin"; meta = { homepage = "https://github.com/hoelzro/lua-term"; - description="Terminal functions for Lua"; + description = "Terminal functions for Lua"; license = { fullName = "MIT/X11"; }; @@ -390,27 +418,26 @@ luabitop = buildLuarocksPackage { pname = "luabitop"; version = "1.0.2-3"; - knownRockspec = (fetchurl { - url = https://luarocks.org/luabitop-1.0.2-3.rockspec; - sha256 = "07y2h11hbxmby7kyhy3mda64w83p4a6p7y7rzrjqgc0r56yjxhcc"; + knownRockspec = (fetchurl { + url = https://luarocks.org/luabitop-1.0.2-3.rockspec; + sha256 = "07y2h11hbxmby7kyhy3mda64w83p4a6p7y7rzrjqgc0r56yjxhcc"; }).outPath; - src = fetchgit ( removeAttrs (builtins.fromJSON ''{ - "url": "git://github.com/LuaDist/luabitop.git", - "rev": "81bb23b0e737805442033535de8e6d204d0e5381", - "date": "2013-02-18T16:36:42+01:00", - "sha256": "0lsc556hlkddjbmcdbg7wc2g55bfy743p8ywdzl8x7kk847r043q", - "fetchSubmodules": true -} - '') ["date"]) ; - - disabled = ( luaOlder "5.1") || ( luaAtLeast "5.3"); - propagatedBuildInputs = [ lua ]; + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "git://github.com/LuaDist/luabitop.git", + "rev": "81bb23b0e737805442033535de8e6d204d0e5381", + "date": "2013-02-18T16:36:42+01:00", + "sha256": "0lsc556hlkddjbmcdbg7wc2g55bfy743p8ywdzl8x7kk847r043q", + "fetchSubmodules": true + } '') ["date"]) ; + + disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.3" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "http://bitop.luajit.org/"; - description="Lua Bit Operations Module"; + description = "Lua Bit Operations Module"; license = { fullName = "MIT/X license"; }; @@ -421,16 +448,16 @@ luaevent = buildLuarocksPackage { version = "0.4.6-1"; src = fetchurl { - url = https://luarocks.org/luaevent-0.4.6-1.src.rock; - sha256 = "0chq09nawiz00lxd6pkdqcb8v426gdifjw6js3ql0lx5vqdkb6dz"; + url = https://luarocks.org/luaevent-0.4.6-1.src.rock; + sha256 = "0chq09nawiz00lxd6pkdqcb8v426gdifjw6js3ql0lx5vqdkb6dz"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "https://github.com/harningt/luaevent"; - description="libevent binding for Lua"; + description = "libevent binding for Lua"; license = { fullName = "MIT"; }; @@ -441,16 +468,16 @@ luacheck = buildLuarocksPackage { version = "0.23.0-1"; src = fetchurl { - url = https://luarocks.org/luacheck-0.23.0-1.src.rock; - sha256 = "0akj61c7k1na2mggsckvfn9a3ljfp4agnmr9gp3mac4vin99a1cl"; + url = https://luarocks.org/luacheck-0.23.0-1.src.rock; + sha256 = "0akj61c7k1na2mggsckvfn9a3ljfp4agnmr9gp3mac4vin99a1cl"; }; - disabled = ( luaOlder "5.1") || ( luaAtLeast "5.4"); - propagatedBuildInputs = [ lua argparse luafilesystem ]; + disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.4" ); + propagatedBuildInputs = [ lua argparse luafilesystem ]; buildType = "builtin"; meta = { homepage = "https://github.com/mpeterv/luacheck"; - description="A static analyzer and a linter for Lua"; + description = "A static analyzer and a linter for Lua"; license = { fullName = "MIT"; }; @@ -461,16 +488,16 @@ luaffi = buildLuarocksPackage { version = "scm-1"; src = fetchurl { - url = http://luarocks.org/dev/luaffi-scm-1.src.rock; - sha256 = "0dia66w8sgzw26bwy36gzyb2hyv7kh9n95lh5dl0158rqa6fsf26"; + url = http://luarocks.org/dev/luaffi-scm-1.src.rock; + sha256 = "0dia66w8sgzw26bwy36gzyb2hyv7kh9n95lh5dl0158rqa6fsf26"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "https://github.com/facebook/luaffifb"; - description="FFI library for calling C functions from lua"; + description = "FFI library for calling C functions from lua"; license = { fullName = "BSD"; }; @@ -481,42 +508,61 @@ luuid = buildLuarocksPackage { version = "20120509-2"; src = fetchurl { - url = https://luarocks.org/luuid-20120509-2.src.rock; - sha256 = "08q54x0m51w89np3n117h2a153wsgv3qayabd8cz6i55qm544hkg"; + url = https://luarocks.org/luuid-20120509-2.src.rock; + sha256 = "08q54x0m51w89np3n117h2a153wsgv3qayabd8cz6i55qm544hkg"; }; - disabled = ( luaOlder "5.2") || ( luaAtLeast "5.4"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.2" ) || ( luaAtLeast "5.4" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#luuid"; - description="A library for UUID generation"; + description = "A library for UUID generation"; license = { fullName = "Public domain"; }; }; }; +markdown = buildLuarocksPackage { + pname = "markdown"; + version = "0.33-1"; + + src = fetchurl { + url = https://luarocks.org/markdown-0.33-1.src.rock; + sha256 = "01xw4b4jvmrv1hz2gya02g3nphsj3hc94hsbc672ycj8pcql5n5y"; + }; + disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.4" ); + propagatedBuildInputs = [ lua ]; + buildType = "builtin"; + + meta = { + homepage = "https://github.com/mpeterv/markdown"; + description = "Markdown text-to-html markup system."; + license = { + fullName = "MIT/X11"; + }; + }; +}; penlight = buildLuarocksPackage { pname = "penlight"; version = "1.5.4-1"; - knownRockspec = (fetchurl { - url = https://luarocks.org/penlight-1.5.4-1.rockspec; - sha256 = "07mhsk9kmdxg4i2w4mrnnd2zs34bgggi9gigfplakxin96sa6c0p"; + knownRockspec = (fetchurl { + url = https://luarocks.org/penlight-1.5.4-1.rockspec; + sha256 = "07mhsk9kmdxg4i2w4mrnnd2zs34bgggi9gigfplakxin96sa6c0p"; }).outPath; - src = fetchurl { - url = http://stevedonovan.github.io/files/penlight-1.5.4.zip; - sha256 = "138f921p6kdqkmf4pz115phhj0jsqf28g33avws80d2vq2ixqm8q"; + src = fetchurl { + url = http://stevedonovan.github.io/files/penlight-1.5.4.zip; + sha256 = "138f921p6kdqkmf4pz115phhj0jsqf28g33avws80d2vq2ixqm8q"; }; - - - propagatedBuildInputs = [ luafilesystem ]; + + propagatedBuildInputs = [ luafilesystem ]; buildType = "builtin"; meta = { homepage = "http://stevedonovan.github.com/Penlight"; - description="Lua utility libraries loosely based on the Python standard libraries"; + description = "Lua utility libraries loosely based on the Python standard libraries"; license = { fullName = "MIT/X11"; }; @@ -546,23 +592,23 @@ say = buildLuarocksPackage { pname = "say"; version = "1.3-1"; - knownRockspec = (fetchurl { - url = https://luarocks.org/say-1.3-1.rockspec; - sha256 = "0bknglb0qwd6r703wp3hcb6z2xxd14kq4md3sg9al3b28fzxbhdv"; + knownRockspec = (fetchurl { + url = https://luarocks.org/say-1.3-1.rockspec; + sha256 = "0bknglb0qwd6r703wp3hcb6z2xxd14kq4md3sg9al3b28fzxbhdv"; }).outPath; - src = fetchurl { - url = https://github.com/Olivine-Labs/say/archive/v1.3-1.tar.gz; - sha256 = "1jh76mxq9dcmv7kps2spwcc6895jmj2sf04i4y9idaxlicvwvs13"; + src = fetchurl { + url = https://github.com/Olivine-Labs/say/archive/v1.3-1.tar.gz; + sha256 = "1jh76mxq9dcmv7kps2spwcc6895jmj2sf04i4y9idaxlicvwvs13"; }; - - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "http://olivinelabs.com/busted/"; - description="Lua String Hashing/Indexing Library"; + description = "Lua String Hashing/Indexing Library"; license = { fullName = "MIT <http://opensource.org/licenses/MIT>"; }; @@ -573,16 +619,16 @@ std__debug = buildLuarocksPackage { version = "1.0.1-1"; src = fetchurl { - url = https://luarocks.org/std._debug-1.0.1-1.src.rock; - sha256 = "1qkcc5rph3ns9mzrfsa1671pb3hzbzfnaxvyw7zdly2b7ll88svz"; + url = https://luarocks.org/std._debug-1.0.1-1.src.rock; + sha256 = "1qkcc5rph3ns9mzrfsa1671pb3hzbzfnaxvyw7zdly2b7ll88svz"; }; - disabled = ( luaOlder "5.1") || ( luaAtLeast "5.5"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.5" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "http://lua-stdlib.github.io/_debug"; - description="Debug Hints Library"; + description = "Debug Hints Library"; license = { fullName = "MIT/X11"; }; @@ -593,16 +639,16 @@ std_normalize = buildLuarocksPackage { version = "2.0.2-1"; src = fetchurl { - url = https://luarocks.org/std.normalize-2.0.2-1.src.rock; - sha256 = "0yn60zqnxflhhlv6xk6w0ifdfxk1qcg8gq1wnrrbwsxwpipsrfjh"; + url = https://luarocks.org/std.normalize-2.0.2-1.src.rock; + sha256 = "0yn60zqnxflhhlv6xk6w0ifdfxk1qcg8gq1wnrrbwsxwpipsrfjh"; }; - disabled = ( luaOlder "5.1") || ( luaAtLeast "5.4"); - propagatedBuildInputs = [ lua std__debug ]; + disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.4" ); + propagatedBuildInputs = [ lua std__debug ]; buildType = "builtin"; meta = { homepage = "https://lua-stdlib.github.io/normalize"; - description="Normalized Lua Functions"; + description = "Normalized Lua Functions"; license = { fullName = "MIT/X11"; }; @@ -610,19 +656,19 @@ std_normalize = buildLuarocksPackage { }; luv = buildLuarocksPackage { pname = "luv"; - version = "1.26.0-0"; + version = "1.27.0-0"; src = fetchurl { - url = https://luarocks.org/luv-1.26.0-0.src.rock; - sha256 = "005yzcxlribnc45qr1g7q4psakximb9fbz07k6yzy1d94mhcxxr7"; + url = https://luarocks.org/luv-1.27.0-0.src.rock; + sha256 = "16csnnypi2m71ncr8qwc9drqbrb40l5li1nk7zpsxnslg5fiax6x"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "cmake"; meta = { homepage = "https://github.com/luvit/luv"; - description="Bare libuv bindings for lua"; + description = "Bare libuv bindings for lua"; license = { fullName = "Apache 2.0"; }; @@ -633,16 +679,16 @@ luasystem = buildLuarocksPackage { version = "0.2.1-0"; src = fetchurl { - url = https://luarocks.org/luasystem-0.2.1-0.src.rock; - sha256 = "091xmp8cijgj0yzfsjrn7vljwznjnjn278ay7z9pjwpwiva0diyi"; + url = https://luarocks.org/luasystem-0.2.1-0.src.rock; + sha256 = "091xmp8cijgj0yzfsjrn7vljwznjnjn278ay7z9pjwpwiva0diyi"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "http://olivinelabs.com/luasystem/"; - description="Platform independent system calls for Lua."; + description = "Platform independent system calls for Lua."; license = { fullName = "MIT <http://opensource.org/licenses/MIT>"; }; @@ -653,16 +699,16 @@ mediator_lua = buildLuarocksPackage { version = "1.1.2-0"; src = fetchurl { - url = http://luarocks.org/manifests/teto/mediator_lua-1.1.2-0.src.rock; - sha256 = "18j49vvs94yfk4fw0xsq4v3j4difr6c99gfba0kxairmcqamd1if"; + url = http://luarocks.org/manifests/teto/mediator_lua-1.1.2-0.src.rock; + sha256 = "18j49vvs94yfk4fw0xsq4v3j4difr6c99gfba0kxairmcqamd1if"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua ]; buildType = "builtin"; meta = { homepage = "http://olivinelabs.com/mediator_lua/"; - description="Event handling through channels"; + description = "Event handling through channels"; license = { fullName = "MIT <http://opensource.org/licenses/MIT>"; }; @@ -673,16 +719,15 @@ mpack = buildLuarocksPackage { version = "1.0.7-0"; src = fetchurl { - url = http://luarocks.org/manifests/teto/mpack-1.0.7-0.src.rock; - sha256 = "0nq4ixaminkc7fwfpivysyv0al3j5dffsvgdrnwnqdg3w7jgfbw7"; + url = http://luarocks.org/manifests/teto/mpack-1.0.7-0.src.rock; + sha256 = "0nq4ixaminkc7fwfpivysyv0al3j5dffsvgdrnwnqdg3w7jgfbw7"; }; - - + buildType = "builtin"; meta = { homepage = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.7/libmpack-lua-1.0.7.tar.gz"; - description="Lua binding to libmpack"; + description = "Lua binding to libmpack"; license = { fullName = "MIT"; }; @@ -693,16 +738,16 @@ nvim-client = buildLuarocksPackage { version = "0.1.0-1"; src = fetchurl { - url = https://luarocks.org/nvim-client-0.1.0-1.src.rock; - sha256 = "1p57mrvm0ny3yi5cydr3z9qwzyg124rjp5w7vdflf2i23z39mkma"; + url = https://luarocks.org/nvim-client-0.1.0-1.src.rock; + sha256 = "1p57mrvm0ny3yi5cydr3z9qwzyg124rjp5w7vdflf2i23z39mkma"; }; - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua mpack luv coxpcall ]; + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua mpack luv coxpcall ]; buildType = "builtin"; meta = { homepage = "https://github.com/neovim/lua-client/archive/0.1.0-1.tar.gz"; - description="Lua client to Nvim"; + description = "Lua client to Nvim"; license = { fullName = "Apache"; }; @@ -712,23 +757,23 @@ busted = buildLuarocksPackage { pname = "busted"; version = "2.0.rc13-0"; - knownRockspec = (fetchurl { - url = https://luarocks.org/busted-2.0.rc13-0.rockspec; - sha256 = "0hrvhg1324q5ra6cpjh1y3by6lrzs0ljah4jl48l8xlgw1z9z1q5"; + knownRockspec = (fetchurl { + url = https://luarocks.org/busted-2.0.rc13-0.rockspec; + sha256 = "0hrvhg1324q5ra6cpjh1y3by6lrzs0ljah4jl48l8xlgw1z9z1q5"; }).outPath; - src = fetchurl { - url = https://github.com/Olivine-Labs/busted/archive/v2.0.rc13-0.tar.gz; - sha256 = "0m72bldn1r6j94ahcfmpaq1mmysrshf9qi9fjas7hpal0jp8ivvl"; + src = fetchurl { + url = https://github.com/Olivine-Labs/busted/archive/v2.0.rc13-0.tar.gz; + sha256 = "0m72bldn1r6j94ahcfmpaq1mmysrshf9qi9fjas7hpal0jp8ivvl"; }; - - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua lua_cliargs luafilesystem luasystem dkjson say luassert lua-term penlight mediator_lua ]; + + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua lua_cliargs luafilesystem luasystem dkjson say luassert lua-term penlight mediator_lua ]; buildType = "builtin"; meta = { homepage = "http://olivinelabs.com/busted/"; - description="Elegant Lua unit testing."; + description = "Elegant Lua unit testing."; license = { fullName = "MIT <http://opensource.org/licenses/MIT>"; }; @@ -738,23 +783,23 @@ luassert = buildLuarocksPackage { pname = "luassert"; version = "1.7.11-0"; - knownRockspec = (fetchurl { - url = https://luarocks.org/luassert-1.7.11-0.rockspec; - sha256 = "12zgybcv8acjzvjdbxd1764s1vxbksxdv9fkvsymcsdmppxkbd0s"; + knownRockspec = (fetchurl { + url = https://luarocks.org/luassert-1.7.11-0.rockspec; + sha256 = "12zgybcv8acjzvjdbxd1764s1vxbksxdv9fkvsymcsdmppxkbd0s"; }).outPath; - src = fetchurl { - url = https://github.com/Olivine-Labs/luassert/archive/v1.7.11.tar.gz; - sha256 = "1vwq3wqj9cjyz9lnf1n38yhpcglr2h40v3n9096i8vcpmyvdb3ka"; + src = fetchurl { + url = https://github.com/Olivine-Labs/luassert/archive/v1.7.11.tar.gz; + sha256 = "1vwq3wqj9cjyz9lnf1n38yhpcglr2h40v3n9096i8vcpmyvdb3ka"; }; - - disabled = ( luaOlder "5.1"); - propagatedBuildInputs = [ lua say ]; + + disabled = ( luaOlder "5.1" ); + propagatedBuildInputs = [ lua say ]; buildType = "builtin"; meta = { homepage = "http://olivinelabs.com/busted/"; - description="Lua Assertions Extension"; + description = "Lua Assertions Extension"; license = { fullName = "MIT <http://opensource.org/licenses/MIT>"; }; @@ -765,16 +810,15 @@ coxpcall = buildLuarocksPackage { version = "1.17.0-1"; src = fetchurl { - url = https://luarocks.org/manifests/hisham/coxpcall-1.17.0-1.src.rock; - sha256 = "0n1jmda4g7x06458596bamhzhcsly6x0p31yp6q3jz4j11zv1zhi"; + url = https://luarocks.org/manifests/hisham/coxpcall-1.17.0-1.src.rock; + sha256 = "0n1jmda4g7x06458596bamhzhcsly6x0p31yp6q3jz4j11zv1zhi"; }; - - + buildType = "builtin"; meta = { homepage = "http://keplerproject.github.io/coxpcall"; - description="Coroutine safe xpcall and pcall"; + description = "Coroutine safe xpcall and pcall"; license = { fullName = "MIT/X11"; }; diff --git a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix index 7dc0809c887..198da09e1d0 100644 --- a/pkgs/development/tools/misc/luarocks/luarocks-nix.nix +++ b/pkgs/development/tools/misc/luarocks/luarocks-nix.nix @@ -4,7 +4,7 @@ luarocks.overrideAttrs(old: { src = fetchFromGitHub { owner = "teto"; repo = "luarocks"; - rev = "8fb03a9bc8f4fa079d26c0f02804139bb2578848"; - sha256 = "09iwjvs9sbk6vwhrh7sijmfpji6wvg5bbdraw7l5lpnr9jj5wy91"; + rev = "ca52159dcb544161e5bef1e4e366f3da31fa4555"; + sha256 = "13g7vpyirq51qmmnjsqhhiia9wdnq9aw4da0n3r7l1ar95q168sn"; }; }) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2da75c85bbb..8d1ad5e40ef 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16752,7 +16752,7 @@ in awesome-4-0 = callPackage ../applications/window-managers/awesome { cairo = cairo.override { xcbSupport = true; }; - luaPackages = luaPackages.override { inherit lua; }; + inherit (texFunctions) fontsConf; }; awesome = awesome-4-0; |