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

maintainers/maintainer-list.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -2096,6 +2096,12 @@
		githubId = 16330;
		name = "Mathijs Kwik";
		};
		blusk = {
		email = "bluskript@gmail.com";
		github = "Bluskript";
		githubId = 52386117;
		name = "Blusk";
		};
		bmilanov = {
		name = "Biser Milanov";
		email = "bmilanov11+nixpkgs@gmail.com";

nixos/modules/services/web-servers/nginx/default.nix

+25 −8

Original line number	Diff line number	Diff line
		@@ -113,10 +113,15 @@ let
		]};
		'') (filterAttrs (name: conf: conf.enable) cfg.proxyCachePath));

		toUpstreamParameter = key: value:
		if builtins.isBool value
		then lib.optionalString value key
		else "${key}=${toString value}";

		upstreamConfig = toString (flip mapAttrsToList cfg.upstreams (name: upstream: ''
		upstream ${name} {
		${toString (flip mapAttrsToList upstream.servers (name: server: ''
		server ${name} ${optionalString server.backup "backup"};
		server ${name} ${concatStringsSep " " (mapAttrsToList toUpstreamParameter server)};
		''))}
		${upstream.extraConfig}
		}
		@@ -922,6 +927,7 @@ in
		options = {
		servers = mkOption {
		type = types.attrsOf (types.submodule {
		freeformType = types.attrsOf (types.oneOf [ types.bool types.int types.str ]);
		options = {
		backup = mkOption {
		type = types.bool;
		@@ -935,9 +941,11 @@ in
		});
		description = lib.mdDoc ''
		Defines the address and other parameters of the upstream servers.
		See [the documentation](https://nginx.org/en/docs/http/ngx_http_upstream_module.html#server)
		for the available parameters.
		'';
		default = {};
		example = { "127.0.0.1:8000" = {}; };
		example = lib.literalMD "see [](#opt-services.nginx.upstreams)";
		};
		extraConfig = mkOption {
		type = types.lines;
		@@ -952,15 +960,24 @@ in
		Defines a group of servers to use as proxy target.
		'';
		default = {};
		example = literalExpression ''
		"backend_server" = {
		servers = { "127.0.0.1:8000" = {}; };
		extraConfig = ''''
		example = {
		"backend" = {
		servers = {
		"backend1.example.com:8080" = { weight = 5; };
		"backend2.example.com" = { max_fails = 3; fail_timeout = "30s"; };
		"backend3.example.com" = {};
		"backup1.example.com" = { backup = true; };
		"backup2.example.com" = { backup = true; };
		};
		extraConfig = ''
		keepalive 16;
		'''';
		};
		'';
		};
		"memcached" = {
		servers."unix:/run//memcached/memcached.sock" = {};
		};
		};
		};

		virtualHosts = mkOption {
		type = types.attrsOf (types.submodule (import ./vhost-options.nix {

nixos/modules/system/boot/networkd.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -70,6 +70,9 @@ let
		"CombinedChannels"
		"RxBufferSize"
		"TxBufferSize"
		"ReceiveQueues"
		"TransmitQueues"
		"TransmitQueueLength"
		])
		(assertValueOneOf "MACAddressPolicy" ["persistent" "random" "none"])
		(assertMacAddress "MACAddress")
		@@ -96,6 +99,9 @@ let
		(assertRange "CombinedChannels" 1 4294967295)
		(assertInt "RxBufferSize")
		(assertInt "TxBufferSize")
		(assertRange "ReceiveQueues" 1 4096)
		(assertRange "TransmitQueues" 1 4096)
		(assertRange "TransmitQueueLength" 1 4294967294)
		];
		};

pkgs/applications/audio/audacity/default.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -61,13 +61,13 @@

		stdenv.mkDerivation rec {
		pname = "audacity";
		version = "3.3.1";
		version = "3.3.2";

		src = fetchFromGitHub {
		owner = pname;
		repo = pname;
		rev = "Audacity-${version}";
		hash = "sha256-4L5ggu1izm9kichZBsJHAFq74q59xWGVYC11gy3K9go=";
		hash = "sha256-/DjTmanPzkShNoMFNbnQzzwEzk/a2uUYvVW9dsvl5uY=";
		};

		postPatch = ''

pkgs/applications/audio/monkeys-audio/default.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -5,13 +5,13 @@
		}:

		stdenv.mkDerivation rec {
		version = "10.10";
		version = "10.11";
		pname = "monkeys-audio";

		src = fetchzip {
		url = "https://monkeysaudio.com/files/MAC_${
		builtins.concatStringsSep "" (lib.strings.splitString "." version)}_SDK.zip";
		sha256 = "sha256-fDH7F9xLfR9Q2T3HCirBWdKB7Kb1vxyo8g0PNzHzMCY=";
		sha256 = "sha256-sA1JXRbyHMHBCsWau9GrlxeRiCzxZfCTuLFebZmIoRE=";
		stripRoot = false;
		};
		nativeBuildInputs = [