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

nixos/modules/services/networking/prosody.nix

+0 −3

Original line number	Diff line number	Diff line
		@@ -779,9 +779,6 @@ in

		admins = ${toLua cfg.admins}

		-- we already build with libevent, so we can just enable it for a more performant server
		use_libevent = true

		modules_enabled = {

		${ lib.concatStringsSep "\n " (lib.mapAttrsToList

nixos/modules/services/printing/cupsd.nix

+23 −0

Original line number	Diff line number	Diff line
		@@ -108,6 +108,13 @@ let
		containsGutenprint = pkgs: length (filterGutenprint pkgs) > 0;
		getGutenprint = pkgs: head (filterGutenprint pkgs);

		parsePorts = addresses: let
		splitAddress = addr: lib.strings.splitString ":" addr;
		extractPort = addr: builtins.elemAt (builtins.tail (splitAddress addr)) 0;
		toInt = str: lib.strings.toInt str;
		in
		builtins.map (address: toInt (extractPort address)) addresses;

		in

		{
		@@ -172,6 +179,15 @@ in
		'';
		};

		openFirewall = mkOption {
		type = types.bool;
		default = false;
		description = ''
		Whether to open the firewall for TCP/UDP ports specified in
		listenAdrresses option.
		'';
		};

		bindirCmds = mkOption {
		type = types.lines;
		internal = true;
		@@ -463,6 +479,13 @@ in

		security.pam.services.cups = {};

		networking.firewall = let
		listenPorts = parsePorts cfg.listenAddresses;
		in mkIf cfg.openFirewall {
		allowedTCPPorts = listenPorts;
		allowedUDPPorts = listenPorts;
		};

		};

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

nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix

+2 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,8 @@ let
		'';
		in {

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

		imports =
		[ (mkRenamedOptionModule [ "boot" "loader" "gummiboot" "enable" ] [ "boot" "loader" "systemd-boot" "enable" ])
		];

nixos/tests/printing.nix

+1 −1

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ import ./make-test-python.nix (
		startWhenNeeded = socket;
		listenAddresses = [ "*:631" ];
		defaultShared = true;
		openFirewall = true;
		extraConf = ''
		<Location />
		Order allow,deny
		@@ -26,7 +27,6 @@ import ./make-test-python.nix (
		</Location>
		'';
		};
		networking.firewall.allowedTCPPorts = [ 631 ];
		# Add a HP Deskjet printer connected via USB to the server.
		hardware.printers.ensurePrinters = [{
		name = "DeskjetLocal";

nixos/tests/systemd-boot.nix

+11 −11

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@ in
		{
		basic = makeTest {
		name = "systemd-boot";
		meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer ];
		meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer julienmalka ];

		nodes.machine = common;

		@@ -42,7 +42,7 @@ in
		# Check that specialisations create corresponding boot entries.
		specialisation = makeTest {
		name = "systemd-boot-specialisation";
		meta.maintainers = with pkgs.lib.maintainers; [ lukegb ];
		meta.maintainers = with pkgs.lib.maintainers; [ lukegb julienmalka ];

		nodes.machine = { pkgs, lib, ... }: {
		imports = [ common ];
		@@ -65,7 +65,7 @@ in
		# Boot without having created an EFI entry--instead using default "/EFI/BOOT/BOOTX64.EFI"
		fallback = makeTest {
		name = "systemd-boot-fallback";
		meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer ];
		meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer julienmalka ];

		nodes.machine = { pkgs, lib, ... }: {
		imports = [ common ];
		@@ -91,7 +91,7 @@ in

		update = makeTest {
		name = "systemd-boot-update";
		meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer ];
		meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer julienmalka ];

		nodes.machine = common;

		@@ -113,7 +113,7 @@ in

		memtest86 = makeTest {
		name = "systemd-boot-memtest86";
		meta.maintainers = with pkgs.lib.maintainers; [ Enzime ];
		meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ];

		nodes.machine = { pkgs, lib, ... }: {
		imports = [ common ];
		@@ -128,7 +128,7 @@ in

		netbootxyz = makeTest {
		name = "systemd-boot-netbootxyz";
		meta.maintainers = with pkgs.lib.maintainers; [ Enzime ];
		meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ];

		nodes.machine = { pkgs, lib, ... }: {
		imports = [ common ];
		@@ -143,7 +143,7 @@ in

		entryFilename = makeTest {
		name = "systemd-boot-entry-filename";
		meta.maintainers = with pkgs.lib.maintainers; [ Enzime ];
		meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ];

		nodes.machine = { pkgs, lib, ... }: {
		imports = [ common ];
		@@ -160,7 +160,7 @@ in

		extraEntries = makeTest {
		name = "systemd-boot-extra-entries";
		meta.maintainers = with pkgs.lib.maintainers; [ Enzime ];
		meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ];

		nodes.machine = { pkgs, lib, ... }: {
		imports = [ common ];
		@@ -179,7 +179,7 @@ in

		extraFiles = makeTest {
		name = "systemd-boot-extra-files";
		meta.maintainers = with pkgs.lib.maintainers; [ Enzime ];
		meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ];

		nodes.machine = { pkgs, lib, ... }: {
		imports = [ common ];
		@@ -196,7 +196,7 @@ in

		switch-test = makeTest {
		name = "systemd-boot-switch-test";
		meta.maintainers = with pkgs.lib.maintainers; [ Enzime ];
		meta.maintainers = with pkgs.lib.maintainers; [ Enzime julienmalka ];

		nodes = {
		inherit common;
		@@ -256,7 +256,7 @@ in
		# itself, systems with such firmware won't boot without this fix
		uefiLargeFileWorkaround = makeTest {
		name = "uefi-large-file-workaround";

		meta.maintainers = with pkgs.lib.maintainers; [ julienmalka ];
		nodes.machine = { pkgs, ... }: {
		imports = [common];
		virtualisation.efi.OVMF = pkgs.OVMF.overrideAttrs (old: {

Admin message