Merge master into staging-next (a3e2b0de) · Commits · mdf / nixpkgs

maintainers/maintainer-list.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -2983,7 +2983,7 @@
		};
		cafkafk = {
		email = "christina@cafkafk.com";
		matrix = "@cafkafk:nixos.dev";
		matrix = "@cafkafk:gitter.im";
		name = "Christina Sørensen";
		github = "cafkafk";
		githubId = 89321978;

nixos/modules/config/nix.nix

+1 −1

Original line number	Diff line number	Diff line
		/*
		Manages /etc/nix.conf.
		Manages /etc/nix/nix.conf.

		See also
		- ./nix-channel.nix

nixos/tests/power-profiles-daemon.nix

+16 −5

Original line number	Diff line number	Diff line
		@@ -8,22 +8,22 @@ import ./make-test-python.nix ({ pkgs, ... }:
		nodes.machine = { pkgs, ... }: {
		security.polkit.enable = true;
		services.power-profiles-daemon.enable = true;
		environment.systemPackages = [ pkgs.glib ];
		environment.systemPackages = [ pkgs.glib pkgs.power-profiles-daemon ];
		};

		testScript = ''
		def get_profile():
		return machine.succeed(
		"""gdbus call --system --dest net.hadess.PowerProfiles --object-path /net/hadess/PowerProfiles \
		--method org.freedesktop.DBus.Properties.Get 'net.hadess.PowerProfiles' 'ActiveProfile'
		"""gdbus call --system --dest org.freedesktop.UPower.PowerProfiles --object-path /org/freedesktop/UPower/PowerProfiles \
		--method org.freedesktop.DBus.Properties.Get 'org.freedesktop.UPower.PowerProfiles' 'ActiveProfile'
		"""
		)


		def set_profile(profile):
		return machine.succeed(
		"""gdbus call --system --dest net.hadess.PowerProfiles --object-path /net/hadess/PowerProfiles \
		--method org.freedesktop.DBus.Properties.Set 'net.hadess.PowerProfiles' 'ActiveProfile' "<'{profile}'>"
		"""gdbus call --system --dest org.freedesktop.UPower.PowerProfiles --object-path /org/freedesktop/UPower/PowerProfiles \
		--method org.freedesktop.DBus.Properties.Set 'org.freedesktop.UPower.PowerProfiles' 'ActiveProfile' "<'{profile}'>"
		""".format(
		profile=profile
		)
		@@ -42,5 +42,16 @@ import ./make-test-python.nix ({ pkgs, ... }:
		profile = get_profile()
		if not "balanced" in profile:
		raise Exception("Unable to set balanced profile")

		# test powerprofilectl CLI
		machine.succeed("powerprofilesctl set power-saver")
		profile = get_profile()
		if not "power-saver" in profile:
		raise Exception("Unable to set power-saver profile with powerprofilectl")

		machine.succeed("powerprofilesctl set balanced")
		profile = get_profile()
		if not "balanced" in profile:
		raise Exception("Unable to set balanced profile with powerprofilectl")
		'';
		})

pkgs/applications/emulators/retroarch/hashes.json

+18 −18

Original line number	Diff line number	Diff line
		@@ -307,11 +307,11 @@
		"src": {
		"owner": "flyinghead",
		"repo": "flycast",
		"rev": "44fa364f36c43bed19b055096600f075c656f78c",
		"hash": "sha256-UfASq8OXtsfubMUfke7P6HTygM/9fP421IoLQeJvPgY=",
		"rev": "bc51aefa9c52981621abf1d3545bff7befa4d01b",
		"hash": "sha256-NSCJxex5Rl7sWe2DkJ2aIyPzfdTcwSRb2iI3xpvYiow=",
		"fetchSubmodules": true
		},
		"version": "unstable-2024-02-09"
		"version": "unstable-2024-02-23"
		},
		"fmsx": {
		"fetcher": "fetchFromGitHub",
		@@ -348,20 +348,20 @@
		"src": {
		"owner": "libretro",
		"repo": "gambatte-libretro",
		"rev": "05c4e10168aa3070b4ea01f7da7ab1c0d4241103",
		"hash": "sha256-W/s8FWjFOIcclLkbM5s2+2dcvr+X2My5319SvRo5/lU="
		"rev": "4041d5a6c474d2d01b4cb1e81324b06b51d0147b",
		"hash": "sha256-TmPOka3oz5xIFDEsmDbvXXmLmP15FtQdoUZ+FErbqrI="
		},
		"version": "unstable-2024-02-09"
		"version": "unstable-2024-02-23"
		},
		"genesis-plus-gx": {
		"fetcher": "fetchFromGitHub",
		"src": {
		"owner": "libretro",
		"repo": "Genesis-Plus-GX",
		"rev": "7aba063778534a78b080a737c0465667ebd66154",
		"hash": "sha256-Rx5ymDqYmtovr/IJRY4loUwwWTk8GEs+oviP4YOk6ZI="
		"rev": "b38cdca9036332c1b7b05817432d1fd42d59527b",
		"hash": "sha256-5yr64Jy8WxamMknIG9nhIV4BLTZg8k7Q8Lnw8sfmWhk="
		},
		"version": "unstable-2024-02-16"
		"version": "unstable-2024-02-23"
		},
		"gpsp": {
		"fetcher": "fetchFromGitHub",
		@@ -438,10 +438,10 @@
		"src": {
		"owner": "libretro",
		"repo": "mame2003-plus-libretro",
		"rev": "fc987f1913203a41bca7f6fd16e92c83729dd7fc",
		"hash": "sha256-Mn0WuzGGxDlUEccC21V0FzRyTAgRoAnLCm5jpz9rkdY="
		"rev": "1a5b4b75e1e178a338f8f3dee3dfd940c8c9a3f2",
		"hash": "sha256-6r30iB3LQvtHQh5nv+ZL/hag1j/l/uEpVzkzieLaK80="
		},
		"version": "unstable-2024-02-16"
		"version": "unstable-2024-02-21"
		},
		"mame2010": {
		"fetcher": "fetchFromGitHub",
		@@ -662,11 +662,11 @@
		"src": {
		"owner": "hrydgard",
		"repo": "ppsspp",
		"rev": "f5450e40eb3f4861451fb98bf9239dacc5aef81e",
		"hash": "sha256-Kj0bxp2ValsmoKHP4x8LJ60priLnRAvgtjsUemm0do4=",
		"rev": "d5cfcccbeab6c6b6dc7e851724b9ccd8252b2592",
		"hash": "sha256-lBzOIQpv0H0/DTCyWpf3tX3d/N9M49djoIwGgDW+S9A=",
		"fetchSubmodules": true
		},
		"version": "unstable-2024-02-16"
		"version": "unstable-2024-02-23"
		},
		"prboom": {
		"fetcher": "fetchFromGitHub",
		@@ -693,10 +693,10 @@
		"src": {
		"owner": "libretro",
		"repo": "libretro-uae",
		"rev": "4e8b54dd574eff239b5f4b4e3bc35c40b3a7cdd4",
		"hash": "sha256-pBpzzCgZYaA7/+UvwTsKCRseroe98AwRovjIk4Z0fhI="
		"rev": "5f683ae67b998fcadd69fa8f65f2440fa8ef135f",
		"hash": "sha256-SvV18vqMf9ZtGzrK3bnE0h2ImYi1QuLi7t+ZO91Lm6Y="
		},
		"version": "unstable-2024-02-20"
		"version": "unstable-2024-02-22"
		},
		"quicknes": {
		"fetcher": "fetchFromGitHub",

pkgs/applications/networking/cluster/werf/default.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -10,16 +10,16 @@

		buildGoModule rec {
		pname = "werf";
		version = "1.2.292";
		version = "1.2.294";

		src = fetchFromGitHub {
		owner = "werf";
		repo = "werf";
		rev = "v${version}";
		hash = "sha256-jBGAd7He2ap7+IF5Og7J6iBoIoLG8KqxSLcPKogJwP8=";
		hash = "sha256-A/Do2UepwV8lmT8qWir7CKR8/YeVKOEoJjvVfj9+wt0=";
		};

		vendorHash = "sha256-JaAiQC5QnamzUz1hPSldXtZqhTQIlGFGMYhLJd7t3j4=";
		vendorHash = "sha256-Fb9drtVITjka83Y8+YSa9fqSBv7O4muMGqV4w3K7+Dg=";

		proxyVendor = true;

Admin message