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

maintainers/maintainer-list.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -27704,6 +27704,12 @@
		githubId = 43357387;
		keys = [ { fingerprint = "F844 80B2 0CA9 D6CC C7F5 2479 A776 D2AD 099E 8BC0"; } ];
		};
		wetrustinprize = {
		email = "git@wetrustinprize.com";
		github = "wetrustinprize";
		githubId = 38386927;
		name = "Peterson 'Prize' Adami Candido";
		};
		wexder = {
		email = "wexder19@gmail.com";
		github = "wexder";

+6 −2

Original line number	Diff line number	Diff line
		@@ -23,7 +23,11 @@ in
		tt-kmd
		];

		# TODO: add tt-smi to environment.systemPackages once https://github.com/NixOS/nixpkgs/pull/444714 is merged
		# TODO: add tt-system-tools to environment.systemPackages once https://github.com/NixOS/nixpkgs/pull/444748 is merged
		environment.systemPackages = with pkgs; [
		python3Packages.tt-smi
		tt-system-tools
		];
		};

		meta.maintainers = with lib.maintainers; [ RossComputerGuy ];
		}

+3 −4

Original line number	Diff line number	Diff line
		@@ -73,10 +73,7 @@ in

		description = "LXD Image Server";

		script = ''
		${pkgs.lxd-image-server}/bin/lxd-image-server init
		${pkgs.lxd-image-server}/bin/lxd-image-server watch
		'';
		reloadTriggers = [ config.environment.etc."lxd-image-server/config.toml".source ];

		serviceConfig = {
		User = "lxd-image-server";
		@@ -84,6 +81,8 @@ in
		DynamicUser = true;
		LogsDirectory = "lxd-image-server";
		RuntimeDirectory = "lxd-image-server";
		ExecStartPre = "${pkgs.lxd-image-server}/bin/lxd-image-server init";
		ExecStart = "${pkgs.lxd-image-server}/bin/lxd-image-server watch";
		ExecReload = "${pkgs.lxd-image-server}/bin/lxd-image-server reload";
		ReadWritePaths = [ location ];
		};

+3 −3

Original line number	Diff line number	Diff line
		@@ -6,13 +6,13 @@
		}:
		vimUtils.buildVimPlugin {
		pname = "vim-ic10";
		version = "0-unstable-2025-01-08";
		version = "0-unstable-2025-10-09";

		src = fetchFromGitLab {
		owner = "LittleMorph";
		repo = "vim-ic10";
		rev = "7c1f13b198cfe122fb52f6abfb8dc95d5ca51013";
		hash = "sha256-4Q1JiDA7PBUWNBNfCIZC6nImhe2FJzOqrslHazAOs18=";
		rev = "7e9cb3bf91f692e26e899a6d513fcee7dd60bf72";
		hash = "sha256-7mQ8PEbqQS4E8Kg6nU+uTj9Nyke80FEcLpmV46B7GFA=";
		};

		passthru.updateScript = nix-update-script {

+2 −2

Original line number	Diff line number	Diff line
		@@ -3863,8 +3863,8 @@ let
		mktplcRef = {
		publisher = "redhat";
		name = "vscode-yaml";
		version = "1.19.0";
		hash = "sha256-Nc/lkcZh5kp71eygkUCJQT7iNT+9Jg+ud1hgaXdV0Ls=";
		version = "1.19.1";
		hash = "sha256-ZLuGtB7DjIVrcYomcwptwJxGmIjz0Vu1fCFqYb2XLk4=";
		};
		meta = {
		description = "YAML Language Support by Red Hat, with built-in Kubernetes syntax support";