Unverified Commit 92a1af2e authored by Matthieu Coudron's avatar Matthieu Coudron Committed by GitHub
Browse files

luaPackages.{md5,utf8,lsqlite3}: init (#501450)

parents 2b69405f 436c4973

maintainers/scripts/luarocks-packages.csv

+3 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ lrexlib-oniguruma,,,,,,junestepp 
lrexlib-pcre,,,,,,

lrexlib-posix,,,,,,

lsp-progress.nvim,,,,,5.1,gepbird

lsqlite3,,,,,,

lua-cjson,,,,,,

lua-cmsgpack,,,,,,

lua-curl,,,,,,
@@ -113,6 +114,7 @@ lzextras,,,,,,birdee 
lzn-auto-require,,,,,,mrcjkb

magick,,,,,5.1,donovanglover

markdown,,,,,,

md5,,,,,,

mediator_lua,,,,,,

middleclass,,,,,,

mimetypes,,,,,,
@@ -158,6 +160,7 @@ toml-edit,,,,,5.1,mrcjkb 
tree-sitter-http,,,,0.0.33-1,,

tree-sitter-norg,,,,,5.1,mrcjkb

tree-sitter-orgmode,,,,,5.1,

utf8,,,,,,

vstruct,,,,,,

vusted,,,,,,

xml2lua,,,,,,teto

pkgs/by-name/ol/olympus-unwrapped/package.nix

+1 −10
Original line number Diff line number Diff line
@@ -15,16 +15,7 @@ let 
  lua_cpath =

    with luajitPackages;

    lib.concatMapStringsSep ";" getLuaCPath [

      (buildLuarocksPackage {

        pname = "lsqlite3";

        version = "0.9.6-1";

        src = fetchzip {

          url = "http://lua.sqlite.org/home/zip/lsqlite3_v096.zip";

          hash = "sha256-Mq409A3X9/OS7IPI/KlULR6ZihqnYKk/mS/W/2yrGBg=";

        };

        buildInputs = [ sqlite.dev ];

      })



      lsqlite3

      lua-subprocess

      nfd

    ];

pkgs/development/lua-modules/generated-packages.nix

+92 −0
Original line number Diff line number Diff line
@@ -1608,6 +1608,37 @@ final: prev: { 
    }

  ) { };



  lsqlite3 = callPackage (

    {

      buildLuarocksPackage,

      fetchurl,

      fetchzip,

      luaAtLeast,

      luaOlder,

    }:

    buildLuarocksPackage {

      pname = "lsqlite3";

      version = "0.9.6-1";

      knownRockspec =

        (fetchurl {

          url = "mirror://luarocks/lsqlite3-0.9.6-1.rockspec";

          sha256 = "1wb51lsfllmbzrjfl0dzxpg597nd54nn06c9plpvqwwjz4l9lrjf";

        }).outPath;

      src = fetchzip {

        url = "https://lua.sqlite.org/home/zip/lsqlite3_v096.zip?uuid=v0.9.6";

        sha256 = "0p24g17y6s0x1951y9pyndggp71drh4zrzb2a05nb9sk5s3z9dnm";

      };



      disabled = luaOlder "5.1" || luaAtLeast "5.5";



      meta = {

        homepage = "http://lua.sqlite.org/";

        description = "A binding for Lua to the SQLite3 database library";

        license.fullName = "MIT";

      };

    }

  ) { };



  lua-cjson = callPackage (

    {

      buildLuarocksPackage,
@@ -3710,6 +3741,35 @@ final: prev: { 
    }

  ) { };



  md5 = callPackage (

    {

      buildLuarocksPackage,

      fetchurl,

      luaOlder,

    }:

    buildLuarocksPackage {

      pname = "md5";

      version = "1.3-1";

      knownRockspec =

        (fetchurl {

          url = "mirror://luarocks/md5-1.3-1.rockspec";

          sha256 = "08kx00ik1hly4p1a1bvvw3bvbddc64vdhpr21jy3asrj9nz86bnr";

        }).outPath;

      src = fetchurl {

        url = "https://github.com/keplerproject/md5/archive/1.3.tar.gz";

        sha256 = "193dsjgnzrnykpmx68njkv72fxh2gb3llqgx2lgbgnf5i66shiq7";

      };



      disabled = luaOlder "5.0";



      meta = {

        homepage = "http://keplerproject.github.io/md5/";

        description = "Checksum library";

        license.fullName = "MIT/X11";

      };

    }

  ) { };



  mediator_lua = callPackage (

    {

      buildLuarocksPackage,
@@ -5213,6 +5273,38 @@ final: prev: { 
    }

  ) { };



  utf8 = callPackage (

    {

      buildLuarocksPackage,

      fetchFromGitHub,

      fetchurl,

      luaOlder,

    }:

    buildLuarocksPackage {

      pname = "utf8";

      version = "1.3-0";

      knownRockspec =

        (fetchurl {

          url = "mirror://luarocks/utf8-1.3-0.rockspec";

          sha256 = "1szsrwb15yyvrqwyqrr7g5ivihc0kl4pc7qq439q235f3x8jv2jp";

        }).outPath;

      src = fetchFromGitHub {

        owner = "dannote";

        repo = "luautf8";

        rev = "f36cc914ae9015cd3045987abadd83bbcfae98f0";

        hash = "sha256-xLWqglAzqcxY+R8GOC+D3uzL2+9ZriEx8Kj41LkI5vU=";

      };



      disabled = luaOlder "5.1";



      meta = {

        homepage = "http://github.com/starwing/luautf8";

        description = "A UTF-8 support module for Lua";

        license.fullName = "MIT";

      };

    }

  ) { };



  vstruct = callPackage (

    {

      buildLuarocksPackage,

pkgs/development/lua-modules/overrides.nix

+15 −0
Original line number Diff line number Diff line
@@ -402,6 +402,11 @@ in 
    ];

  });



  lsqlite3 = prev.lsqlite3.overrideAttrs (old: {

    src = old.src.overrideAttrs { extension = "zip"; };

    buildInputs = old.buildInputs ++ [ sqlite.dev ];

  });



  lua-cmsgpack = prev.lua-cmsgpack.overrideAttrs {

    strictDeps = false;

    meta.broken = isLuaJIT;
@@ -1129,6 +1134,16 @@ in 
    meta.broken = lua.luaversion != "5.1";

  });



  utf8 = prev.utf8.overrideAttrs {

    postPatch = ''

      sed -i '/#include <assert.h>/a\

      #ifndef lua_assert\

        #define lua_assert(x) assert(x)\

      #endif

      ' lutf8lib.c

    '';

  };



  vstruct = prev.vstruct.overrideAttrs (_: {

    meta.broken = luaOlder "5.1" || luaAtLeast "5.4";

  });