Merge master into staging-next (99c02daf) · Commits · nix / nixpkgs

doc/packages/index.md

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ lhapdf.section.md
		locales.section.md
		etc-files.section.md
		nginx.section.md
		nrfutil.section.md
		opengl.section.md
		shell-helpers.section.md
		python-tree-sitter.section.md

doc/packages/nrfutil.section.md

0 → 100644

+13 −0

Original line number	Diff line number	Diff line
		# nrfutil {#sec-nrfutil}

		nrfutil can be built with its installables as following:

		```nix
		(nrfutil.withExtensions [
		"nrfutil-completion"
		"nrfutil-device"
		"nrfutil-trace"
		])
		```

		Keep in mind that all installables might not be available for every supported platform.

doc/redirects.json

+3 −0

Original line number	Diff line number	Diff line
		@@ -325,6 +325,9 @@
		"sec-nixpkgs-release-25.05-notable-changes": [
		"release-notes.html#sec-nixpkgs-release-25.05-notable-changes"
		],
		"sec-nrfutil": [
		"index.html#sec-nrfutil"
		],
		"sec-overlays-install": [
		"index.html#sec-overlays-install"
		],

nixos/modules/programs/kdeconnect.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -25,7 +25,7 @@
		cfg = config.programs.kdeconnect;
		in
		lib.mkIf cfg.enable {
		environment.systemPackages = lib.optional (cfg.package != null) [
		environment.systemPackages = lib.optionals (cfg.package != null) [
		cfg.package
		];
		networking.firewall = rec {

pkgs/applications/office/libreoffice/default.nix

+7 −23

Original line number	Diff line number	Diff line
		@@ -315,7 +315,7 @@ stdenv.mkDerivation (finalAttrs: {
		./readd-explicit-zlib-link.patch

		]
		++ lib.optionals (lib.versionOlder version "25.8") [
		++ lib.optionals (variant == "collabora") [
		# Backport patch to fix build with Poppler 25.05
		(fetchpatch2 {
		url = "https://github.com/LibreOffice/core/commit/0ee2636304ac049f21415c67e92040f7d6c14d35.patch";
		@@ -323,13 +323,6 @@ stdenv.mkDerivation (finalAttrs: {
		hash = "sha256-8yipl5ln1yCNfVM8SuWowsw1Iy/SXIwbdT1ZfNw4cJA=";
		})
		]
		++ lib.optionals (lib.versionOlder version "24.8") [
		(fetchpatch2 {
		name = "icu74-compat.patch";
		url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/main/libreoffice-7.5.8.2-icu-74-compatibility.patch?ref_type=heads.patch";
		hash = "sha256-OGBPIVQj8JTYlkKywt4QpH7ULAzKmet5jTLztGpIS0Y=";
		})
		]
		++ lib.optionals (variant == "collabora") [
		./fix-unpack-collabora.patch
		];
		@@ -594,6 +587,11 @@ stdenv.mkDerivation (finalAttrs: {

		# cannot find headers, no idea why
		"--without-system-boost"

		"--with-system-rhino"
		"--with-rhino-jar=${rhino}/share/java/js.jar"

		"--without-system-java-websocket"
		]
		++ optionals kdeIntegration [
		"--enable-kf6"
		@@ -603,21 +601,7 @@ stdenv.mkDerivation (finalAttrs: {
		"--with-system-beanshell"
		"--with-ant-home=${ant.home}"
		"--with-beanshell-jar=${bsh}"
		]
		++ (
		if variant == "fresh" \|\| variant == "collabora" then
		[
		"--with-system-rhino"
		"--with-rhino-jar=${rhino}/share/java/js.jar"

		"--without-system-java-websocket"
		]
		else
		[
		# our Rhino is too new for older versions
		"--without-system-rhino"
		]
		);
		];

		env = {
		# FIXME: this is a hack, because the right cflags are not being picked up