gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge staging-next into staging

Browse Source
This commit is contained in:
nixpkgs-ci[bot]
2026-05-26 00:43:00 +00:00
committed by GitHub
parent e698b5cc76 caf3bd82f0
commit 5c516d1cc2
109 changed files with 7239 additions and 550 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/lua-modules/generated-packages.nix
+37
View File
@@ -1807,6 +1807,43 @@ final: prev: {
}
) { };
lrexlib-pcre2 = callPackage (
{
buildLuarocksPackage,
fetchFromGitHub,
fetchurl,
luaOlder,
}:
buildLuarocksPackage {
pname = "lrexlib-pcre2";
version = "2.9.2-1";
knownRockspec =
(fetchurl {
url = "mirror://luarocks/lrexlib-pcre2-2.9.2-1.rockspec";
sha256 = "181878m8gq9wl7c4h9rsq1iig70n9rmyfbj86swz1v4vi7s7ks9p";
}).outPath;
src = fetchFromGitHub {
owner = "rrthomas";
repo = "lrexlib";
rev = "rel-2-9-2";
hash = "sha256-DzNDve+xeKb+kAcW+o7GK/RsoDhaDAVAWAhgjISCyZc=";
};
disabled = luaOlder "5.1";
meta = {
homepage = "https://github.com/rrthomas/lrexlib";
maintainers = with lib.maintainers; [ wishstudio ];
license.fullName = "MIT/X11";
description = "Regular expression library binding (PCRE2 flavour).";
longDescription = ''
Lrexlib is a regular expression library for Lua 5.1-5.4, which
provides bindings for several regular expression libraries.
This rock provides the PCRE2 bindings.'';
};
}
) { };
lrexlib-posix = callPackage (
{
buildLuarocksPackage,
pkgs/development/lua-modules/lgi/glib-2.88.patch
+146
View File
@@ -0,0 +1,146 @@
At time of writing this is equivalent to https://github.com/lgi-devs/lgi/pull/361.patch?full_index=1
The only difference is that this diff does not include the *tests/progress.lua* changes since that file does not exist in the source used by *nixpkgs*.
--- a/lgi/ffi.lua
+++ b/lgi/ffi.lua
@@ -74,19 +74,39 @@
end
-- Creates new enum/flags table with all values from specified gtype.
+--
+-- Fixes https://github.com/lgi-devs/lgi/issues/358
+--
+-- Implementation for the fix was mirrored from the LGI fork:
+-- https://github.com/vtrlx/LuaGObject/blob/0.10.5/LuaGObject/ffi.lua#L74-L104
function ffi.load_enum(gtype, name)
- local GObject = core.repo.GObject
+ local GLib, GObject = core.repo.GLib, core.repo.GObject
local is_flags = GObject.Type.is_a(gtype, GObject.Type.FLAGS)
local enum_component = component.create(
gtype, is_flags and enum.bitflags_mt or enum.enum_mt, name)
- local type_class = GObject.TypeClass.ref(gtype)
+ local type_class
+ -- GLib >= 2.86 deprecates GObject.TypeClass.ref() in favour of .get()
+ if GLib.check_version(2, 86, 0) then
+ type_class = GObject.TypeClass.ref(gtype)
+ else
+ type_class = GObject.TypeClass.get(gtype)
+ end
local enum_class = core.record.cast(
type_class, is_flags and GObject.FlagsClass or GObject.EnumClass)
- for i = 0, enum_class.n_values - 1 do
- local val = core.record.fromarray(enum_class.values, i)
- enum_component[core.upcase(val.value_nick):gsub('%-', '_')] = val.value
+ if GLib.check_version(2, 87, 0) then
+ for i = 0, enum_class.n_values - 1 do
+ local val = core.record.fromarray(enum_class.values, i)
+ enum_component[core.upcase(val.value_nick):gsub('%-', '_')] = val.value
+ end
+ else
+ for _, val in ipairs(enum_class.values) do
+ enum_component[core.upcase(val.value_nick):gsub('%-', '_')] = val.value
+ end
+ end
+ -- For GLib versions below 2.86, type_class was ref'd and needs to be unref'd
+ if GLib.check_version(2, 86, 0) then
+ type_class:unref()
end
- type_class:unref()
return enum_component
end
--- a/lgi/ffi.lua
+++ b/lgi/ffi.lua
@@ -74,18 +74,12 @@
end
-- Creates new enum/flags table with all values from specified gtype.
---
--- Fixes https://github.com/lgi-devs/lgi/issues/358
---
--- Implementation for the fix was mirrored from the LGI fork:
--- https://github.com/vtrlx/LuaGObject/blob/0.10.5/LuaGObject/ffi.lua#L74-L104
function ffi.load_enum(gtype, name)
local GLib, GObject = core.repo.GLib, core.repo.GObject
local is_flags = GObject.Type.is_a(gtype, GObject.Type.FLAGS)
local enum_component = component.create(
gtype, is_flags and enum.bitflags_mt or enum.enum_mt, name)
local type_class
- -- GLib >= 2.86 deprecates GObject.TypeClass.ref() in favour of .get()
if GLib.check_version(2, 86, 0) then
type_class = GObject.TypeClass.ref(gtype)
else
@@ -103,7 +97,6 @@
enum_component[core.upcase(val.value_nick):gsub('%-', '_')] = val.value
end
end
- -- For GLib versions below 2.86, type_class was ref'd and needs to be unref'd
if GLib.check_version(2, 86, 0) then
type_class:unref()
end
--- a/lgi/ffi.lua
+++ b/lgi/ffi.lua
@@ -80,6 +80,7 @@
local enum_component = component.create(
gtype, is_flags and enum.bitflags_mt or enum.enum_mt, name)
local type_class
+ -- GLib >= 2.86 deprecates GObject.TypeClass.ref() in favour of .get()
if GLib.check_version(2, 86, 0) then
type_class = GObject.TypeClass.ref(gtype)
else
@@ -97,6 +98,7 @@
enum_component[core.upcase(val.value_nick):gsub('%-', '_')] = val.value
end
end
+ -- For GLib versions below 2.86, type_class was ref'd and needs to be unref'd
if GLib.check_version(2, 86, 0) then
type_class:unref()
end
--- a/tests/pango.lua
+++ b/tests/pango.lua
@@ -35,8 +35,24 @@
local offset = items[i].offset
local length = items[i].length
local analysis = items[i].analysis
- local pgs = Pango.GlyphString()
- Pango.shape(string.sub(s,1+offset), length, analysis, pgs)
+ --
+ -- Fixes https://github.com/lgi-devs/lgi/issues/336
+ --
+ -- Implementation for the fix was a combination
+ -- of ideas from:
+ --
+ -- 1) my own investigation plus trial-error
+ -- 2) the comment: https://github.com/lgi-devs/lgi/issues/336#issuecomment-2888361271
+ -- 3) the LGI fork: https://github.com/vtrlx/LuaGObject/blob/0.10.5/tests/pango.lua#L38-L39
+ --
+ local pgs
+ if Pango.version_check(1, 56, 2) then
+ pgs = Pango.GlyphString()
+ Pango.shape(string.sub(s,1+offset), length, analysis, pgs)
+ else
+ pgs = Pango.shape(string.sub(s,1+offset), length, analysis)
+ end
+
-- Pull out individual glyphs with pgs.glyphs
local glyphs = pgs.glyphs
check(type(glyphs) == 'table')
--- a/tests/pango.lua
+++ b/tests/pango.lua
@@ -35,16 +35,6 @@
local offset = items[i].offset
local length = items[i].length
local analysis = items[i].analysis
- --
- -- Fixes https://github.com/lgi-devs/lgi/issues/336
- --
- -- Implementation for the fix was a combination
- -- of ideas from:
- --
- -- 1) my own investigation plus trial-error
- -- 2) the comment: https://github.com/lgi-devs/lgi/issues/336#issuecomment-2888361271
- -- 3) the LGI fork: https://github.com/vtrlx/LuaGObject/blob/0.10.5/tests/pango.lua#L38-L39
- --
local pgs
if Pango.version_check(1, 56, 2) then
pgs = Pango.GlyphString()
pkgs/development/lua-modules/overrides.nix
+14 -7
View File
@@ -45,6 +45,7 @@
openldap,
openssl,
pcre,
pcre2,
pkg-config,
readline,
ripgrep,
@@ -303,13 +304,10 @@ in
sha256 = "0gfvvbri9kyzhvq3bvdbj2l6mwvlz040dk4mrd5m9gz79f7w109c";
})
# https://github.com/lgi-devs/lgi/issues/346
# https://gitlab.archlinux.org/archlinux/packaging/packages/lgi/-/issues/1
(fetchpatch {
name = "glib-2.86.0.patch";
url = "https://gitlab.archlinux.org/archlinux/packaging/packages/lgi/-/raw/05a0c9df75883da235bacd4379b769e7d7713fb9/0001-Use-TypeClass.get-instead-of-.ref.patch";
hash = "sha256-Z1rNv0VzVrK41rV73KiPXq9yLaNxbTOFiSd6eLZyrbY=";
})
# https://github.com/lgi-devs/lgi/issues/362
# https://github.com/lgi-devs/lgi/pull/361
# https://github.com/NixOS/nixpkgs/issues/523345
./lgi/glib-2.88.patch
];
# https://github.com/lgi-devs/lgi/pull/300
@@ -438,6 +436,15 @@ in
];
};
lrexlib-pcre2 = prev.lrexlib-pcre2.overrideAttrs {
externalDeps = [
{
name = "PCRE2";
dep = pcre2;
}
];
};
lrexlib-posix = prev.lrexlib-posix.overrideAttrs (old: {
buildInputs = old.buildInputs ++ [
(lib.getDev libc)