From e79618d2286e15df4892b907b8f5fe63ebf4e62b Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Fri, 8 May 2026 07:13:11 +0000 Subject: Adding metadata --- sys-apps/nix/files/nix-meson-1.11.patch | 62 ++++++++++++++++++++++++++++++++ sys-apps/nix/nix-2.34.7.ebuild | 2 ++ sys-apps/systemd/systemd-259.4-r1.ebuild | 1 - sys-apps/systemd/systemd-260.1.ebuild | 1 - sys-apps/systemd/systemd-9999.ebuild | 1 - 5 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 sys-apps/nix/files/nix-meson-1.11.patch (limited to 'sys-apps') diff --git a/sys-apps/nix/files/nix-meson-1.11.patch b/sys-apps/nix/files/nix-meson-1.11.patch new file mode 100644 index 000000000000..e2607c63f018 --- /dev/null +++ b/sys-apps/nix/files/nix-meson-1.11.patch @@ -0,0 +1,62 @@ +--- nix-2.34.7/doc/manual/meson.build~ 2026-05-05 23:25:31.727208534 +0800 ++++ nix-2.34.7/doc/manual/meson.build 2026-05-05 23:38:59.070126431 +0800 +@@ -106,11 +106,11 @@ + + # Hacky way to figure out if `nix` is an `ExternalProgram` or + # `Executable`. Only the latter can occur in custom target input lists. +-if nix.full_path().startswith(meson.build_root()) +- nix_input = nix +-else +- nix_input = [] +-endif ++# if nix.full_path().startswith(meson.build_root()) ++# nix_input = nix ++# else ++# nix_input = [] ++# endif + + # HTML manual build (conditional) + if get_option('html-manual') +@@ -160,7 +160,6 @@ + rl_next_generated, + summary_rl_next, + json_schema_generated_files, +- nix_input, + ], + output : [ + 'manual', +@@ -247,7 +246,6 @@ + input : [ + files('./render-manpage.sh'), + files('./expand-includes.py'), +- nix_input, + ], + output : command[0] + '-' + page + '.1', + install : true, +@@ -370,7 +368,6 @@ + files('./render-manpage.sh'), + files('./expand-includes.py'), + nix3_cli_files, +- nix_input, + ], + output : page + '.1', + install : true, +@@ -425,7 +422,6 @@ + files('./render-manpage.sh'), + files('./expand-includes.py'), + entry.get(3, []), +- nix_input, + ], + output : '@0@.@1@'.format(entry[0], entry[1]), + install : true, +--- nix-2.34.7/src/nix-functional-tests/meson.build~ 2026-05-05 01:22:33.000000000 +0800 ++++ nix-2.34.7/src/nix-functional-tests/meson.build 2026-05-05 23:51:52.004873253 +0800 +@@ -276,7 +276,7 @@ + # them more time than the default of 30 seconds. + timeout : 300, + # Used for target dependency/ordering tracking, not adding compiler flags or anything. +- depends : deps, ++ # depends : deps, + workdir : workdir, + ) + endforeach diff --git a/sys-apps/nix/nix-2.34.7.ebuild b/sys-apps/nix/nix-2.34.7.ebuild index a8826aed2828..390731a43758 100644 --- a/sys-apps/nix/nix-2.34.7.ebuild +++ b/sys-apps/nix/nix-2.34.7.ebuild @@ -100,6 +100,8 @@ pkg_pretend() { src_prepare() { default + eapply -p1 $FILESDIR/nix-meson-1.11.patch + # inject our copy of lowdown-nix export PKG_CONFIG_PATH="${PKG_CONFIG_PATH}${PKG_CONFIG_PATH:+:}${EPREFIX}/usr/$(get_libdir)/lowdown-nix/lib/pkgconfig" export PATH="$PATH:${EPREFIX}/usr/$(get_libdir)/lowdown-nix/bin" diff --git a/sys-apps/systemd/systemd-259.4-r1.ebuild b/sys-apps/systemd/systemd-259.4-r1.ebuild index 174fd972e7a1..523c709d1004 100644 --- a/sys-apps/systemd/systemd-259.4-r1.ebuild +++ b/sys-apps/systemd/systemd-259.4-r1.ebuild @@ -230,7 +230,6 @@ pkg_pretend() { ~CGROUP_BPF ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS ~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS - ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2" diff --git a/sys-apps/systemd/systemd-260.1.ebuild b/sys-apps/systemd/systemd-260.1.ebuild index 155c99b8ea45..c04d1a8f16ab 100644 --- a/sys-apps/systemd/systemd-260.1.ebuild +++ b/sys-apps/systemd/systemd-260.1.ebuild @@ -206,7 +206,6 @@ pkg_pretend() { ~CGROUP_BPF ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS ~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS - ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2" diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild index cdf1a41de7ba..d9c8126b4ef9 100644 --- a/sys-apps/systemd/systemd-9999.ebuild +++ b/sys-apps/systemd/systemd-9999.ebuild @@ -206,7 +206,6 @@ pkg_pretend() { ~CGROUP_BPF ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE ~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS ~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS - ~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED ~!SYSFS_DEPRECATED_V2" -- cgit v1.3.1