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

maintainers/maintainer-list.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -24373,6 +24373,12 @@
		github = "thelissimus";
		githubId = 70096720;
		};
		themadbit = {
		name = "Mark Tanui";
		email = "marktanui75@gmail.com";
		github = "themadbit";
		githubId = 84702057;
		};
		themaxmur = {
		name = "Maxim Muravev";
		email = "muravjev.mak@yandex.ru";

nixos/modules/programs/kde-pim.nix

+9 −3

Original line number	Diff line number	Diff line
		@@ -33,8 +33,14 @@ in
		++ lib.optionals cfg.kontact [
		kontact
		]
		++ lib.optionals cfg.merkuro [
		++ lib.optionals cfg.merkuro (
		[
		merkuro
		];
		]
		# Only needed when using the Merkuro Contacts widget in Plasma.
		++ lib.optionals config.services.desktopManager.plasma6.enable [
		kcontacts
		]
		);
		};
		}

nixos/modules/programs/ssh.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -341,13 +341,13 @@ in
		# Custom options from `extraConfig`, to override generated options
		${cfg.extraConfig}

		# Generated options from other settings
		Host *
		${lib.optionalString cfg.systemd-ssh-proxy.enable ''
		# See systemd-ssh-proxy(1)
		Include ${config.systemd.package}/lib/systemd/ssh_config.d/20-systemd-ssh-proxy.conf
		''}

		# Generated options from other settings
		Host *
		GlobalKnownHostsFile ${builtins.concatStringsSep " " knownHostsFiles}

		${lib.optionalString (!config.networking.enableIPv6) "AddressFamily inet"}

pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@
		nodejs,
		s,
		melpaBuild,
		copilot-language-server,
		copilot-language-server-fhs,
		}:
		melpaBuild (finalAttrs: {
		pname = "copilot";
		@@ -26,7 +26,7 @@ melpaBuild (finalAttrs: {
		postPatch = ''
		substituteInPlace copilot.el \
		--replace-fail "defcustom copilot-server-executable \"copilot-language-server\"" \
		"defcustom copilot-server-executable \"${lib.getExe copilot-language-server}\""
		"defcustom copilot-server-executable \"${lib.getExe copilot-language-server-fhs}\""
		'';

		packageRequires = [

pkgs/applications/networking/cluster/terraform-providers/providers.json

+12 −12

Original line number	Diff line number	Diff line
		@@ -153,11 +153,11 @@
		"vendorHash": null
		},
		"baiducloud": {
		"hash": "sha256-YcQq0FK76XjF80yOjOMhDp+aRoFOewXObVksDAzQSh8=",
		"hash": "sha256-n+vKQ6IE1PV/09OCeYj28o1YKVP0cCDCTYLLq/4PClg=",
		"homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
		"owner": "baidubce",
		"repo": "terraform-provider-baiducloud",
		"rev": "v1.21.12",
		"rev": "v1.21.13",
		"spdx": "MPL-2.0",
		"vendorHash": null
		},
		@@ -354,11 +354,11 @@
		"vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM="
		},
		"digitalocean": {
		"hash": "sha256-q5RMK1HwjnAhgPsdjGSvza83j+gHpbsAcVaUHVrwM+Q=",
		"hash": "sha256-AWRBSdz4nS5Mi4BUqy5J0Vi/2w4qFyXzGxKdboN8aTM=",
		"homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean",
		"owner": "digitalocean",
		"repo": "terraform-provider-digitalocean",
		"rev": "v2.51.0",
		"rev": "v2.53.0",
		"spdx": "MPL-2.0",
		"vendorHash": null
		},
		@@ -642,13 +642,13 @@
		"vendorHash": null
		},
		"ibm": {
		"hash": "sha256-3dOwxmWt2EqGkr/wL+qA1HNbloXlJcbvxI8NDnmA+rg=",
		"hash": "sha256-MMVZnGQ8MWczkbMC9VUoRcplmIk4TdiahZ/ZSYhbQlM=",
		"homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
		"owner": "IBM-Cloud",
		"repo": "terraform-provider-ibm",
		"rev": "v1.77.1",
		"rev": "v1.78.1",
		"spdx": "MPL-2.0",
		"vendorHash": "sha256-w6M4506BykzV1oLadsq3Tgck5Lvf5V3Y8v+pwhlu80c="
		"vendorHash": "sha256-8P5GnDXY8n/NhSY0Oo/7CP7U7pH7f0Z0GfiFnicCxdo="
		},
		"icinga2": {
		"hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",
		@@ -885,13 +885,13 @@
		"vendorHash": "sha256-U8eA/9og4LIedhPSEN9SyInLQuJSzvm0AeFhzC3oqyQ="
		},
		"ns1": {
		"hash": "sha256-Ufj6mrxeTVpc9rWJX3hpzoBGNnNxOMMb8TgC39Z1vqo=",
		"hash": "sha256-fR64hIM14Bc+7xn7lPfsfZnGew7bd1TAkORwwL6NBsw=",
		"homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1",
		"owner": "ns1-terraform",
		"repo": "terraform-provider-ns1",
		"rev": "v2.6.3",
		"rev": "v2.6.4",
		"spdx": "MPL-2.0",
		"vendorHash": "sha256-QmL/LghZgOtdkgy102/76zFD+1lxnxn2d/11WaETIE4="
		"vendorHash": "sha256-YfbhYhFMdGYQlijaYoAdJFmsjric4Oi4no+sBCq5d6g="
		},
		"null": {
		"hash": "sha256-hPAcFWkeK1vjl1Cg/d7FaZpPhyU3pkU6VBIwxX2gEvA=",
		@@ -922,11 +922,11 @@
		"vendorHash": null
		},
		"okta": {
		"hash": "sha256-1/GKJWRy+epeEwReieN6aVNP4/oPT3FTkHeHtticL8k=",
		"hash": "sha256-vsOes4rBULwQ3JX5A7GBKTMvTpjb0CEOWqd6OaO3ujI=",
		"homepage": "https://registry.terraform.io/providers/okta/okta",
		"owner": "okta",
		"repo": "terraform-provider-okta",
		"rev": "v4.17.0",
		"rev": "v4.18.0",
		"spdx": "MPL-2.0",
		"vendorHash": "sha256-5BkKjne3r3V8T+SkqjfHVEpXXK8sKTYMc23g1EaLoOE="
		},