diff --git a/pkgs/by-name/lu/luarocks-packages-updater/updater.py b/pkgs/by-name/lu/luarocks-packages-updater/updater.py index 951d5fddf4dd..80221bc6c75a 100755 --- a/pkgs/by-name/lu/luarocks-packages-updater/updater.py +++ b/pkgs/by-name/lu/luarocks-packages-updater/updater.py @@ -72,6 +72,7 @@ LICENSE_NORMALIZATION = { "Apache 2.0": "lib.licenses.asl20", "Apache-2.0": "lib.licenses.asl20", "Apache License Version 2": "lib.licenses.asl20", + "BSD": "lib.licenses.free", # Too unspecific "BSD-2-Clause": "lib.licenses.bsd2", "BSD-3-Clause": "lib.licenses.bsd3", "GPL-2+": "lib.licenses.gpl2Plus", @@ -82,16 +83,23 @@ LICENSE_NORMALIZATION = { "GPL-3.0": "lib.licenses.gpl3Only", "GPL-3.0-only": "lib.licenses.gpl3Only", "GPL-3.0-or-later": "lib.licenses.gpl3Plus", + "GPLv3+ and other free licenses": "lib.licenses.AND [ lib.licenses.gpl3Plus lib.licenses.free ]", "ISC": "lib.licenses.isc", + "LGPL": "lib.licenses.free", # Too unspecific "LGPL-2.0": "lib.licenses.lgpl2Only", "LGPL-2.1": "lib.licenses.lgpl21Only", "LGPL-3.0": "lib.licenses.lgpl3Only", "MIT": "lib.licenses.mit", "MIT ": "lib.licenses.mit", + "MIT/X11": "lib.licenses.AND [ lib.licenses.mit lib.licenses.x11 ]", + "MIT/X license": "lib.licenses.AND [ lib.licenses.mit lib.licenses.x11 ]", + "MIT/ICU": "lib.licenses.AND [ lib.licenses.mit lib.licenses.unicode-30 ]", "MPL-2.0": "lib.licenses.mpl20", "Unlicense": "lib.licenses.unlicense", "2-clause BSD": "lib.licenses.bsd2", "Two-clause BSD": "lib.licenses.bsd2", + "Public domain": "lib.licenses.publicDomain", + "UNKNOWN": "lib.licenses.unfree" } LICENSE_FULL_NAME_RE = re.compile(r'(?P\s*)license\.fullName = "(?P[^"]+)";') diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index 42ef540e3bf9..e9abdb69085d 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -40,7 +40,10 @@ final: prev: { meta = { homepage = "https://github.com/cheusov/lua-alt-getopt"; maintainers = with lib.maintainers; [ arobyn ]; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Process application arguments the same way as getopt_long"; longDescription = '' alt-getopt is a module for Lua programming language for processing @@ -204,7 +207,10 @@ final: prev: { meta = { homepage = "https://github.com/Tieske/binaryheap.lua"; maintainers = with lib.maintainers; [ vcunat ]; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Binary heap implementation in pure Lua"; longDescription = '' Binary heaps are an efficient sorting algorithm. This module @@ -414,7 +420,10 @@ final: prev: { meta = { homepage = "https://github.com/alerque/cldr-lua"; maintainers = with lib.maintainers; [ alerque ]; - license.fullName = "MIT/ICU"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.unicode-30 + ]; description = "Lua interface to Unicode CLDR data"; longDescription = "Unicode CLDR (Common Locale Data Repository) data and Lua interface."; }; @@ -548,7 +557,10 @@ final: prev: { meta = { homepage = "http://cosmo.luaforge.net"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Safe templates for Lua"; longDescription = '' Cosmo is a "safe templates" engine. It allows you to fill nested templates, @@ -582,7 +594,10 @@ final: prev: { meta = { homepage = "http://keplerproject.github.io/coxpcall"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Coroutine safe xpcall and pcall"; longDescription = '' Encapsulates the protected calls with a coroutine based loop, so errors can @@ -617,7 +632,10 @@ final: prev: { meta = { homepage = "http://25thandclement.com/~william/projects/cqueues.html"; maintainers = with lib.maintainers; [ vcunat ]; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Continuation Queues: Embeddable asynchronous networking, threading, and notification framework for Lua on Unix."; }; } @@ -690,7 +708,10 @@ final: prev: { meta = { homepage = "http://github.com/hishamhm/datafile"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "A library for handling paths when loading data files"; longDescription = '' datafile is a library for avoiding hardcoded paths @@ -732,7 +753,10 @@ final: prev: { meta = { homepage = "https://github.com/astoff/digestif/"; - license.fullName = "GPLv3+ and other free licenses"; + license = lib.licenses.AND [ + lib.licenses.gpl3Plus + lib.licenses.free + ]; description = "A code analyzer for TeX"; longDescription = '' A code analyzer for TeX documents, including LaTeX and BibTeX. It @@ -767,7 +791,10 @@ final: prev: { meta = { homepage = "https://dkolf.de/dkjson-lua/"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "David Kolf's JSON module for Lua"; longDescription = '' dkjson is a module for encoding and decoding JSON data. It supports UTF-8. @@ -950,7 +977,10 @@ final: prev: { meta = { homepage = "https://github.com/daurnimator/fifo.lua"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "A lua library/'class' that implements a FIFO"; }; } @@ -1371,7 +1401,10 @@ final: prev: { meta = { homepage = "https://github.com/daurnimator/ldbus"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "A Lua library to access dbus."; }; } @@ -1445,7 +1478,10 @@ final: prev: { meta = { homepage = "http://github.com/pavouk/lgi"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Lua bindings to GObject libraries"; longDescription = '' Dynamic Lua binding to any library which is introspectable @@ -1475,7 +1511,10 @@ final: prev: { meta = { homepage = "https://github.com/hoelzro/lua-linenoise"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "A binding for the linenoise command line library"; }; } @@ -1578,7 +1617,7 @@ final: prev: { meta = { homepage = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#lmathx"; maintainers = with lib.maintainers; [ alexshpilkin ]; - license.fullName = "Public domain"; + license = lib.licenses.publicDomain; description = "C99 extensions for the math library"; longDescription = '' An extension of the Lua math library with the functions @@ -1613,7 +1652,7 @@ final: prev: { meta = { homepage = "http://www.circuitwizard.de/lmpfrlib/lmpfrlib.html"; maintainers = with lib.maintainers; [ alexshpilkin ]; - license.fullName = "LGPL"; + license = lib.licenses.free; description = "Lua API for the GNU MPFR library"; longDescription = "The MPFR library is a C library for multi-precision floating-point computations with correct rounding. This extension allows the use of the MPFR library from within Lua."; }; @@ -1681,7 +1720,10 @@ final: prev: { meta = { homepage = "https://www.inf.puc-rio.br/~roberto/lpeg.html"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Parsing Expression Grammars For Lua"; longDescription = '' LPeg is a new pattern-matching library for Lua, based on Parsing @@ -1748,7 +1790,10 @@ final: prev: { meta = { homepage = "https://github.com/sqmedeiros/lpeglabel/"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Parsing Expression Grammars For Lua with Labeled Failures"; longDescription = '' LPegLabel is a conservative extension of the LPeg library that provides @@ -1788,7 +1833,10 @@ final: prev: { meta = { homepage = "https://github.com/rrthomas/lrexlib"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Regular expression library binding (GNU flavour)."; longDescription = '' Lrexlib is a regular expression library for Lua 5.1-5.4, which @@ -1825,7 +1873,10 @@ final: prev: { meta = { homepage = "https://github.com/rrthomas/lrexlib"; maintainers = with lib.maintainers; [ junestepp ]; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Regular expression library binding (oniguruma flavour)."; longDescription = '' Lrexlib is a regular expression library for Lua 5.1-5.4, which @@ -1861,7 +1912,10 @@ final: prev: { meta = { homepage = "https://github.com/rrthomas/lrexlib"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Regular expression library binding (PCRE flavour)."; longDescription = '' Lrexlib is a regular expression library for Lua 5.1-5.4, which @@ -1898,7 +1952,10 @@ final: prev: { meta = { homepage = "https://github.com/rrthomas/lrexlib"; maintainers = with lib.maintainers; [ wishstudio ]; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Regular expression library binding (PCRE2 flavour)."; longDescription = '' Lrexlib is a regular expression library for Lua 5.1-5.4, which @@ -1934,7 +1991,10 @@ final: prev: { meta = { homepage = "https://github.com/rrthomas/lrexlib"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Regular expression library binding (POSIX flavour)."; longDescription = '' Lrexlib is a regular expression library for Lua 5.1-5.4, which @@ -2170,7 +2230,10 @@ final: prev: { meta = { homepage = "https://github.com/Lua-cURL"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Lua binding to libcurl"; longDescription = ""; }; @@ -2231,7 +2294,10 @@ final: prev: { meta = { homepage = "https://github.com/lunarmodules/lua-iconv/"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Lua binding to the iconv"; longDescription = '' Lua binding to the POSIX 'iconv' library, which converts a sequence of @@ -2317,7 +2383,10 @@ final: prev: { meta = { homepage = "https://fperrad.frama.io/lua-MessagePack/"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "a pure Lua implementation of the MessagePack serialization format"; longDescription = '' MessagePack is an efficient binary serialization format. @@ -2512,7 +2581,7 @@ final: prev: { meta = { homepage = "https://github.com/fffonion/lua-resty-openssl"; - license.fullName = "BSD"; + license = lib.licenses.free; description = "No summary"; longDescription = "FFI-based OpenSSL binding for LuaJIT."; }; @@ -2551,7 +2620,7 @@ final: prev: { meta = { homepage = "https://github.com/bungle/lua-resty-session"; - license.fullName = "BSD"; + license = lib.licenses.free; description = "Session Library for OpenResty - Flexible and Secure"; longDescription = "lua-resty-session is a secure, and flexible session library for OpenResty."; }; @@ -2635,7 +2704,10 @@ final: prev: { meta = { homepage = "https://github.com/hoelzro/lua-term"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Terminal functions for Lua"; }; } @@ -2737,7 +2809,10 @@ final: prev: { meta = { homepage = "http://github.com/brimworks/lua-yajl"; maintainers = with lib.maintainers; [ pstn ]; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Integrate the yajl JSON library with Lua."; }; } @@ -2842,7 +2917,10 @@ final: prev: { meta = { homepage = "http://bitop.luajit.org/"; - license.fullName = "MIT/X license"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Lua Bit Operations Module"; longDescription = '' Lua BitOp is a C extension module for Lua 5.1 which adds bitwise operations on numbers. @@ -2997,7 +3075,10 @@ final: prev: { meta = { homepage = "https://github.com/mwild1/luadbi"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Database abstraction layer"; longDescription = '' LuaDBI is a database interface library for Lua. It is designed @@ -3042,7 +3123,10 @@ final: prev: { meta = { homepage = "https://github.com/mwild1/luadbi"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Database abstraction layer"; longDescription = '' LuaDBI is a database interface library for Lua. It is designed @@ -3087,7 +3171,10 @@ final: prev: { meta = { homepage = "https://github.com/mwild1/luadbi"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Database abstraction layer"; longDescription = '' LuaDBI is a database interface library for Lua. It is designed @@ -3132,7 +3219,10 @@ final: prev: { meta = { homepage = "https://github.com/mwild1/luadbi"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Database abstraction layer"; longDescription = '' LuaDBI is a database interface library for Lua. It is designed @@ -3249,7 +3339,10 @@ final: prev: { arobyn flosse ]; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "XML Expat parsing"; longDescription = '' LuaExpat is a SAX (Simple API for XML) XML parser based on the @@ -3285,7 +3378,7 @@ final: prev: { meta = { homepage = "https://github.com/facebook/luaffifb"; - license.fullName = "BSD"; + license = lib.licenses.free; description = "FFI library for calling C functions from lua"; longDescription = ""; }; @@ -3319,7 +3412,10 @@ final: prev: { meta = { homepage = "https://github.com/lunarmodules/luafilesystem"; maintainers = with lib.maintainers; [ flosse ]; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "File System Library for the Lua Programming Language"; longDescription = '' LuaFileSystem is a Lua library developed to complement the set of @@ -3429,7 +3525,10 @@ final: prev: { meta = { homepage = "https://github.com/lunarmodules/lualogging"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "A simple API to use logging features"; longDescription = '' LuaLogging provides a simple API to use logging features in Lua. Its design was @@ -3461,7 +3560,10 @@ final: prev: { meta = { homepage = "http://25thandclement.com/~william/projects/luaossl.html"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Most comprehensive OpenSSL module in the Lua universe."; }; } @@ -3493,7 +3595,10 @@ final: prev: { meta = { homepage = "http://github.com/luaposix/luaposix/"; maintainers = with lib.maintainers; [ lblasc ]; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Lua bindings for POSIX"; longDescription = '' A library binding various POSIX APIs. POSIX is the IEEE Portable @@ -3532,7 +3637,10 @@ final: prev: { meta = { homepage = "https://github.com/dpapavas/luaprompt"; maintainers = with lib.maintainers; [ Freed-Wu ]; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "A Lua command prompt with pretty-printing and auto-completion"; longDescription = '' luaprompt is both an interactive Lua prompt that can be used instead @@ -3593,7 +3701,10 @@ final: prev: { meta = { homepage = "https://github.com/hoelzro/lua-repl"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "A reusable REPL component for Lua, written in Lua"; }; } @@ -3902,7 +4013,10 @@ final: prev: { meta = { homepage = "https://lunarmodules.github.io/luasql/"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Database connectivity for Lua (SQLite3 driver)"; longDescription = '' LuaSQL is a simple interface from Lua to a DBMS. It enables a @@ -4079,7 +4193,7 @@ final: prev: { meta = { homepage = "http://github.com/bluebird75/luaunit"; maintainers = with lib.maintainers; [ lockejan ]; - license.fullName = "BSD"; + license = lib.licenses.free; description = "A unit testing framework for Lua"; longDescription = '' LuaUnit is a popular unit-testing framework for Lua, with an interface typical @@ -4237,7 +4351,10 @@ final: prev: { meta = { homepage = "https://github.com/rktjmp/lush.nvim"; maintainers = with lib.maintainers; [ teto ]; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Define Neovim themes as a DSL in lua, with real-time feedback."; longDescription = '' Lush is a colorscheme creation aid, written in Lua, for Neovim. @@ -4270,7 +4387,7 @@ final: prev: { meta = { homepage = "http://www.tecgraf.puc-rio.br/~lhf/ftp/lua/#luuid"; - license.fullName = "Public domain"; + license = lib.licenses.publicDomain; description = "A library for UUID generation"; longDescription = '' A library for generating universally unique identifiers based on @@ -4306,7 +4423,10 @@ final: prev: { meta = { homepage = "http://github.com/gvvaughan/lyaml"; maintainers = with lib.maintainers; [ lblasc ]; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "libYAML binding for Lua"; longDescription = "Read and write YAML format files with Lua."; }; @@ -4508,7 +4628,10 @@ final: prev: { meta = { homepage = "https://github.com/mpeterv/markdown"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Markdown text-to-html markup system."; longDescription = "A pure-lua implementation of the Markdown text-to-html markup system."; }; @@ -4538,7 +4661,10 @@ final: prev: { meta = { homepage = "http://keplerproject.github.io/md5/"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Checksum library"; longDescription = "MD5 offers checksum facilities for Lua 5.X: a hash (digest) function, a pair crypt/decrypt based on MD5 and CFB, and a pair crypt/decrypt based on DES with 56-bit keys."; }; @@ -4693,7 +4819,10 @@ final: prev: { meta = { homepage = "https://github.com/lunarmodules/lua-mimetypes"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "A simple library for looking up the MIME types of files."; longDescription = '' This is a simple library for guessing a file's MIME type. It includes @@ -5304,7 +5433,10 @@ final: prev: { meta = { homepage = "https://lunarmodules.github.io/penlight"; maintainers = with lib.maintainers; [ alerque ]; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Lua utility libraries loosely based on the Python standard libraries"; longDescription = '' Penlight is a set of pure Lua libraries for making it easier to work with common tasks like @@ -5339,7 +5471,10 @@ final: prev: { meta = { homepage = "http://github.com/nvim-lua/plenary.nvim"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "lua functions you don't want to write "; longDescription = '' plenary: full; complete; entire; absolute; unqualified. All the lua functions I don't want to write twice. @@ -5884,7 +6019,10 @@ final: prev: { meta = { homepage = "http://lua-stdlib.github.io/_debug"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Debug Hints Library"; longDescription = '' Manage an overall debug state, and associated hint substates. @@ -5920,7 +6058,10 @@ final: prev: { meta = { homepage = "https://lua-stdlib.github.io/normalize"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "Normalized Lua Functions"; longDescription = '' This module can inject deterministic versions of core Lua @@ -5959,7 +6100,10 @@ final: prev: { meta = { homepage = "http://lua-stdlib.github.io/lua-stdlib"; - license.fullName = "MIT/X11"; + license = lib.licenses.AND [ + lib.licenses.mit + lib.licenses.x11 + ]; description = "General Lua Libraries"; longDescription = "stdlib is a library of modules for common programming tasks, including list, table and functional operations, objects, pickling, pretty-printing and command-line option parsing."; }; @@ -6292,7 +6436,7 @@ final: prev: { meta = { homepage = "https://github.com/rest-nvim/tree-sitter-http"; - license.fullName = "UNKNOWN"; + license = lib.licenses.unfree; description = "tree-sitter parser for http"; }; } @@ -6445,7 +6589,7 @@ final: prev: { meta = { homepage = "https://github.com/euclidianAce/tree-sitter-teal"; - license.fullName = "UNKNOWN"; + license = lib.licenses.unfree; description = "tree-sitter parser for teal"; }; }