movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-13 05:05:29 +03:00
Code Issues Projects Releases Packages Wiki Activity

luaPackages.bit32: 5.3.0-1 -> 5.3.5.1-1

Browse source 
Switches from the archived lua-compat-5.2 repository to the maintained
lua-compat-5.3 version.
This commit is contained in:
Austin Horstman 2025-04-15 21:52:04 -05:00
parent ae31ceca9d
commit ec2ff51350
No known key found for this signature in database
4 changed files with 11 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

2
maintainers/scripts/luarocks-packages.csv
View file

@ -4,7 +4,7 @@ ansicolors,,,,,,Freed-Wu
argparse,,,,,, argparse,,,,,,
basexx,,,,,, basexx,,,,,,
binaryheap,,,,,,vcunat binaryheap,,,,,,vcunat
bit32,,,,5.3.0-1,5.1,lblasc bit32,,,,,5.1,lblasc
busted,,,,,, busted,,,,,,
busted-htest,,,,,,mrcjkb busted-htest,,,,,,mrcjkb
cassowary,,,,,,alerque cassowary,,,,,,alerque

1 name rockspec ref server version luaversion maintainers
4 argparse
5 basexx
6 binaryheap vcunat
7 bit32 5.3.0-1 5.1 lblasc
8 busted
9 busted-htest mrcjkb
10 cassowary alerque

14
pkgs/development/lua-modules/bit32.patch
View file

@ -1,14 +0,0 @@
diff -Naur lua-compat-5.2/c-api/compat-5.2.h lua-compat-5.2-patched/c-api/compat-5.2.h
--- lua-compat-5.2/c-api/compat-5.2.h 2015-02-19 09:23:42.000000000 +1100
+++ lua-compat-5.2-patched/c-api/compat-5.2.h 2019-06-17 17:58:13.585361793 +1000
@@ -146,8 +146,10 @@
#define lua_pushglobaltable(L) \
lua_pushvalue(L, LUA_GLOBALSINDEX)
+#if !defined(luaL_newlib)
#define luaL_newlib(L, l) \
(lua_newtable((L)),luaL_setfuncs((L), (l), 0))
+#endif
void luaL_checkversion (lua_State *L);

21
pkgs/development/lua-modules/generated-packages.nix
View file

@ -169,32 +169,31 @@ final: prev: {
bit32 = callPackage ( bit32 = callPackage (
{ {
buildLuarocksPackage, buildLuarocksPackage,
fetchFromGitHub,
fetchurl, fetchurl,
fetchzip,
luaAtLeast,
luaOlder, luaOlder,
}: }:
buildLuarocksPackage { buildLuarocksPackage {
pname = "bit32"; pname = "bit32";
version = "5.3.0-1"; version = "5.3.5.1-1";
knownRockspec = knownRockspec =
(fetchurl { (fetchurl {
url = "mirror://luarocks/bit32-5.3.0-1.rockspec"; url = "mirror://luarocks/bit32-5.3.5.1-1.rockspec";
sha256 = "1d6xdihpksrj5a3yvsvnmf3vfk15hj6f8n1rrs65m7adh87hc0yd"; sha256 = "11mg0hmmil92hkwamm91ghih6ys9pqsakx0z9jgnqxymnl887j51";
}).outPath; }).outPath;
src = fetchFromGitHub { src = fetchzip {
owner = "keplerproject"; url = "https://github.com/keplerproject/lua-compat-5.3/archive/v0.10.zip";
repo = "lua-compat-5.2"; sha256 = "1caxn228gx48g6kymp9w7kczgxcg0v0cd5ixsx8viybzkd60dcn4";
rev = "bitlib-5.3.0";
hash = "sha256-Ek7FMWskfHwHhEVfjTDZyL/cruHDiQo5Jmnwsvai+MY=";
}; };
disabled = luaOlder "5.1"; disabled = luaOlder "5.1" || luaAtLeast "5.5";
meta = { meta = {
homepage = "http://www.lua.org/manual/5.2/manual.html#6.7"; homepage = "http://www.lua.org/manual/5.2/manual.html#6.7";
description = "Lua 5.2 bit manipulation library"; description = "Lua 5.2 bit manipulation library";
maintainers = with lib.maintainers; [ lblasc ]; maintainers = with lib.maintainers; [ lblasc ];
license.fullName = "MIT/X11"; license.fullName = "MIT";
}; };
} }
) { }; ) { };

10
pkgs/development/lua-modules/overrides.nix
View file

@ -86,16 +86,6 @@ in
##########################################3 ##########################################3
#### manual fixes for generated packages #### manual fixes for generated packages
##########################################3 ##########################################3
bit32 = prev.bit32.overrideAttrs (oa: {
# Small patch in order to no longer redefine a Lua 5.2 function that Luajit
# 2.1 also provides, see https://github.com/LuaJIT/LuaJIT/issues/325 for
# more
patches = [
./bit32.patch
];
meta.broken = luaOlder "5.1" || luaAtLeast "5.4";
});
busted = prev.busted.overrideAttrs (oa: { busted = prev.busted.overrideAttrs (oa: {
nativeBuildInputs = oa.nativeBuildInputs ++ [ nativeBuildInputs = oa.nativeBuildInputs ++ [
installShellFiles installShellFiles