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

maintainers/maintainer-list.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -9162,6 +9162,12 @@
		fingerprint = "7249 70E6 A661 D84E 8B47 678A 0590 93B1 A278 BCD0";
		}];
		};
		jokatzke = {
		email = "jokatzke@fastmail.com";
		github = "jokatzke";
		githubId = 46931073;
		name = "Jonas Katzke";
		};
		joko = {
		email = "ioannis.koutras@gmail.com";
		github = "jokogr";

+0 −2

Original line number	Diff line number	Diff line
		@@ -1197,8 +1197,6 @@ in {

		environment.systemPackages = [cfg.package];

		services.udev.packages = with pkgs; [crda];

		systemd.services.hostapd = {
		description = "IEEE 802.11 Host Access-Point Daemon";

+15 −0

Original line number	Diff line number	Diff line
		@@ -186,6 +186,21 @@ in
		UtmpIdentifier = "tty7";
		UtmpMode = "user";
		};
		environment = {
		# We are running without a display manager, so need to provide
		# a value for XDG_CURRENT_DESKTOP.
		#
		# Among other things, this variable influences:
		# - visibility of desktop entries with "OnlyShowIn=Phosh;"
		# https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-1.5.html#key-onlyshowin
		# - the chosen xdg-desktop-portal configuration.
		# https://flatpak.github.io/xdg-desktop-portal/docs/portals.conf.html
		XDG_CURRENT_DESKTOP = "Phosh:GNOME";
		# pam_systemd uses these to identify the session in logind.
		# https://www.freedesktop.org/software/systemd/man/latest/pam_systemd.html#desktop=
		XDG_SESSION_DESKTOP = "phosh";
		XDG_SESSION_TYPE = "wayland";
		};
		};

		environment.systemPackages = [

+2 −2

Original line number	Diff line number	Diff line
		@@ -3,7 +3,7 @@
		let
		cfg = config.systemd.sysupdate;

		format = pkgs.formats.ini { };
		format = pkgs.formats.ini { listToValue = toString; };

		definitionsDirectory = utils.systemdUtils.lib.definitions
		"sysupdate.d"
		@@ -79,7 +79,7 @@ in
		Source = {
		Type = "url-file";
		Path = "https://download.example.com/";
		MatchPattern = "nixos_@v.efi.xz";
		MatchPattern = [ "nixos_@v+@l-@d.efi" "nixos_@v+@l.efi" "nixos_@v.efi" ];
		};

		Target = {

+7 −7

Original line number	Diff line number	Diff line
		@@ -23,8 +23,8 @@ in
		mkdir -p $out
		cd $out

		echo "nixos" > nixos_1.efi
		sha256sum nixos_1.efi > SHA256SUMS
		echo "nixos" > nixos_1.txt
		sha256sum nixos_1.txt > SHA256SUMS

		export GNUPGHOME="$(mktemp -d)"
		cp -R ${gpgKeyring}/* $GNUPGHOME
		@@ -39,15 +39,15 @@ in
		systemd.sysupdate = {
		enable = true;
		transfers = {
		"uki" = {
		"text-file" = {
		Source = {
		Type = "url-file";
		Path = "http://server/";
		MatchPattern = "nixos_@v.efi";
		MatchPattern = "nixos_@v.txt";
		};
		Target = {
		Path = "/boot/EFI/Linux";
		MatchPattern = "nixos_@v.efi";
		Path = "/";
		MatchPattern = [ "nixos_@v.txt" ];
		};
		};
		};
		@@ -61,6 +61,6 @@ in
		server.wait_for_unit("nginx.service")

		target.succeed("systemctl start systemd-sysupdate")
		assert "nixos" in target.wait_until_succeeds("cat /boot/EFI/Linux/nixos_1.efi", timeout=5)
		assert "nixos" in target.wait_until_succeeds("cat /nixos_1.txt", timeout=5)
		'';
		}