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

lib/systems/default.nix

+2 −5

Original line number	Diff line number	Diff line
		@@ -102,13 +102,10 @@ let
		# assume compatible cpu have all the instructions included
		final.parsed.cpu == platform.parsed.cpu
		->
		# if both have gcc.arch defined, check whether final can execute the given platform
		# if platform has gcc.arch, final must also have and can execute the gcc.arch of platform
		(
		(final ? gcc.arch && platform ? gcc.arch)
		-> architectures.canExecute final.gcc.arch platform.gcc.arch
		platform ? gcc.arch -> final ? gcc.arch && architectures.canExecute final.gcc.arch platform.gcc.arch
		)
		# if platform has gcc.arch defined but final doesn't, don't assume it can be executed
		\|\| (platform ? gcc.arch -> !(final ? gcc.arch))
		);

		isCompatible =

+10 −1

Original line number	Diff line number	Diff line
		@@ -8,7 +8,10 @@ let
		cfg = config.hardware.opentabletdriver;
		in
		{
		meta.maintainers = with lib.maintainers; [ thiagokokada ];
		meta.maintainers = with lib.maintainers; [
		gepbird
		thiagokokada
		];

		options = {
		hardware.opentabletdriver = {
		@@ -60,6 +63,12 @@ in

		serviceConfig = {
		Type = "simple";
		# workaround for https://github.com/NixOS/nixpkgs/issues/469340
		ExecStartPre = pkgs.writeShellScript "disable-for-gdm-greeter" ''
		if [[ "$USER" = "gdm-greeter"* ]]; then
		exit 1
		fi
		'';
		ExecStart = lib.getExe' cfg.package "otd-daemon";
		Restart = "on-failure";
		};

+1 −0

Original line number	Diff line number	Diff line
		@@ -124,6 +124,7 @@ in
		services.gnome.evolution-data-server.enable = true;
		services.gnome.glib-networking.enable = true;
		services.gnome.gnome-keyring.enable = true;
		services.gnome.gnome-online-accounts.enable = mkDefault true;
		services.gnome.gcr-ssh-agent.enable = mkDefault true;
		services.gvfs.enable = true;
		services.power-profiles-daemon.enable = mkDefault true;

+3 −3

Original line number	Diff line number	Diff line
		@@ -1793,12 +1793,12 @@ final: prev: {

		blink-indent = buildVimPlugin {
		pname = "blink.indent";
		version = "2.1.0-unstable-2025-12-02";
		version = "2.1.2-unstable-2026-01-13";
		src = fetchFromGitHub {
		owner = "Saghen";
		repo = "blink.indent";
		rev = "93ff30292d34116444ff9db5264f6ccd34f3f71f";
		hash = "sha256-aPCJAK/hO/Vn8kiYyoaMdJjO6b3ce1IXo8Xy4LJS+q8=";
		rev = "9c80820ca77218a8d28e70075d6f44a1609911fe";
		hash = "sha256-SS66JZFCX8viYxYaObASlwtrG5h7yHbVvRBVXBNXkng=";
		};
		meta.homepage = "https://github.com/Saghen/blink.indent/";
		meta.hydraPlatforms = [ ];

+3 −3

Original line number	Diff line number	Diff line
		@@ -8,13 +8,13 @@
		}:
		vimUtils.buildVimPlugin rec {
		pname = "codediff.nvim";
		version = "2.9.1";
		version = "2.9.3";

		src = fetchFromGitHub {
		owner = "esmuellert";
		repo = "codediff.nvim";
		tag = "v${version}";
		hash = "sha256-xIm3/Dxn77rRtUwaKE+3xed8Yyrfnte/aroRcgqiuXM=";
		hash = "sha256-hHBAGDWtw56gk1kWUtU9QEP2QqIATmPNeJ2lPD8dWIc=";
		};

		dependencies = [ vimPlugins.nui-nvim ];
		@@ -31,7 +31,7 @@ vimUtils.buildVimPlugin rec {

		meta = {
		description = "VSCode-style side-by-side diff rendering with two-tier highlighting (line + character level)";
		homepage = "https://github.com/esmuellert/vscode-diff.nvim/";
		homepage = "https://github.com/esmuellert/codediff.nvim/";
		license = lib.licenses.mit;
		platforms = lib.platforms.all;
		};