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

doc/hooks/installShellFiles.section.md

+7 −12

Original line number	Diff line number	Diff line
		@@ -99,17 +99,12 @@ failure. To prevent this, guard the completion generation commands.
		```nix
		{
		nativeBuildInputs = [ installShellFiles ];
		postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) (
		let
		emulator = stdenv.hostPlatform.emulator buildPackages;
		in
		''
		postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
		# using named fd
		installShellCompletion --cmd foobar \
		--bash <(${emulator} $out/bin/foobar --bash-completion) \
		--fish <(${emulator} $out/bin/foobar --fish-completion) \
		--zsh <(${emulator} $out/bin/foobar --zsh-completion)
		''
		);
		--bash <($out/bin/foobar --bash-completion) \
		--fish <($out/bin/foobar --fish-completion) \
		--zsh <($out/bin/foobar --zsh-completion)
		'';
		}
		```

nixos/doc/manual/release-notes/rl-2505.section.md

+4 −0

Original line number	Diff line number	Diff line
		@@ -354,6 +354,10 @@

		- `python3Packages.jaeger-client` was removed because it was deprecated upstream. [OpenTelemetry](https://opentelemetry.io) is the recommended replacement.

		- `rocmPackages_6` has been updated to ROCm 6.3.

		- `rocmPackages_5` has been removed.

		- `rocmPackages.rocm-thunk` has been removed and its functionality has been integrated with the ROCm CLR. Use `rocmPackages.clr` instead.

		- `rocmPackages.clang-ocl` has been removed. [It was deprecated by AMD in 2023.](https://github.com/ROCm/clang-ocl)

nixos/tests/installed-tests/libxmlb.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -2,4 +2,10 @@

		makeInstalledTest {
		tested = pkgs.libxmlb;

		testConfig = {
		environment.variables = {
		G_TEST_SRCDIR = "${pkgs.libxmlb.installedTests}/libexec/installed-tests/libxmlb";
		};
		};
		}

nixos/tests/lomiri-calendar-app.nix

+17 −4

Original line number	Diff line number	Diff line
		@@ -44,23 +44,33 @@

		with subtest("lomiri calendar launches"):
		machine.succeed("lomiri-calendar-app >&2 &")
		machine.wait_for_text(r"(January\|February\|March\|April\|May\|June\|July\|August\|September\|October\|November\|December)")
		machine.sleep(10)
		machine.send_key("alt-f10")
		machine.sleep(2)
		# Default page is unbearably slow to OCR on, switch to another
		machine.succeed("xdotool mousemove 580 50 click 1")
		machine.sleep(2)
		machine.wait_for_text(r"(January\|February\|March\|April\|May\|June\|July\|August\|September\|October\|November\|December\|Mon\|Tue\|Wed\|Thu\|Fri\|Sat\|Sun)")
		machine.screenshot("lomiri-calendar")

		with subtest("lomiri calendar works"):
		# Switch to Agenda tab, less busy
		machine.succeed("xdotool mousemove 300 50 click 1")
		machine.succeed("xdotool mousemove 380 50 click 1")
		machine.sleep(2)

		# Still on main page
		machine.succeed("xdotool mousemove 500 650 click 1")
		machine.succeed("xdotool mousemove 500 720 click 1")
		machine.sleep(2)
		machine.wait_for_text(r"(Date\|Monday\|Tuesday\|Wednesday\|Thursday\|Friday\|Saturday\|Sunday\|All day\|Name\|Details\|More)")
		machine.screenshot("lomiri-calendar_newevent")

		# On New Event page
		machine.succeed("xdotool mousemove 500 230 click 1")
		machine.sleep(2)
		machine.send_chars("foobar")
		machine.sleep(2) # make sure they're actually in there
		machine.succeed("xdotool mousemove 780 40 click 1")
		machine.succeed("xdotool mousemove 1000 40 click 1")
		machine.sleep(2)
		machine.wait_for_text("Agenda")
		machine.screenshot("lomiri-calendar_eventadded")

		@@ -73,6 +83,9 @@

		with subtest("lomiri calendar localisation works"):
		machine.succeed("env LANG=de_DE.UTF-8 lomiri-calendar-app >&2 &")
		machine.sleep(10)
		machine.send_key("alt-f10")
		machine.sleep(2)
		machine.wait_for_text(r"(Montag\|Dienstag\|Mittwoch\|Donnerstag\|Freitag\|Samstag\|Sonntag)")
		machine.screenshot("lomiri-calendar_localised")
		'';

nixos/tests/lomiri-camera-app.nix

+26 −6

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@

		testScript =
		let
		qrLabel = "Image";
		qrLabel = "Feed";
		qrContent = "Test";
		in
		''
		@@ -55,6 +55,10 @@

		with subtest("lomiri camera launches"):
		machine.succeed("lomiri-camera-app >&2 &")
		machine.wait_for_console_text("updateViewfinderResolution: viewfinder resolutions is not known yet")
		machine.sleep(10)
		machine.send_key("alt-f10")
		machine.sleep(5)
		machine.wait_for_text("Cannot access")
		machine.screenshot("lomiri-camera_open")

		@@ -64,21 +68,26 @@
		machine.succeed("modprobe v4l2loopback video_nr=10 card_label=Video-Loopback exclusive_caps=1")
		machine.succeed("qrtool encode '${qrContent}' -s 20 -m 10 > qr.png")
		# Horizontal flip, add text, flip back. Camera displays image mirrored, so need reversed text for OCR
		machine.succeed("magick qr.png -flop -pointsize 70 -fill black -annotate +100+100 '${qrLabel}' -flop output.png")
		machine.succeed("magick qr.png -flop -pointsize 30 -fill black -annotate +100+100 '${qrLabel}' -flop output.png")
		machine.succeed("ffmpeg -re -loop 1 -i output.png -vf format=yuv420p -f v4l2 /dev/video10 -loglevel fatal >&2 &")

		with subtest("lomiri camera uses camera"):
		machine.succeed("lomiri-camera-app >&2 &")
		machine.wait_for_console_text("updateViewfinderResolution: For target resolution")
		machine.sleep(10)
		machine.send_key("alt-f10")
		machine.sleep(5)
		machine.wait_for_text("${qrLabel}")
		machine.screenshot("lomiri-camera_feed")

		machine.succeed("xdotool mousemove 320 610 click 1") # take photo
		machine.wait_until_succeeds("find /root/Pictures/camera.ubports -name '*.jpg'")
		machine.succeed("xdotool mousemove 510 670 click 1") # take photo
		machine.wait_until_succeeds("ls /root/Pictures/camera.ubports \| grep '\\.jpg$'")

		# Check that the image is correct
		machine.send_key("ctrl-alt-right")
		machine.succeed("magick /root/Pictures/camera.ubports/IMG_00000001.jpg -flop photo_flip.png")
		machine.succeed("feh photo_flip.png >&2 &")
		machine.sleep(10)
		machine.wait_for_text("${qrLabel}")
		machine.screenshot("lomiri-camera_photo")

		@@ -88,18 +97,25 @@

		with subtest("lomiri barcode scanner uses camera"):
		machine.succeed("lomiri-camera-app --mode=barcode-reader >&2 &")
		machine.wait_for_console_text("updateViewfinderResolution: For target resolution")
		machine.sleep(10)
		machine.send_key("alt-f10")
		machine.sleep(5)
		machine.wait_for_text("${qrLabel}")
		machine.succeed("xdotool mousemove 320 610 click 1") # open up QR decode result
		machine.succeed("xdotool mousemove 510 670 click 1") # open up QR decode result

		# OCR is struggling to recognise the text. Click the clipboard button and paste the result somewhere else
		machine.sleep(5)
		machine.screenshot("lomiri-barcode_decode")
		machine.succeed("xdotool mousemove 350 530 click 1")
		machine.succeed("xdotool mousemove 540 590 click 1")
		machine.sleep(5)

		# Need to make a new window without closing camera app, otherwise clipboard content gets lost?
		machine.send_key("ctrl-alt-right")
		machine.succeed("gnome-text-editor >&2 &")
		machine.sleep(10)
		machine.send_key("alt-f10")
		machine.sleep(5)
		machine.wait_for_text("New")

		# Font size up to help with OCR
		@@ -129,6 +145,10 @@

		with subtest("lomiri camera localisation works"):
		machine.succeed("env LANG=de_DE.UTF-8 lomiri-camera-app >&2 &")
		machine.wait_for_console_text("updateViewfinderResolution: For target resolution")
		machine.sleep(10)
		machine.send_key("alt-f10")
		machine.sleep(5)
		machine.wait_for_text("Kamera")
		machine.screenshot("lomiri-camera_localised")
		'';

Admin message