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

maintainers/maintainer-list.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -9041,6 +9041,12 @@
		fingerprint = "74F5 E5CC 19D3 B5CB 608F 6124 68FF 81E6 A785 0F49";
		}];
		};
		lizelive = {
		email = "nixpkgs@lize.live";
		github = "lizelive";
		githubId = 40217331;
		name = "LizeLive";
		};
		lluchs = {
		email = "lukas.werling@gmail.com";
		github = "lluchs";

+6 −2

Original line number	Diff line number	Diff line
		@@ -19,6 +19,10 @@ import ./make-test-python.nix ({ pkgs, ... }: {
		enable = true;
		port = 18545;
		};
		authrpc = {
		enable = true;
		port = 18551;
		};
		};
		};

		@@ -31,11 +35,11 @@ import ./make-test-python.nix ({ pkgs, ... }: {
		machine.wait_for_open_port(18545)

		machine.succeed(
		'geth attach --exec eth.blockNumber http://localhost:8545 \| grep \'^0$\' '
		'geth attach --exec "eth.blockNumber" http://localhost:8545 \| grep \'^0$\' '
		)

		machine.succeed(
		'geth attach --exec "eth.chainId()" http://localhost:18545 \| grep \'"0x5"\' '
		'geth attach --exec "eth.blockNumber" http://localhost:18545 \| grep \'^0$\' '
		)
		'';
		})

+13 −5

Original line number	Diff line number	Diff line
		@@ -87,15 +87,23 @@ import ./make-test-python.nix ({ pkgs, ... }: {
		return etag


		def wait_for_nginx_on_port(port):
		webserver.wait_for_unit("nginx")
		webserver.wait_for_open_port(80)
		webserver.wait_for_open_port(port)


		# nginx can be ready before multi-user.target, in which case switching to
		# a different configuration might not realize it needs to restart nginx.
		webserver.wait_for_unit("multi-user.target")

		wait_for_nginx_on_port(80)

		with subtest("check ETag if serving Nix store paths"):
		old_etag = check_etag()
		webserver.succeed(
		"${etagSystem}/bin/switch-to-configuration test >&2"
		)
		webserver.sleep(1)
		wait_for_nginx_on_port(80)
		new_etag = check_etag()
		assert old_etag != new_etag

		@@ -103,7 +111,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
		webserver.succeed(
		"${justReloadSystem}/bin/switch-to-configuration test >&2"
		)
		webserver.wait_for_open_port(8080)
		wait_for_nginx_on_port(8080)
		webserver.fail("journalctl -u nginx \| grep -q -i stopped")
		webserver.succeed("journalctl -u nginx \| grep -q -i reloaded")

		@@ -111,7 +119,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
		webserver.succeed(
		"${reloadRestartSystem}/bin/switch-to-configuration test >&2"
		)
		webserver.wait_for_unit("nginx")
		wait_for_nginx_on_port(80)
		webserver.succeed("journalctl -u nginx \| grep -q -i stopped")

		with subtest("nixos-rebuild --switch should fail when there are configuration errors"):

+6 −8

Original line number	Diff line number	Diff line
		{ rustPlatform
		{ lib
		, rustPlatform
		, fetchFromGitHub
		, pkg-config
		, dbus
		, protobuf
		, lib
		}:

		rustPlatform.buildRustPackage rec {
		pname = "pbpctrl";

		# https://github.com/qzed/pbpctrl/issues/4
		version = "unstable-2023-02-07";
		version = "0.1.3";

		src = fetchFromGitHub {
		owner = "qzed";
		repo = "${pname}";
		rev = "9fef4bb88046a9f00719b189f8e378c8dbdb8ee6";
		hash = "sha256-8YbsBqqITJ9bKzbGX6d/CSBb8wzr6bDzy8vsyntL1CA=";
		rev = "v${version}";
		hash = "sha256-CYroQb6x2d4ay3RZUSiSrcGDF0IL3ETZtHAFt18sa5s=";
		};

		cargoHash = "sha256-ZxJjjaT/ZpEPxvO42UWBy3xW/V5dhXGsKn3KmuM89YA==";
		cargoHash = "sha256-+YtnPKbxZENL6/u36RFFZA6F+19qHDAVx6Q8FSB/LCU=";

		nativeBuildInputs = [ pkg-config protobuf ];
		buildInputs = [ dbus ];

+2 −2