Merge pull request #60343 from dtzWill/fix/luarocks-nix-formatting-and-awesome-doc-goodness

luarocks-nix,luaPackages: formatting and additions; awesome: docs!

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,

maintainers/scripts/update-luarocks-packages

@@ -76,11 +76,7 @@ FOOTER="
 function convert_pkg () {
     nix_pkg_name="$1"
     lua_pkg_name="$2"
-	server=""
+    server="${3:+--server=$3}"
-	if [ ! -z "$3" ]; then
-		server=" --server=$3"
-	fi
-
     version="${4:-}"
 
     echo "looking at $lua_pkg_name (version $version) from server [$server]" >&2

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

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
 */
@@ -52,12 +52,18 @@ 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;
+    url    = https://github.com/aiq/basexx/archive/v0.4.1.tar.gz;
-      sha256 = "1px8yrxg1qkk3kzdqj3siry742jdv4ysp2dmicxi15mkynqpjlzz";
+    sha256 = "1rnz6xixxqwy0q6y2hi14rfid4w47h69gfi0rnlq24fz8q2b0qpz";
   };
+
   disabled = ( luaOlder "5.1" );
   propagatedBuildInputs = [ lua ];
   buildType = "builtin";
@@ -130,6 +136,31 @@ inspect = buildLuarocksPackage {
     };
   };
 };
+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";
@@ -143,7 +174,7 @@ lgi = buildLuarocksPackage {
   buildType = "make";
 
   meta = {
-    homepage = "https://github.com/pavouk/lgi";
+    homepage = "http://github.com/pavouk/lgi";
     description = "Lua bindings to GObject libraries";
     license = {
       fullName = "MIT/X11";
@@ -203,7 +234,7 @@ lrexlib-gnu = buildLuarocksPackage {
   buildType = "builtin";
 
   meta = {
-    homepage = "https://github.com/rrthomas/lrexlib";
+    homepage = "http://github.com/rrthomas/lrexlib";
     description = "Regular expression library binding (GNU flavour).";
     license = {
       fullName = "MIT/X11";
@@ -223,7 +254,7 @@ lrexlib-posix = buildLuarocksPackage {
   buildType = "builtin";
 
   meta = {
-    homepage = "https://github.com/rrthomas/lrexlib";
+    homepage = "http://github.com/rrthomas/lrexlib";
     description = "Regular expression library binding (POSIX flavour).";
     license = {
       fullName = "MIT/X11";
@@ -265,15 +296,14 @@ lua-cmsgpack = buildLuarocksPackage {
     "date": "2018-06-14T11:56:56+02:00",
     "sha256": "0yiwl4p1zh9qid3ksc4n9fv5bwaa9vjb0vgwnkars204xmxdj8fj",
     "fetchSubmodules": true
-}
+  } '') ["date"]) ;
- '') ["date"]) ;
 
   disabled = ( luaOlder "5.1" );
   propagatedBuildInputs = [ lua ];
   buildType = "builtin";
 
   meta = {
-    homepage = "https://github.com/antirez/lua-cmsgpack";
+    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";
@@ -354,8 +384,6 @@ lua-term = buildLuarocksPackage {
     sha256 = "0c3zc0cl3a5pbdn056vnlan16g0wimv0p9bq52h7w507f72x18f1";
   };
 
-  
-    
   buildType = "builtin";
 
   meta = {
@@ -401,8 +429,7 @@ luabitop = buildLuarocksPackage {
     "date": "2013-02-18T16:36:42+01:00",
     "sha256": "0lsc556hlkddjbmcdbg7wc2g55bfy743p8ywdzl8x7kk847r043q",
     "fetchSubmodules": true
-}
+  } '') ["date"]) ;
- '') ["date"]) ;
 
   disabled = ( luaOlder "5.1" ) || ( luaAtLeast "5.3" );
   propagatedBuildInputs = [ lua ];
@@ -496,6 +523,26 @@ luuid = buildLuarocksPackage {
     };
   };
 };
+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";
@@ -510,7 +557,6 @@ penlight = buildLuarocksPackage {
     sha256 = "138f921p6kdqkmf4pz115phhj0jsqf28g33avws80d2vq2ixqm8q";
   };
 
-  
   propagatedBuildInputs = [ luafilesystem ];
   buildType = "builtin";
 
@@ -610,11 +656,11 @@ 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;
+    url    = https://luarocks.org/luv-1.27.0-0.src.rock;
-      sha256 = "005yzcxlribnc45qr1g7q4psakximb9fbz07k6yzy1d94mhcxxr7";
+    sha256 = "16csnnypi2m71ncr8qwc9drqbrb40l5li1nk7zpsxnslg5fiax6x";
   };
   disabled = ( luaOlder "5.1" );
   propagatedBuildInputs = [ lua ];
@@ -677,7 +723,6 @@ mpack = buildLuarocksPackage {
     sha256 = "0nq4ixaminkc7fwfpivysyv0al3j5dffsvgdrnwnqdg3w7jgfbw7";
   };
 
-    
   buildType = "builtin";
 
   meta = {
@@ -769,7 +814,6 @@ coxpcall = buildLuarocksPackage {
     sha256 = "0n1jmda4g7x06458596bamhzhcsly6x0p31yp6q3jz4j11zv1zhi";
   };
 
-    
   buildType = "builtin";
 
   meta = {

pkgs/development/tools/misc/luarocks/luarocks-nix.nix

@@ -4,7 +4,7 @@ luarocks.overrideAttrs(old: {
   src = fetchFromGitHub {
     owner = "teto";
     repo = "luarocks";
-    rev = "8fb03a9bc8f4fa079d26c0f02804139bb2578848";
+    rev = "ca52159dcb544161e5bef1e4e366f3da31fa4555";
-    sha256 = "09iwjvs9sbk6vwhrh7sijmfpji6wvg5bbdraw7l5lpnr9jj5wy91";
+    sha256 = "13g7vpyirq51qmmnjsqhhiia9wdnq9aw4da0n3r7l1ar95q168sn";
   };
 })

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;