Merge master into staging-nixos (81de2a44) · Commits · nix / nixpkgs

maintainers/maintainer-list.nix

+7 −0

Original line number	Diff line number	Diff line
		@@ -3747,6 +3747,13 @@
		githubId = 4621;
		name = "Brad Ediger";
		};
		bradleyjones = {
		email = "jones.bradley@me.com";
		github = "bradleyjones";
		githubId = 2159185;
		name = "Bradley Jones";
		keys = [ { fingerprint = "FE6E 9D7A 6ECC C6E7 8F7B F166 3A0E 7022 EBAD D1AA"; } ];
		};
		brahyerr = {
		name = "Bryant Pham";
		email = "bp@1829847@gmail.com";

+2 −0

Original line number	Diff line number	Diff line
		@@ -698,6 +698,8 @@ in

		services.dbus.packages = packages ++ pluginDbusDeps ++ optional (cfg.dns == "dnsmasq") pkgs.dnsmasq;

		services.firewalld.packages = packages;

		services.udev.packages = packages;

		systemd.services.NetworkManager.path = pluginRuntimeDeps;

+3 −3

Original line number	Diff line number	Diff line
		@@ -390,13 +390,13 @@
		"vendorHash": null
		},
		"fastly_fastly": {
		"hash": "sha256-3jXm7uY93g2NE6HfaWKQqQr05AvnCKvzt3981thgV8Q=",
		"hash": "sha256-HP3pl1KLW8vPKI9FYZKViFQvslGuNmEJTw/nvjsDQRk=",
		"homepage": "https://registry.terraform.io/providers/fastly/fastly",
		"owner": "fastly",
		"repo": "terraform-provider-fastly",
		"rev": "v8.4.0",
		"rev": "v8.5.0",
		"spdx": "MPL-2.0",
		"vendorHash": "sha256-NBp18Ult6o1hQUEZX1r9I0ebfY9VnwVY4QhChIjsGSI="
		"vendorHash": "sha256-khWWD2JCiVnDQiz9AXAOaqHfYwCdmSq5Yj+AyrBc8Go="
		},
		"flexibleenginecloud_flexibleengine": {
		"hash": "sha256-yEZ9JiUSqFFbfqzOOD59ZBv4yFCeUBBKlp6aiUqDqiM=",

+1 −1

Original line number	Diff line number	Diff line
		@@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation rec {
		version = "1.003";

		src = fetchzip {
		url = "https://github.com/alif-type/amiri/releases/download/${version}/Amiri-${version}.zip";
		url = "https://github.com/aliftype/amiri/releases/download/${version}/Amiri-${version}.zip";
		hash = "sha256-BsYPMBlRdzlkvyleZIxGDuGjmqhDlEJ4udj8zoKUSzA=";
		};

+26 −0

Original line number	Diff line number	Diff line
		@@ -4,6 +4,9 @@
		callPackage,
		vscode-generic,
		fetchurl,
		buildFHSEnv,
		writeShellScript,
		coreutils,
		commandLineArgs ? "",
		useVSCodeRipgrep ? stdenv.hostPlatform.isDarwin,
		}:
		@@ -40,6 +43,29 @@ callPackage vscode-generic {

		sourceRoot = if hostPlatform.isDarwin then "Antigravity.app" else "Antigravity";

		# When running inside an FHS environment, try linking Google Chrome or Chromium
		# to the hardcoded Playwright search path: /opt/google/chrome/chrome
		buildFHSEnv =
		args:
		buildFHSEnv (
		args
		// {
		extraBuildCommands = (args.extraBuildCommands or "") + ''
		mkdir -p "$out/opt/google/chrome"
		'';
		extraBwrapArgs = (args.extraBwrapArgs or [ ]) ++ [ "--tmpfs /opt/google/chrome" ];
		runScript = writeShellScript "antigravity-wrapper" ''
		for candidate in google-chrome-stable google-chrome chromium-browser chromium; do
		if target=$(command -v "$candidate"); then
		${coreutils}/bin/ln -sf "$target" /opt/google/chrome/chrome
		break
		fi
		done
		exec ${args.runScript} "$@"
		'';
		}
		);

		tests = { };
		updateScript = ./update.sh;