Merge branch 'master' into staging-next (18dd5820) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -20010,6 +20010,12 @@
		githubId = 13752145;
		name = "Richard Lupton";
		};
		rlwrnc = {
		email = "raymond.lawrence@tutanota.com";
		github = "rlwrnc";
		githubId = 95446597;
		name = "Raymond Lawrence";
		};
		rmcgibbo = {
		email = "rmcgibbo@gmail.com";
		matrix = "@rmcgibbo:matrix.org";

+2 −1

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@ in
		{
		options.programs.mosh = {
		enable = lib.mkEnableOption "mosh";
		package = lib.mkPackageOption pkgs "mosh" { };
		openFirewall = lib.mkEnableOption "" // {
		description = "Whether to automatically open the necessary ports in the firewall.";
		default = true;
		@@ -29,7 +30,7 @@ in
		};

		config = lib.mkIf cfg.enable {
		environment.systemPackages = [ pkgs.mosh ];
		environment.systemPackages = [ cfg.package ];
		networking.firewall.allowedUDPPortRanges = lib.optional cfg.openFirewall {
		from = 60000;
		to = 61000;

+1 −0

Original line number	Diff line number	Diff line
		@@ -954,6 +954,7 @@ in {
		seatd = handleTest ./seatd.nix {};
		send = runTest ./send.nix;
		service-runner = handleTest ./service-runner.nix {};
		servo = runTest ./servo.nix;
		shadps4 = runTest ./shadps4.nix;
		sftpgo = runTest ./sftpgo.nix;
		sfxr-qt = handleTest ./sfxr-qt.nix {};

0 → 100644

+28 −0

Original line number	Diff line number	Diff line
		{
		lib,
		pkgs,
		...
		}:
		{
		name = "servo";

		meta.maintainers = with lib.maintainers; [ hexa ];

		nodes.machine = {
		imports = [ ./common/x11.nix ];

		environment.systemPackages = with pkgs; [ servo ];
		};

		enableOCR = true;

		testScript = ''
		machine.wait_for_x()

		with subtest("Wait until Servo has finished loading the Valgrind docs page"):
		machine.execute("xterm -e 'servo file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html' >&2 &");
		machine.wait_for_window("Valgrind")
		machine.wait_for_text("Quick Start Guide")
		'';

		}

+2 −2

Original line number	Diff line number	Diff line
		@@ -13,13 +13,13 @@

		stdenv.mkDerivation rec {
		pname = "ft2-clone";
		version = "1.93";
		version = "1.94";

		src = fetchFromGitHub {
		owner = "8bitbubsy";
		repo = "ft2-clone";
		rev = "v${version}";
		hash = "sha256-B91kLShg3nvOyOlBkLSpTydhUs5yHa+C/OWe8N+MB9c=";
		hash = "sha256-WRHZVn83s4mGoyhd9wvP2hp2DDufXk5mrXrPuN6cdf0=";
		};

		nativeBuildInputs = [ cmake ];