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

maintainers/maintainer-list.nix

+6 −0

Original line number	Diff line number	Diff line
		@@ -28753,6 +28753,12 @@
		githubId = 988849;
		name = "Vasiliy Yorkin";
		};
		VZstless = {
		name = "VZstless";
		email = "i@vzstless.moe";
		github = "atlarator";
		githubId = 233668878;
		};
		w-lfchen = {
		email = "w-lfchen@posteo.net";
		github = "w-lfchen";

nixos/modules/services/scheduling/scx.nix

+2 −25

Original line number	Diff line number	Diff line
		@@ -37,31 +37,7 @@ in
		};

		scheduler = lib.mkOption {
		type = lib.types.enum [
		"scx_beerland"
		"scx_bpfland"
		"scx_chaos"
		"scx_cosmos"
		"scx_central"
		"scx_flash"
		"scx_flatcg"
		"scx_lavd"
		"scx_layered"
		"scx_mitosis"
		"scx_nest"
		"scx_p2dq"
		"scx_pair"
		"scx_prev"
		"scx_qmap"
		"scx_rlfifo"
		"scx_rustland"
		"scx_rusty"
		"scx_sdt"
		"scx_simple"
		"scx_tickless"
		"scx_userland"
		"scx_wd40"
		];
		type = lib.types.enum cfg.package.schedulers;
		default = "scx_rustland";
		example = "scx_bpfland";
		description = ''
		@@ -126,5 +102,6 @@ in

		meta = {
		inherit (pkgs.scx.full.meta) maintainers;
		buildDocsInSandbox = false;
		};
		}

nixos/tests/kernel-generic/default.nix

+0 −1

Original line number	Diff line number	Diff line
		@@ -84,7 +84,6 @@ let
		linux_rt_5_15
		linux_rt_6_1
		linux_rt_6_6
		linux_libre

		linux_testing
		;

pkgs/by-name/co/code-cursor/sources.json

+9 −9

Original line number	Diff line number	Diff line
		{
		"version": "2.6.19",
		"version": "2.6.20",
		"vscodeVersion": "1.105.1",
		"sources": {
		"x86_64-linux": {
		"url": "https://downloads.cursor.com/production/224838f96445be37e3db643a163a817c15b3606c/linux/x64/Cursor-2.6.19-x86_64.AppImage",
		"hash": "sha256-KPHcY7KhcWTpiFPvHUXmP57ePOW1ouANYVtFMaSzN3Y="
		"url": "https://downloads.cursor.com/production/b29eb4ee5f9f6d1cb2afbc09070198d3ea6ad76f/linux/x64/Cursor-2.6.20-x86_64.AppImage",
		"hash": "sha256-fEvDNnFdJ2WhFam6tw1rnDbNQEZmxsoraIuvrHuKy+w="
		},
		"aarch64-linux": {
		"url": "https://downloads.cursor.com/production/224838f96445be37e3db643a163a817c15b3606c/linux/arm64/Cursor-2.6.19-aarch64.AppImage",
		"hash": "sha256-oyWGiuMkfEgwVd5c28CWfPjZHK3agtfrWZ54/Bk4c6E="
		"url": "https://downloads.cursor.com/production/b29eb4ee5f9f6d1cb2afbc09070198d3ea6ad76f/linux/arm64/Cursor-2.6.20-aarch64.AppImage",
		"hash": "sha256-SEiPNP1wZrLN+fW6q3ldniZYA7ndFf4p7OarPOvCxig="
		},
		"x86_64-darwin": {
		"url": "https://downloads.cursor.com/production/224838f96445be37e3db643a163a817c15b3606c/darwin/x64/Cursor-darwin-x64.dmg",
		"hash": "sha256-vHIQTWpYouXll7T661/IlsWzw6nEl09OoxfUZhpFLVs="
		"url": "https://downloads.cursor.com/production/b29eb4ee5f9f6d1cb2afbc09070198d3ea6ad76f/darwin/x64/Cursor-darwin-x64.dmg",
		"hash": "sha256-PWgoiEFLXJr3AIcPN485BUUuGeCxXr0yk3ROmOILOh4="
		},
		"aarch64-darwin": {
		"url": "https://downloads.cursor.com/production/224838f96445be37e3db643a163a817c15b3606c/darwin/arm64/Cursor-darwin-arm64.dmg",
		"hash": "sha256-qDaqhZqUu7WQieSvLHnMk3rghWGhg/rA8tFBuRnh/nk="
		"url": "https://downloads.cursor.com/production/b29eb4ee5f9f6d1cb2afbc09070198d3ea6ad76f/darwin/arm64/Cursor-darwin-arm64.dmg",
		"hash": "sha256-WxJUezRquZglmjRzjFkBcqLeByAwGTuYSJFWCccuKXc="
		}
		}
		}

pkgs/by-name/fc/fcitx5-mcbopomofo/package.nix

+2 −2

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

		stdenv.mkDerivation (finalAttrs: {
		pname = "fcitx5-mcbopomofo";
		version = "2.9.5";
		version = "3.0";

		src = fetchFromGitHub {
		owner = "openvanilla";
		repo = "fcitx5-mcbopomofo";
		rev = finalAttrs.version;
		hash = "sha256-efpVvWchJywKyGu7I6pNRVKJhIv01iKAXFCJ+7kcMwc=";
		hash = "sha256-yeqNiRiV/RXyFAlEfvsTLcw+AD/qZNvPLr34Cvqe360=";
		};

		nativeBuildInputs = [