ci(flake): improve builder

Author: BirdeeHub

Makefile

@@ -97,9 +97,9 @@ endif
 ifdef BINDIR
 	@mkdir -p "$(BINDIR)";
 ifeq ($(filter /%,$(LUA)),)
-	@printf '%s\npackage.cpath = '\''%q/?.so'\''\n-- ' "#!/usr/bin/env $(LUA)" "$(LIBDIR)" > "$(BINDIR)/tomlua";
+	@printf '%s\npackage.cpath = [==============[%s/?.so]==============]\n-- ' "#!/usr/bin/env $(LUA)" "$(LIBDIR)" > "$(BINDIR)/tomlua";
 else
-	@printf '%s\npackage.cpath = '\''%q/?.so'\''\n-- ' "#!$(LUA)" "$(LIBDIR)" > "$(BINDIR)/tomlua";
+	@printf '%s\npackage.cpath = [==============[%s/?.so]==============]\n-- ' "#!$(LUA)" "$(LIBDIR)" > "$(BINDIR)/tomlua";
 endif
 	@cat "$(SRC)/bin/tomlua" >> "$(BINDIR)/tomlua";
 	@chmod +x "$(BINDIR)/tomlua";

default.nix

@@ -1,5 +1,5 @@
 { pkgs ? import <nixpkgs> {}, ... }: (import ./flake.nix).outputs {
   self = builtins.path { path = ./.; };
   inherit (pkgs.stdenv.hostPlatform) system;
-  nixpkgs = pkgs;
+  inherit pkgs;
 }

flake.nix

@@ -1,12 +1,19 @@
 {
   inputs.nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-  outputs = { self, nixpkgs, ... }@inputs: let
-    genAttrs = names: f: builtins.listToAttrs (map (n: { name = n; value = f n; }) names);
-    forAllSys = genAttrs inputs.systems or nixpkgs.lib.platforms.all or [ (inputs.system or throw "No systems list provided!") ];
-    getpkgswithoverlay = system: if builtins.all (v: nixpkgs ? "${v}") [ "path" "stdenv" "appendOverlays" ]
-      then nixpkgs.appendOverlays [ overlay ] else import nixpkgs { inherit system; overlays = [ overlay ]; };
-    getpkgs = system: if builtins.all (v: nixpkgs ? "${v}") [ "path" "stdenv" "appendOverlays" ]
-      then nixpkgs else import nixpkgs { inherit system; };
+  outputs = { self, ... }@inputs: let
+    lib = inputs.pkgs.lib or inputs.nixpkgs.lib or (import "${inputs.nixpkgs or <nixpkgs>}/lib");
+    forAllSys = lib.genAttrs lib.platforms.all;
+    getPkgs = system: overlays: if inputs.pkgs.stdenv.hostPlatform.system or null == system then
+      if builtins.isList overlays && overlays != [] then
+        inputs.pkgs.appendOverlays overlays
+      else
+        inputs.pkgs
+    else
+      import (inputs.pkgs.path or inputs.nixpkgs or <nixpkgs>) {
+        inherit system;
+        overlays = (if builtins.isList overlays then overlays else []) ++ inputs.pkgs.overlays or [];
+        config = inputs.pkgs.config or {};
+      };
     mapAttrsToList = f: attrs: builtins.attrValues (builtins.mapAttrs f attrs);
     l_pkg_enum = {
       lua5_1 = "lua51Packages";
@@ -19,55 +26,64 @@
     };
     APPNAME = "tomlua";
     overlay = final: prev: let
+      luaCallPackageFn = { toLuaModule, lua, }:
+        toLuaModule (lua.stdenv.mkDerivation (finalAttrs: {
+          pname = APPNAME;
+          version = "${(finalAttrs.passthru.luaModule or lua).luaversion}.dev";
+          src = self;
+          LUA = (finalAttrs.passthru.luaModule or lua).interpreter;
+          LUA_INC = (finalAttrs.passthru.luaModule or lua) + "/include";
+          propagatedBuildInputs = [ (finalAttrs.passthru.luaModule or lua) ];
+          BINDIR = placeholder "out" + "/bin";
+          LIBDIR = placeholder "out" + "/lib/lua/" + (finalAttrs.passthru.luaModule or lua).luaversion;
+          LUADIR = placeholder "out" + "/share/lua/" + (finalAttrs.passthru.luaModule or lua).luaversion;
+          doCheck = false;
+        }));
       # lua5_1 = prev.lua5_1.override { packageOverrides };
-      l_pkg_main = builtins.mapAttrs (n: _: (prev.lib.attrByPath [ n "override" ] null prev) {
-        packageOverrides = luaself: luaprev: {
-          ${APPNAME} = luaself.callPackage ({buildLuarocksPackage}:
-            buildLuarocksPackage {
-              pname = APPNAME;
-              version = "scm-1";
-              knownRockspec = "${self}/${APPNAME}-scm-1.rockspec";
-              src = self;
-              checkPhase = "runHook preCheck; runHook preCheck";
-              installCheckPhase = ''
-                runHook preInstallCheck
-                luarocks test
-                runHook postInstallCheck
-              '';
-            }) {};
-        };
-      }) l_pkg_enum;
+      l_pkg_main = builtins.mapAttrs (
+        n: _: (prev.lib.attrByPath [ n "override" ] null prev) {
+          packageOverrides = luaself: luaprev: {
+            ${APPNAME} = luaself.callPackage luaCallPackageFn {};
+          };
+        }
+      ) l_pkg_enum;
       # lua51Packages = final.lua5_1.pkgs;
-      l_pkg_sets = builtins.listToAttrs (mapAttrsToList (n: v: {
-        name = v;
-        value = prev.lib.attrByPath [ n "pkgs" ] null final;
-      }) l_pkg_enum);
+      l_pkg_sets = builtins.listToAttrs (
+        mapAttrsToList (
+          n: v: {
+            name = v;
+            value = prev.lib.attrByPath [ n "pkgs" ] null final;
+          }
+        ) l_pkg_enum
+      );
     in l_pkg_main // l_pkg_sets // {
       vimPlugins = prev.vimPlugins // {
-        ${APPNAME} = (final.neovimUtils.buildNeovimPlugin { pname = APPNAME; }).overrideAttrs {
-          luarocksConfig = {
-            lua_modules_path = "lua";
-            lib_modules_path = "lua";
-          };
-        };
+        ${APPNAME} = final.vimUtils.toVimPlugin ((final.neovim-unwrapped.lua.pkgs.callPackage luaCallPackageFn {}).overrideAttrs {
+          LIBDIR = placeholder "out" + "/lua";
+          LUADIR = placeholder "out" + "/lua";
+        });
       };
     };
     packages = forAllSys (system: let
-      pkgs = getpkgswithoverlay system;
-    in (with builtins; listToAttrs (map (n: {
-      name = "${n}-${APPNAME}";
-      value = pkgs.lib.attrByPath [ n "pkgs" APPNAME ] null pkgs;
-    }) (attrNames l_pkg_enum))) // {
+      pkgs = getPkgs system [ overlay ];
+    in (
+      with builtins; listToAttrs (
+        map (n: {
+          name = "${n}-${APPNAME}";
+          value = pkgs.lib.attrByPath [ n "pkgs" APPNAME ] null pkgs;
+        }) (attrNames l_pkg_enum)
+      )
+    ) // {
       default = pkgs.vimPlugins.${APPNAME};
       "vimPlugins-${APPNAME}" = pkgs.vimPlugins.${APPNAME};
     });
   in {
     overlays.default = overlay;
     inherit packages;
-    checks = forAllSys (system: builtins.mapAttrs (_: p: p.overrideAttrs { doInstallCheck = true; }) packages.${system});
+    checks = forAllSys (system: builtins.mapAttrs (_: p: p.overrideAttrs { doCheck = true; }) packages.${system});
     devShells = forAllSys (system: let
-      pkgs = getpkgs system;
-      lua = pkgs.luajit.withPackages (lp: [lp.inspect lp.cjson lp.toml-edit lp.luarocks]);
+      pkgs = getPkgs system [];
+      lua = pkgs.luajit.withPackages (lp: [ lp.inspect lp.cjson lp.toml-edit lp.luarocks ]);
     in {
       default = pkgs.mkShell {
         name = "${APPNAME}-dev";