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

maintainers/maintainer-list.nix

+7 −1

Original line number	Diff line number	Diff line
		@@ -414,6 +414,12 @@
		githubId = 1174810;
		name = "Nikolay Amiantov";
		};
		abcsds = {
		email = "abcsds@gmail.com";
		github = "abcsds";
		githubId = 2694381;
		name = "Alberto Barradas";
		};
		abdiramen = {
		email = "abdirahman.osmanthus@gmail.com";
		github = "Abdiramen";
		@@ -7441,7 +7447,7 @@
		matrix = "@frontear:matrix.org";
		github = "Frontear";
		githubId = 31909298;
		keys = [ { fingerprint = "C170 11B7 C0AA BB3F 7415 022C BCB5 CEFD E222 82F5"; } ];
		keys = [ { fingerprint = "6A25 DEBE 41DB 0C15 3AB5 BB34 5290 E18B 8705 1A83"; } ];
		};
		frontsideair = {
		email = "photonia@gmail.com";

+2 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,8 @@ in
		internal = true;
		};

		security.pki.useCompatibleBundle = mkEnableOption ''usage of a compatibility bundle.
		security.pki.useCompatibleBundle = mkEnableOption ''
		usage of a compatibility bundle.

		Such a bundle consists exclusively of `BEGIN CERTIFICATE` and no `BEGIN TRUSTED CERTIFICATE`,
		which is an OpenSSL specific PEM format.

+1 −1

Original line number	Diff line number	Diff line
		@@ -260,7 +260,7 @@ in {
		systemd.services.jack-session = {
		description = "JACK session";
		script = ''
		jack_wait -w
		${pkgs.jack-example-tools}/bin/jack_wait -w
		${cfg.jackd.session}
		${lib.optionalString cfg.loopback.enable cfg.loopback.session}
		'';

+2 −2

Original line number	Diff line number	Diff line
		@@ -40,7 +40,7 @@ in
		###### implementation

		config = lib.mkIf cfg.enable {
		dysnomia.enable = true;
		services.dysnomia.enable = true;

		environment.systemPackages = [ pkgs.disnix ] ++ lib.optional cfg.useWebServiceInterface pkgs.DisnixWebService;
		environment.variables.PATH = lib.optionals cfg.enableProfilePath (map (profileName: "/nix/var/nix/profiles/disnix/${profileName}/bin" ) cfg.profiles);
		@@ -74,7 +74,7 @@ in

		restartIfChanged = false;

		path = [ config.nix.package cfg.package config.dysnomia.package "/run/current-system/sw" ];
		path = [ config.nix.package cfg.package config.services.dysnomia.package "/run/current-system/sw" ];

		environment = {
		HOME = "/root";

+9 −5

Original line number	Diff line number	Diff line
		{pkgs, lib, config, ...}:
		let
		cfg = config.dysnomia;
		cfg = config.services.dysnomia;

		printProperties = properties:
		lib.concatMapStrings (propertyName:
		@@ -79,7 +79,7 @@ let
		in
		{
		options = {
		dysnomia = {
		services.dysnomia = {

		enable = lib.mkOption {
		type = lib.types.bool;
		@@ -142,6 +142,10 @@ in
		};
		};

		imports = [
		(lib.mkRenamedOptionModule ["dysnomia"] ["services" "dysnomia"])
		];

		config = lib.mkIf cfg.enable {

		environment.etc = {
		@@ -164,7 +168,7 @@ in

		environment.systemPackages = [ cfg.package ];

		dysnomia.package = pkgs.dysnomia.override (origArgs: dysnomiaFlags // lib.optionalAttrs (cfg.enableLegacyModules) {
		services.dysnomia.package = pkgs.dysnomia.override (origArgs: dysnomiaFlags // lib.optionalAttrs (cfg.enableLegacyModules) {
		enableLegacy = builtins.trace ''
		WARNING: Dysnomia has been configured to use the legacy 'process' and 'wrapper'
		modules for compatibility reasons! If you rely on these modules, consider
		@@ -181,7 +185,7 @@ in
		'' true;
		});

		dysnomia.properties = {
		services.dysnomia.properties = {
		hostname = config.networking.hostName;
		inherit (pkgs.stdenv.hostPlatform) system;

		@@ -208,7 +212,7 @@ in
		++ lib.optional (dysnomiaFlags.enableSubversionRepository) "subversion-repository";
		};

		dysnomia.containers = lib.recursiveUpdate ({
		services.dysnomia.containers = lib.recursiveUpdate ({
		process = {};
		wrapper = {};
		}