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

nixos/modules/services/display-managers/dms-greeter.nix

+31 −4

Original line number	Diff line number	Diff line
		@@ -12,8 +12,6 @@ let
		mkOption
		mkIf
		mkDefault
		mkPackageOption
		mkRemovedOptionModule
		literalExpression
		getExe
		makeBinPath
		@@ -22,6 +20,7 @@ let
		;

		cfg = config.services.displayManager.dms-greeter;
		cfgDms = config.programs.dms-shell;
		cfgAutoLogin = config.services.displayManager.autoLogin;

		cacheDir = "/var/lib/dms-greeter";
		@@ -69,7 +68,21 @@ in
		options.services.displayManager.dms-greeter = {
		enable = mkEnableOption "DankMaterialShell greeter";

		package = mkPackageOption pkgs "dms-shell" { };
		package = mkOption {
		type = types.package;
		default = if cfgDms.enable then cfgDms.package else pkgs.dms-shell;
		defaultText = literalExpression ''
		if config.programs.dms-shell.enable
		then config.programs.dms-shell.package
		else pkgs.dms-shell;
		'';
		description = ''
		The DankMaterialShell package to use for the greeter.

		Defaults to the package from `programs.dms-shell` if it is enabled,
		otherwise defaults to `pkgs.dms-shell`.
		'';
		};

		compositor = {
		name = mkOption {
		@@ -159,7 +172,21 @@ in
		};

		quickshell = {
		package = mkPackageOption pkgs "quickshell" { };
		package = mkOption {
		type = types.package;
		default = if cfgDms.enable then cfgDms.quickshell.package else pkgs.quickshell;
		defaultText = literalExpression ''
		if config.programs.dms-shell.enable
		then config.programs.dms-shell.quickshell.package
		else pkgs.quickshell;
		'';
		description = ''
		The Quickshell package to use for the greeter.

		Defaults to the quickshell package from `programs.dms-shell` if it is enabled,
		otherwise defaults to `pkgs.quickshell`.
		'';
		};
		};

		logs = {

pkgs/applications/editors/vscode/vscodium.nix

+7 −7

Original line number	Diff line number	Diff line
		@@ -27,12 +27,12 @@ let

		hash =
		{
		x86_64-linux = "sha256-NvICNng069Z6qvL3TnjLu82wyfGyjH8wK9aNw2YR2Jk=";
		x86_64-darwin = "sha256-Ukms3L0tIw7tDfMqFctLjIzkUdr9rvXomKwhrGswMXk=";
		aarch64-linux = "sha256-+6G7coqgPSOA3xFMKSOpZCDzb9Ssc7wqJnnlaW54e/I=";
		aarch64-darwin = "sha256-49Zf51yiozdY9V5sPGnECXTUpNIO3OC2c//G2FQcCy0=";
		armv7l-linux = "sha256-6l75xTqeUkDJW6/WTtkGrAsnmlcQPiVTmiEDRXDI/QA=";
		loongarch64-linux = "sha256-PNPVAf6jh20jpFVhDGDgT5wo5xPZDQ2xdm4LO0/Vlzk=";
		x86_64-linux = "sha256-lBCwKNJv9iNQyuEvg+Ht4haFZG/lozm2KgCguKYIwYI=";
		x86_64-darwin = "sha256-29oFrRfdxcMkzppYkQDkKP0DmnzjwbSciKvGwDhf8q0=";
		aarch64-linux = "sha256-53t+UvvECTANRzHnyMbmff7aS5cocpRC8QaSkLRQcLw=";
		aarch64-darwin = "sha256-fIp2NH2AtpQ3KXFXvDFIw4Jx2QlXnwHE4WskJ0bLwNE=";
		armv7l-linux = "sha256-+y4b1/2C2YTmF2kc16xvzM8MzU64OxMK9xEORwkfBWw=";
		loongarch64-linux = "sha256-VKzGJytrcMjXihWIM/qjLeZzXHb/xxHnftnXQn8erfA=";
		}
		.${system} or throwSystem;

		@@ -43,7 +43,7 @@ buildVscode rec {

		# Please backport all compatible updates to the stable release.
		# This is important for the extension ecosystem.
		version = "1.108.10359";
		version = "1.108.20787";
		pname = "vscodium";

		executableName = "codium";

pkgs/applications/emulators/libretro/cores/ppsspp.nix

+3 −3

Original line number	Diff line number	Diff line
		@@ -13,13 +13,13 @@
		}:
		mkLibretroCore {
		core = "ppsspp";
		version = "0-unstable-2026-01-31";
		version = "0-unstable-2026-02-07";

		src = fetchFromGitHub {
		owner = "hrydgard";
		repo = "ppsspp";
		rev = "abed0cb0f79e5cec6204869dab989d575d809744";
		hash = "sha256-K2v0WJIbK7qBGhRu+kgnvkmjtAbiazl4kVW0xk8Fb5I=";
		rev = "1ce9db0250501ff30219fe4255bdbf96c7043904";
		hash = "sha256-tLXyy3AeRu5dVdvhfi0HTsZoZCkqQg9N3ZNAx76ytiQ=";
		fetchSubmodules = true;
		};

pkgs/build-support/fetchgit/default.nix

+0 −1

Original line number	Diff line number	Diff line
		@@ -2,7 +2,6 @@
		config,
		lib,
		stdenvNoCC,
		writeText,
		git,
		git-lfs,
		cacert,

pkgs/by-name/ab/abc-verifier/package.nix

+2 −2

Original line number	Diff line number	Diff line
		@@ -8,13 +8,13 @@

		stdenv.mkDerivation (finalAttrs: {
		pname = "abc-verifier";
		version = "0.61";
		version = "0.62";

		src = fetchFromGitHub {
		owner = "yosyshq";
		repo = "abc";
		rev = "v${finalAttrs.version}";
		hash = "sha256-j/JmEJa29mT/XQmVL/adVbj4S+AAgpga1jbEinCN16w=";
		hash = "sha256-T6Hj8zrr3XuI3Eh0I5rJI3+DAsuQIMtWEsaBJ8a5Cag=";
		};

		nativeBuildInputs = [ cmake ];