Merge master into staging-nixos (77e89825) · Commits · nix / nixpkgs

nixos/modules/services/desktop-managers/plasma6.nix

+1 −0

Original line number	Diff line number	Diff line
		@@ -168,6 +168,7 @@ in
		ffmpegthumbs
		krdp
		kconfig # required for xdg-terminal from xdg-utils
		qtbase # for qtpaths which is required for xdg-mime from xdg-utils
		]
		++ lib.optionals config.hardware.sensor.iio.enable [
		# This is required for autorotation in Plasma 6

nixos/modules/services/networking/headscale.nix

+13 −0

Original line number	Diff line number	Diff line
		@@ -327,6 +327,15 @@ in
		example = "tailnet.example.com";
		};

		override_local_dns = lib.mkOption {
		type = lib.types.bool;
		default = true;
		description = ''
		Whether to [override clients' DNS servers](https://tailscale.com/kb/1054/dns#override-dns-servers).
		'';
		example = false;
		};

		nameservers = {
		global = lib.mkOption {
		type = lib.types.listOf lib.types.str;
		@@ -644,6 +653,10 @@ in
		assertion = with cfg.settings; dns.magic_dns -> dns.base_domain != "";
		message = "dns.base_domain must be set when using MagicDNS";
		}
		{
		assertion = with cfg.settings; dns.override_local_dns -> dns.nameservers.global != [ ];
		message = "dns.nameservers.global must be set when overriding local DNS";
		}
		(assertRemovedOption [ "settings" "acl_policy_path" ] "Use `policy.path` instead.")
		(assertRemovedOption [ "settings" "db_host" ] "Use `database.postgres.host` instead.")
		(assertRemovedOption [ "settings" "db_name" ] "Use `database.postgres.name` instead.")

pkgs/applications/networking/browsers/chromium/info.json

+14 −14

Original line number	Diff line number	Diff line
		{
		"chromium": {
		"version": "145.0.7632.75",
		"version": "145.0.7632.109",
		"chromedriver": {
		"version": "145.0.7632.76",
		"hash_darwin": "sha256-7bZgvz6yD8qO1G82KTlAuPxLPelZ5TfIlLvyugDJUjM=",
		"hash_darwin_aarch64": "sha256-fwtLzGyT810JoTKI52jXPGBu2EnrD+ROG1L2kGMfFfk="
		"version": "145.0.7632.110",
		"hash_darwin": "sha256-wa8s3PwS5G1TopGYheyLD7wlxxTZWPYwU90TLFpBMZw=",
		"hash_darwin_aarch64": "sha256-/J4A4DrERlHdlI0Pv9hHCnBGoeUIB6G43fS0Y8taLFs="
		},
		"deps": {
		"depot_tools": {
		@@ -21,8 +21,8 @@
		"DEPS": {
		"src": {
		"url": "https://chromium.googlesource.com/chromium/src.git",
		"rev": "ab0b95409566de9da1ed76e690022f774aec7793",
		"hash": "sha256-VvHDqNTXOFeV+QY3K2O9fTFxDzrkz6qKl9hP8nVDMAw=",
		"rev": "61eff07de4f37ac1c6969c91034a447ef6cd394d",
		"hash": "sha256-b498JyyvsN/+0Gqjdrq+eT1HW54/ayEENRHa1Sw69Xw=",
		"recompress": true
		},
		"src/third_party/clang-format/script": {
		@@ -132,8 +132,8 @@
		},
		"src/third_party/dawn": {
		"url": "https://dawn.googlesource.com/dawn.git",
		"rev": "0cf07977de12e7056ab3cbcbf584411e88a1f734",
		"hash": "sha256-2OgNRRkpUlkyXAQDSOL4279JAi1C0QbH4MEfNW7WieQ="
		"rev": "d9f5a980bb5a4baeb7d9c1fef89a39789a6cd9fb",
		"hash": "sha256-DaNsRQm9bR2lfbiP6vWr2R7KD8mYWOaJ72VJyrUkJvI="
		},
		"src/third_party/dawn/third_party/glfw": {
		"url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
		@@ -257,8 +257,8 @@
		},
		"src/third_party/devtools-frontend/src": {
		"url": "https://chromium.googlesource.com/devtools/devtools-frontend",
		"rev": "cc75f545bcb65238f74fd291833112305ce6915a",
		"hash": "sha256-tOE96dcLmUaAVvOo4oGoUrEFpGSH2yxIBtvXSAVzbK0="
		"rev": "8eb35b80efbc72ffb3aff36c3c1106fe9269df88",
		"hash": "sha256-fzcXSU0kaIZVTQx1L5A0Xmn3HEzUE35mzfsU0YEaxw0="
		},
		"src/third_party/dom_distiller_js/dist": {
		"url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
		@@ -602,8 +602,8 @@
		},
		"src/third_party/pdfium": {
		"url": "https://pdfium.googlesource.com/pdfium.git",
		"rev": "3c679253a9e17c10be696d345c63636b18b7f925",
		"hash": "sha256-OW39m1TVJnSdbeVeTCgSxePTqFTOwWqZIrU/5SEioCc="
		"rev": "004b47619573a582c076679764e07725ace3e497",
		"hash": "sha256-PHu3v/ZeEa11/CTGJh8aJjV/lTIVSJ6W7uH2njsHj1w="
		},
		"src/third_party/perfetto": {
		"url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
		@@ -817,8 +817,8 @@
		},
		"src/v8": {
		"url": "https://chromium.googlesource.com/v8/v8.git",
		"rev": "fffd2bdc35a900b4312833885d9d30803580670e",
		"hash": "sha256-WqSGzOCvLw6k3t1oNgZV17KY8TVl6j4lJr0NZSVbm4o="
		"rev": "a8b42c8fae7c7f1ce4e32b08ee61c22775185c01",
		"hash": "sha256-HZ4JbSoMNVqUrCWoxk0/AxzlcpMgKhe/HJ7DGeTeE9M="
		}
		}
		},

pkgs/applications/networking/cluster/terraform/default.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,12 @@ let
		inherit hash;
		};

		# Set CGO_ENABLED based on platform:
		# - Linux: CGO_ENABLED=0 for static linking (avoids LTO plugin issues)
		# - Darwin: CGO_ENABLED=1 to avoid DNS resolution issues
		# See: https://github.com/hashicorp/terraform/blob/main/BUILDING.md
		env.CGO_ENABLED = if stdenv.hostPlatform.isDarwin then "1" else "0";

		ldflags = [
		"-s"
		"-w"

pkgs/by-name/co/copywrite/package.nix

+8 −4

Original line number	Diff line number	Diff line
		@@ -9,21 +9,21 @@
		}:

		let
		commitHash = "d5bc935e4801a02fdbd953f8f0ae7989eaef50cf"; # matches tag release
		commitHash = "be318748da098346a52133c0f7d4a4104a56efc5"; # matches tag release
		shortCommitHash = builtins.substring 0 7 commitHash;
		in
		buildGoModule (finalAttrs: {
		pname = "copywrite";
		version = "0.22.0";
		version = "0.24.0";

		src = fetchFromGitHub {
		owner = "hashicorp";
		repo = "copywrite";
		tag = "v${finalAttrs.version}";
		hash = "sha256-gPVlHgFlLxoAj4pkg3OxD4CGQaLdAL312/Zn/pJ+7fg=";
		hash = "sha256-gw5i50fHshyRrSU3/M4HWM/J82HawGXPHHg9nKIRBkQ=";
		};

		vendorHash = "sha256-Qxp6BwN/Y6Xb1BwFGT/T8WYsXGPgN27mzoTE0i6cS1Q=";
		vendorHash = "sha256-607qlAhrk+1SdrIeE9eYBW3qJKq9i7hEzObvKH66Dfk=";

		ldflags = [
		"-s"
		@@ -34,6 +34,10 @@ buildGoModule (finalAttrs: {

		env.CGO_ENABLED = 0;

		checkFlags = [
		"-skip=Test_FormatCopyrightYears_AutoDetect" # depends on git metadata
		];

		nativeBuildInputs = [ installShellFiles ];
		postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
		$out/bin/copywrite completion bash > copywrite.bash